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

fix: Ensure removed extraLibs are not used in tsWorker

Browse source
This commit is contained in:
Justin Carrus 2024-06-01 11:46:15 -07:00
parent c49fdf9f0c
commit f0c242d083
1 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,8 @@ export class TypeScriptWorker implements ts.LanguageServiceHost, ITypeScriptWork
private _ctx: worker.IWorkerContext; private _ctx: worker.IWorkerContext;
private _extraLibs: IExtraLibs = Object.create(null); 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 _languageService = ts.createLanguageService(this);
private _compilerOptions: ts.CompilerOptions; private _compilerOptions: ts.CompilerOptions;
private _inlayHintsOptions?: ts.UserPreferences; private _inlayHintsOptions?: ts.UserPreferences;
@ -63,8 +65,35 @@ export class TypeScriptWorker implements ts.LanguageServiceHost, ITypeScriptWork
} }
getScriptFileNames(): string[] { getScriptFileNames(): string[] {
const allModels = this._ctx.getMirrorModels().map((model) => model.uri); const allModels = this._ctx.getMirrorModels();
const models = allModels.filter((uri) => !fileNameIsLib(uri)).map((uri) => uri.toString()); const models = allModels
// remove default libs
.filter((model) => !fileNameIsLib(model.uri))
// remove extra libs and previously removed libs
// Note that is is required for all model names to be unique, so
// while the logic here depends on the end user not creating extra
// libs with conflicting filenames, that is already a requirement.
.filter((model) => {
const uriAsString = model.uri.toString();
// if the extra lib was not given a name, then it gets an autogenerated name prefixed with ts:extralib-
if (uriAsString.startsWith('ts:extralib-')) {
return false;
}
// Otherwise, the prefix will be file:/// and the name will be what the user provided to add/setExtraLibs
if (
this._removedExtraLibs.some(
(removed) =>
`file:///${removed.uri}` === uriAsString && removed.version === model.version
)
) {
return false;
}
if (this._extraLibs[uriAsString.replace(/^file:\/\/\//, '')]?.version === model.version) {
return false;
}
return true;
})
.map((model) => model.uri.toString());
return models.concat(Object.keys(this._extraLibs)); return models.concat(Object.keys(this._extraLibs));
} }
@ -450,6 +479,9 @@ export class TypeScriptWorker implements ts.LanguageServiceHost, ITypeScriptWork
} }
async updateExtraLibs(extraLibs: IExtraLibs): Promise<void> { async updateExtraLibs(extraLibs: IExtraLibs): Promise<void> {
this._removedExtraLibs.push(
...Object.entries(this._extraLibs).map(([uri, lib]) => ({ uri, version: lib.version }))
);
this._extraLibs = extraLibs; this._extraLibs = extraLibs;
} }