From f2e2b1d3a4ea818cf2f14bf8b0f0accabe45abf6 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 8 Oct 2021 16:19:21 +0200 Subject: [PATCH] Always instantiate `.d.ts` models as `typescript` --- src/languageFeatures.ts | 9 +++------ src/tsMode.ts | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index ad566aa3..6a1add50 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -98,10 +98,7 @@ export class LibFiles { private _hasFetchedLibFiles: boolean; private _fetchLibFilesPromise: Promise | null; - constructor( - private readonly modeId: string, - private readonly _worker: (...uris: Uri[]) => Promise - ) { + constructor(private readonly _worker: (...uris: Uri[]) => Promise) { this._libFiles = {}; this._hasFetchedLibFiles = false; this._fetchLibFilesPromise = null; @@ -123,7 +120,7 @@ export class LibFiles { return model; } if (this.isLibFile(uri) && this._hasFetchedLibFiles) { - return editor.createModel(this._libFiles[uri.path.slice(1)], this.modeId, uri); + return editor.createModel(this._libFiles[uri.path.slice(1)], 'typescript', uri); } const extraLibs = typescriptDefaults.getExtraLibs(); const extraLibPaths = Object.keys(extraLibs); @@ -131,7 +128,7 @@ export class LibFiles { const currentPath = extraLibPaths[i]; const currentUri = Uri.parse(currentPath); if (currentUri.path === uri.path) { - return editor.createModel(extraLibs[currentPath].content, this.modeId, uri); + return editor.createModel(extraLibs[currentPath].content, 'typescript', uri); } } return null; diff --git a/src/tsMode.ts b/src/tsMode.ts index 1a57d547..9ebf59cf 100644 --- a/src/tsMode.ts +++ b/src/tsMode.ts @@ -50,7 +50,7 @@ function setupMode( return client.getLanguageServiceWorker(...uris); }; - const libFiles = new languageFeatures.LibFiles(modeId, worker); + const libFiles = new languageFeatures.LibFiles(worker); languages.registerCompletionItemProvider(modeId, new languageFeatures.SuggestAdapter(worker)); languages.registerSignatureHelpProvider(