From 1cda680453aafa6dce12e98739651e18f76680e2 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 24 Oct 2016 13:06:48 +0200 Subject: [PATCH] also send isDirty-flag when forwarding model changes, #11339 --- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- src/vs/workbench/api/node/extHostDocuments.ts | 3 ++- src/vs/workbench/api/node/mainThreadDocuments.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 8813c2da060..fe0a73be762 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -231,7 +231,7 @@ export abstract class ExtHostDocumentsShape { $acceptModelDirty(strURL: string): void { throw ni(); } $acceptModelReverted(strURL: string): void { throw ni(); } $acceptModelRemoved(strURL: string): void { throw ni(); } - $acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[]): void { throw ni(); } + $acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[], isDirty: boolean): void { throw ni(); } } export abstract class ExtHostDocumentSaveParticipantShape { diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts index 2216b8cf4a9..8f7b18db3ff 100644 --- a/src/vs/workbench/api/node/extHostDocuments.ts +++ b/src/vs/workbench/api/node/extHostDocuments.ts @@ -199,8 +199,9 @@ export class ExtHostDocuments extends ExtHostDocumentsShape { data.dispose(); } - public $acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[]): void { + public $acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[], isDirty: boolean): void { let data = this._documentData[strURL]; + data._acceptIsDirty(isDirty); data.onEvents(events); this._onDidChangeDocumentEventEmitter.fire({ document: data.document, diff --git a/src/vs/workbench/api/node/mainThreadDocuments.ts b/src/vs/workbench/api/node/mainThreadDocuments.ts index b39faff7845..eb25df0e6d4 100644 --- a/src/vs/workbench/api/node/mainThreadDocuments.ts +++ b/src/vs/workbench/api/node/mainThreadDocuments.ts @@ -147,7 +147,7 @@ export class MainThreadDocuments extends MainThreadDocumentsShape { } } if (changedEvents.length > 0) { - this._proxy.$acceptModelChanged(modelUrl.toString(), changedEvents); + this._proxy.$acceptModelChanged(modelUrl.toString(), changedEvents, this._textFileService.isDirty(modelUrl)); } }