Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #188070

Browse Source
This commit is contained in:
Henning Dieterichs
2023-08-24 18:53:22 +02:00
committed by Henning Dieterichs
parent 3fbf0442d3
commit 6acb0ecd04
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
View File

@@ -63,7 +63,7 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
const controllerContainer = this._getWorkerProxy().then((workerProxy) => {
if (store.isDisposed || !workerProxy) { return undefined; }
const controllerContainer = { controller: undefined as undefined | TextMateWorkerTokenizerController };
const controllerContainer = { controller: undefined as undefined | TextMateWorkerTokenizerController, worker: this._worker };
store.add(keepAliveWhenAttached(textModel, () => {
const controller = new TextMateWorkerTokenizerController(textModel, workerProxy, this._languageService.languageIdCodec, tokenStore, this._configurationService, maxTokenizationLineLength);
controllerContainer.controller = controller;
@@ -82,10 +82,12 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
store.dispose();
},
requestTokens: async (startLineNumber, endLineNumberExclusive) => {
const controller = (await controllerContainer)?.controller;
if (controller) {
// If there is no controller, the model has been detached in the meantime
controller.requestTokens(startLineNumber, endLineNumberExclusive);
const container = await controllerContainer;
// If there is no controller, the model has been detached in the meantime.
// Only request the proxy object if the worker is the same!
if (container?.controller && container.worker === this._worker) {
container.controller.requestTokens(startLineNumber, endLineNumberExclusive);
}
},
reportMismatchingTokens: (lineNumber) => {