Browse Source

Always instantiate `.d.ts` models as `typescript`

Alex Dima 3 năm trước cách đây
mục cha
commit
f2e2b1d3a4
2 tập tin đã thay đổi với 4 bổ sung7 xóa
  1. 3 6
      src/languageFeatures.ts
  2. 1 1
      src/tsMode.ts

+ 3 - 6
src/languageFeatures.ts

@@ -98,10 +98,7 @@ export class LibFiles {
 	private _hasFetchedLibFiles: boolean;
 	private _hasFetchedLibFiles: boolean;
 	private _fetchLibFilesPromise: Promise<void> | null;
 	private _fetchLibFilesPromise: Promise<void> | null;
 
 
-	constructor(
-		private readonly modeId: string,
-		private readonly _worker: (...uris: Uri[]) => Promise<TypeScriptWorker>
-	) {
+	constructor(private readonly _worker: (...uris: Uri[]) => Promise<TypeScriptWorker>) {
 		this._libFiles = {};
 		this._libFiles = {};
 		this._hasFetchedLibFiles = false;
 		this._hasFetchedLibFiles = false;
 		this._fetchLibFilesPromise = null;
 		this._fetchLibFilesPromise = null;
@@ -123,7 +120,7 @@ export class LibFiles {
 			return model;
 			return model;
 		}
 		}
 		if (this.isLibFile(uri) && this._hasFetchedLibFiles) {
 		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 extraLibs = typescriptDefaults.getExtraLibs();
 		const extraLibPaths = Object.keys(extraLibs);
 		const extraLibPaths = Object.keys(extraLibs);
@@ -131,7 +128,7 @@ export class LibFiles {
 			const currentPath = extraLibPaths[i];
 			const currentPath = extraLibPaths[i];
 			const currentUri = Uri.parse(currentPath);
 			const currentUri = Uri.parse(currentPath);
 			if (currentUri.path === uri.path) {
 			if (currentUri.path === uri.path) {
-				return editor.createModel(extraLibs[currentPath].content, this.modeId, uri);
+				return editor.createModel(extraLibs[currentPath].content, 'typescript', uri);
 			}
 			}
 		}
 		}
 		return null;
 		return null;

+ 1 - 1
src/tsMode.ts

@@ -50,7 +50,7 @@ function setupMode(
 		return client.getLanguageServiceWorker(...uris);
 		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.registerCompletionItemProvider(modeId, new languageFeatures.SuggestAdapter(worker));
 	languages.registerSignatureHelpProvider(
 	languages.registerSignatureHelpProvider(