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

Fixes microsoft/monaco-editor#1998: make sure to always increase the version number

Browse source
This commit is contained in:
Alex Dima 2020-09-18 20:57:40 +02:00
parent 0ac03ae5cd
commit ee6d058e66
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/monaco.contribution.ts
View file

@ -448,6 +448,7 @@ class LanguageServiceDefaultsImpl implements LanguageServiceDefaults {
private _onDidExtraLibsChange = new Emitter<void>(); private _onDidExtraLibsChange = new Emitter<void>();
private _extraLibs: IExtraLibs; private _extraLibs: IExtraLibs;
private _removedExtraLibs: { [path: string]: number };
private _eagerModelSync: boolean; private _eagerModelSync: boolean;
private _compilerOptions!: CompilerOptions; private _compilerOptions!: CompilerOptions;
private _diagnosticsOptions!: DiagnosticsOptions; private _diagnosticsOptions!: DiagnosticsOptions;
@ -460,6 +461,7 @@ class LanguageServiceDefaultsImpl implements LanguageServiceDefaults {
workerOptions: WorkerOptions workerOptions: WorkerOptions
) { ) {
this._extraLibs = Object.create(null); this._extraLibs = Object.create(null);
this._removedExtraLibs = Object.create(null);
this._eagerModelSync = false; this._eagerModelSync = false;
this.setCompilerOptions(compilerOptions); this.setCompilerOptions(compilerOptions);
this.setDiagnosticsOptions(diagnosticsOptions); this.setDiagnosticsOptions(diagnosticsOptions);
@ -499,6 +501,9 @@ class LanguageServiceDefaultsImpl implements LanguageServiceDefaults {
} }
let myVersion = 1; let myVersion = 1;
if (this._removedExtraLibs[filePath]) {
myVersion = this._removedExtraLibs[filePath] + 1;
}
if (this._extraLibs[filePath]) { if (this._extraLibs[filePath]) {
myVersion = this._extraLibs[filePath].version + 1; myVersion = this._extraLibs[filePath].version + 1;
} }
@ -520,12 +525,16 @@ class LanguageServiceDefaultsImpl implements LanguageServiceDefaults {
} }
delete this._extraLibs[filePath]; delete this._extraLibs[filePath];
this._removedExtraLibs[filePath] = myVersion;
this._fireOnDidExtraLibsChangeSoon(); this._fireOnDidExtraLibsChangeSoon();
} }
}; };
} }
setExtraLibs(libs: { content: string; filePath?: string }[]): void { setExtraLibs(libs: { content: string; filePath?: string }[]): void {
for (const filePath in this._extraLibs) {
this._removedExtraLibs[filePath] = this._extraLibs[filePath].version;
}
// clear out everything // clear out everything
this._extraLibs = Object.create(null); this._extraLibs = Object.create(null);
@ -534,9 +543,13 @@ class LanguageServiceDefaultsImpl implements LanguageServiceDefaults {
const filePath = const filePath =
lib.filePath || `ts:extralib-${Math.random().toString(36).substring(2, 15)}`; lib.filePath || `ts:extralib-${Math.random().toString(36).substring(2, 15)}`;
const content = lib.content; const content = lib.content;
let myVersion = 1;
if (this._removedExtraLibs[filePath]) {
myVersion = this._removedExtraLibs[filePath] + 1;
}
this._extraLibs[filePath] = { this._extraLibs[filePath] = {
content: content, content: content,
version: 1 version: myVersion
}; };
} }
} }