Synchronize only attached models to the TM worker

alexdima · alexdima · commit 144e913e2347 · 2019-07-09T12:23:45.000+02:00
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
@@ -1116,6 +1116,12 @@ export interface ITextModel {
 	 * @internal
 	 */
 	onDidChangeTokens(listener: (e: IModelTokensChangedEvent) => void): IDisposable;
+	/**
+	 * An event emitted when the model has been attached to the first editor or detached from the last editor.
+	 * @event
+	 * @internal
+	 */
+	onDidChangeAttached(listener: () => void): IDisposable;
 	/**
 	 * An event emitted right before disposing the model.
 	 * @event
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
@@ -233,6 +233,9 @@ export class TextModel extends Disposable implements model.ITextModel {
 	private readonly _onDidChangeOptions: Emitter<IModelOptionsChangedEvent> = this._register(new Emitter<IModelOptionsChangedEvent>());
 	public readonly onDidChangeOptions: Event<IModelOptionsChangedEvent> = this._onDidChangeOptions.event;
 
+	private readonly _onDidChangeAttached: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidChangeAttached: Event<void> = this._onDidChangeAttached.event;
+
 	private readonly _eventEmitter: DidChangeContentEmitter = this._register(new DidChangeContentEmitter());
 	public onDidChangeRawContentFast(listener: (e: ModelRawContentChangedEvent) => void): IDisposable {
 		return this._eventEmitter.fastEvent((e: InternalModelContentChangeEvent) => listener(e.rawContentChangedEvent));
@@ -555,10 +558,16 @@ export class TextModel extends Disposable implements model.ITextModel {
 		this._attachedEditorCount++;
 		// Warm up tokens for the editor
 		this._warmUpTokens();
+		if (this._attachedEditorCount === 1) {
+			this._onDidChangeAttached.fire(undefined);
+		}
 	}
 
 	public onBeforeDetached(): void {
 		this._attachedEditorCount--;
+		if (this._attachedEditorCount === 0) {
+			this._onDidChangeAttached.fire(undefined);
+		}
 	}
 
 	private _shouldAutoTokenize(): boolean {
diff --git a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts
@@ -26,32 +26,60 @@ class ModelWorkerTextMateTokenizer extends Disposable {
 
 	private readonly _worker: TextMateWorker;
 	private readonly _model: ITextModel;
+	private _isSynced: boolean;
 
 	constructor(worker: TextMateWorker, model: ITextModel) {
 		super();
 		this._worker = worker;
 		this._model = model;
+		this._isSynced = false;
 
+		this._register(this._model.onDidChangeAttached(() => this._onDidChangeAttached()));
+		this._onDidChangeAttached();
+
+		this._register(this._model.onDidChangeContent((e) => {
+			if (this._isSynced) {
+				this._worker.acceptModelChanged(this._model.uri.toString(), e);
+			}
+		}));
+
+		this._register(this._model.onDidChangeLanguage((e) => {
+			if (this._isSynced) {
+				this._worker.acceptModelLanguageChanged(this._model.uri.toString(), this._model.getLanguageIdentifier().id);
+			}
+		}));
+	}
+
+	private _onDidChangeAttached(): void {
+		if (this._model.isAttachedToEditor()) {
+			if (!this._isSynced) {
+				this._beginSync();
+			}
+		} else {
+			if (this._isSynced) {
+				this._endSync();
+			}
+		}
+	}
+
+	private _beginSync(): void {
+		this._isSynced = true;
 		this._worker.acceptNewModel({
 			uri: this._model.uri,
 			versionId: this._model.getVersionId(),
 			lines: this._model.getLinesContent(),
 			EOL: this._model.getEOL(),
 			languageId: this._model.getLanguageIdentifier().id,
 		});
+	}
 
-		this._register(this._model.onDidChangeContent((e) => {
-			this._worker.acceptModelChanged(this._model.uri.toString(), e);
-		}));
-
-		this._register(this._model.onDidChangeLanguage((e) => {
-			this._worker.acceptModelLanguageChanged(this._model.uri.toString(), this._model.getLanguageIdentifier().id);
-		}));
+	private _endSync(): void {
+		this._worker.acceptRemovedModel(this._model.uri.toString());
 	}
 
 	public dispose() {
 		super.dispose();
-		this._worker.acceptRemovedModel(this._model.uri.toString());
+		this._endSync();
 	}
 }
 
