Merge pull request #34 from mkslanc/ts-extra-libs

Ts extra libs
mkslanc · Jan 31, 2023 · fba48d7 · fba48d7
2 parents 893168e + 1e7ce0f
commit fba48d7
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 11 deletions.
diff --git a/packages/ace-linters/language-provider.ts b/packages/ace-linters/language-provider.ts
@@ -141,8 +141,10 @@ export class LanguageProvider {
                 },
                 getDocTooltip: (item) => {
                     if (!item["isResolved"]) {
-                        this.$messageController.doResolve(item["fileName"], toCompletionItem(item), (completionItem) => {
+                        this.$messageController.doResolve(item["fileName"], toCompletionItem(item), (completionItem?) => {
                             item["isResolved"] = true;
+                            if (!completionItem)
+                                return;
                             let completion = toResolvedCompletion(item, completionItem);
                             item.docText = completion.docText;
                             if (completion.docHTML) {

diff --git a/packages/ace-linters/message-controller-ws.ts b/packages/ace-linters/message-controller-ws.ts
@@ -218,7 +218,7 @@ export class MessageControllerWS extends events.EventEmitter implements IMessage
         this.postMessage('textDocument/completion', sessionId, options, completionCallback);
     }
 
-    doResolve(sessionId: string, completion: lsp.CompletionItem, callback?: (completion: lsp.CompletionItem) => void) {
+    doResolve(sessionId: string, completion: lsp.CompletionItem, callback?: (completion: lsp.CompletionItem | null) => void) {
         if (!this.isInitialized)
             return;
         if (!this.serverCapabilities?.completionProvider?.resolveProvider)

diff --git a/packages/ace-linters/message-controller.ts b/packages/ace-linters/message-controller.ts
@@ -45,7 +45,7 @@ export class MessageController implements IMessageController {
         this.postMessage(new CompleteMessage(sessionId, position), callback);
     }
 
-    doResolve(sessionId: string, completion: lsp.CompletionItem, callback?: (completion: lsp.CompletionItem) => void) {
+    doResolve(sessionId: string, completion: lsp.CompletionItem, callback?: (completion: lsp.CompletionItem | null) => void) {
         this.postMessage(new ResolveCompletionMessage(sessionId, completion), callback);
     }
 

diff --git a/packages/ace-linters/services/typescript/typescript-service.ts b/packages/ace-linters/services/typescript/typescript-service.ts
@@ -19,7 +19,10 @@ export class TypescriptService extends BaseService<TsServiceOptions> implements
         allowJs: true,
         jsx: JsxEmit.Preserve,
         allowNonTsExtensions: true,
-        target: ScriptTarget.ESNext
+        target: ScriptTarget.ESNext,
+        noSemanticValidation: true,
+        noSyntaxValidation: false,
+        onlyVisible: false
     };
 
     constructor(mode: string) {
@@ -35,7 +38,12 @@ export class TypescriptService extends BaseService<TsServiceOptions> implements
     }
 
     getScriptFileNames(): string[] {
-        return Object.keys(this.documents);
+        let fileNames = Object.keys(this.documents);
+        return fileNames.concat(Object.keys(this.$extraLibs));
+    }
+
+    private get $extraLibs() {
+        return this.globalOptions["extraLibs"] ?? [];
     }
 
     getScriptVersion(fileName: string): string {
@@ -70,6 +78,8 @@ export class TypescriptService extends BaseService<TsServiceOptions> implements
             text = document.getText();
         } else if (fileName in libFileMap) {
             text = libFileMap[fileName];
+        } else if (fileName in this.$extraLibs) {
+            text = this.$extraLibs[fileName].content;
         } else {
             return;
         }
@@ -204,6 +214,9 @@ export class TypescriptService extends BaseService<TsServiceOptions> implements
             undefined
         );
 
-        return toResolvedCompletion(resolvedCompletion) ?? null;
+        if (!resolvedCompletion)
+            return null;
+
+        return toResolvedCompletion(resolvedCompletion);
     }
 }
diff --git a/packages/ace-linters/type-converters/typescript-converters.ts b/packages/ace-linters/type-converters/typescript-converters.ts
@@ -139,9 +139,7 @@ export function toCompletions(completionInfo: CompletionInfo, doc: TextDocument,
     });
 }
 
-export function toResolvedCompletion(entry?: CompletionEntryDetails): lsp.CompletionItem | undefined {
-    if (!entry)
-        return;
+export function toResolvedCompletion(entry: CompletionEntryDetails): lsp.CompletionItem {
     return {
         label: entry.name,
         kind: convertKind(entry.kind),

diff --git a/packages/ace-linters/types/language-service.d.ts b/packages/ace-linters/types/language-service.d.ts
@@ -78,8 +78,16 @@ export declare namespace AceLinters {
         schemaUri?: string,
     }
 
+    interface ExtraLib {
+        content: string;
+        version: number;
+    }
+
     export interface TsServiceOptions {
-        compilerOptions?: ts.CompilerOptions
+        compilerOptions?: ts.CompilerOptions,
+        extraLibs?: {
+            [path: string]: ExtraLib;
+        }
     }
 
     export interface HtmlServiceOptions {

diff --git a/packages/ace-linters/types/message-controller-interface.d.ts b/packages/ace-linters/types/message-controller-interface.d.ts
@@ -9,7 +9,7 @@ export interface IMessageController {
 
     doComplete(sessionId: string, position: lsp.Position, callback?: (completionList: lsp.CompletionList | lsp.CompletionItem[] | null) => void);
 
-    doResolve(sessionId: string, completion: lsp.CompletionItem, callback?: (completion: lsp.CompletionItem) => void);
+    doResolve(sessionId: string, completion: lsp.CompletionItem, callback?: (completion: lsp.CompletionItem | null) => void);
 
     format(sessionId: string, range: lsp.Range, format: lsp.FormattingOptions, callback?: (edits: lsp.TextEdit[]) => void);