SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 19:42:56 +01:00
Code Issues Projects Releases Packages Activity

Always instantiate .d.ts models as typescript

Browse source
This commit is contained in:
Alex Dima 2021-10-08 16:19:21 +02:00
parent e8f34f3e53
commit f2e2b1d3a4
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/languageFeatures.ts
View file

@ -98,10 +98,7 @@ export class LibFiles {
private _hasFetchedLibFiles: boolean; private _hasFetchedLibFiles: boolean;
private _fetchLibFilesPromise: Promise<void> | null; private _fetchLibFilesPromise: Promise<void> | null;
constructor( constructor(private readonly _worker: (...uris: Uri[]) => Promise<TypeScriptWorker>) {
private readonly modeId: string,
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;

2
src/tsMode.ts
View file

@ -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(