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

Merge 65058029d8 into ec78a33c7b

Browse source
This commit is contained in:
Justin Carrus 2025-12-20 08:32:46 +01:00 • committed by GitHub
commit d6f3930992
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 47 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/language/typescript/tsWorker.ts
View file

@ -37,6 +37,8 @@ export class TypeScriptWorker implements ts.LanguageServiceHost, ITypeScriptWork
private _ctx: worker.IWorkerContext;
private _extraLibs: IExtraLibs = Object.create(null);
/** Extra libs may have been opened as models, so we track previously removed libs to ensure they are not considered */
private _removedExtraLibs: { uri: string; version: number }[] = [];
private _languageService = ts.createLanguageService(this);
private _compilerOptions: ts.CompilerOptions;
private _inlayHintsOptions?: ts.UserPreferences;
@ -63,8 +65,48 @@ export class TypeScriptWorker implements ts.LanguageServiceHost, ITypeScriptWork
}
getScriptFileNames(): string[] {
const allModels = this._ctx.getMirrorModels().map((model) => model.uri);
const models = allModels.filter((uri) => !fileNameIsLib(uri)).map((uri) => uri.toString());
const allModels = this._ctx.getMirrorModels();
const models = allModels
// remove default libs
.filter((model) => !fileNameIsLib(model.uri))
// remove extra libs
.filter((model) => {
const modelUri = model.uri.toString();
if (this._extraLibs[modelUri]) {
return false;
}
// Extra libs passed with no schema get a file:/// prefix from the model but not in the _extraLibs map
if (
modelUri.startsWith('file:///') &&
this._extraLibs[modelUri.replace('file:///', '')]?.version
) {
return false;
}
return true;
})
// remove previously removed libs
.filter((model) => {
const modelUri = model.uri.toString();
if (
this._removedExtraLibs.some(
(removed) => removed.uri === modelUri && removed.version === model.version
)
) {
return false;
}
// if the extra lib was passed with no schema, it gets a file:/// prefix from the model
if (
modelUri.startsWith('file:///') &&
this._removedExtraLibs.some(
(removed) =>
removed.uri === modelUri.replace('file:///', '') && removed.version === model.version
)
) {
return false;
}
return true;
})
.map((model) => model.uri.toString());
return models.concat(Object.keys(this._extraLibs));
}
@ -450,6 +492,9 @@ export class TypeScriptWorker implements ts.LanguageServiceHost, ITypeScriptWork
}
async updateExtraLibs(extraLibs: IExtraLibs): Promise<void> {
this._removedExtraLibs.push(
...Object.entries(this._extraLibs).map(([uri, lib]) => ({ uri, version: lib.version }))
);
this._extraLibs = extraLibs;
}