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

Adopt strict checking (fixes microsoft/monaco-editor#1715)

Browse source
This commit is contained in:
Alex Dima 2019-12-20 19:47:49 +01:00
parent 483a447093
commit e4ab9e4360
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
10 changed files with 365 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/workerManager.ts
View file

@ -20,13 +20,14 @@ export class WorkerManager {
private _updateExtraLibsToken: number;
private _extraLibsChangeListener: IDisposable;
private _worker: monaco.editor.MonacoWebWorker<TypeScriptWorker>;
private _client: Promise<TypeScriptWorker>;
private _worker: monaco.editor.MonacoWebWorker<TypeScriptWorker> | null;
private _client: Promise<TypeScriptWorker> | null;
constructor(modeId: string, defaults: LanguageServiceDefaultsImpl) {
this._modeId = modeId;
this._defaults = defaults;
this._worker = null;
this._client = null;
this._idleCheckInterval = setInterval(() => this._checkIfIdle(), 30 * 1000);
this._lastUsedTime = 0;
this._configChangeListener = this._defaults.onDidChange(() => this._stopWorker());
@ -95,11 +96,14 @@ export class WorkerManager {
if (this._defaults.getEagerModelSync()) {
p = p.then(worker => {
return this._worker.withSyncedResources(monaco.editor.getModels()
.filter(model => model.getModeId() === this._modeId)
.map(model => model.uri)
);
})
if (this._worker) {
return this._worker.withSyncedResources(monaco.editor.getModels()
.filter(model => model.getModeId() === this._modeId)
.map(model => model.uri)
);
}
return worker;
});
}
this._client = p;
@ -113,7 +117,9 @@ export class WorkerManager {
return this._getClient().then((client) => {
_client = client
}).then(_ => {
return this._worker.withSyncedResources(resources)
if (this._worker) {
return this._worker.withSyncedResources(resources)
}
}).then(_ => _client);
}
}