fix microsoft#27949

jrieken · jrieken · commit 44da540b4b29 · 2017-06-06T19:14:15.000+02:00
diff --git a/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts b/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
@@ -98,6 +98,9 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape
 			this._activeEditorId = delta.newActiveEditor;
 		}
 
+		dispose(removedDocuments);
+		dispose(removedEditors);
+
 		// now that the internal state is complete, fire events
 		if (delta.removedDocuments) {
 			this._onDidRemoveDocuments.fire(removedDocuments);
@@ -112,10 +115,6 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape
 		if (delta.newActiveEditor !== undefined) {
 			this._onDidChangeActiveTextEditor.fire(this.activeEditor());
 		}
-
-		// now that the events are out, dispose removed documents and editors
-		dispose(removedDocuments);
-		dispose(removedEditors);
 	}
 
 	getDocument(strUrl: string): ExtHostDocumentData {
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import URI from 'vs/base/common/uri';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
+import { TPromise } from 'vs/base/common/winjs.base';
+
+
+suite('ExtHostDocumentsAndEditors', () => {
+
+	let editors: ExtHostDocumentsAndEditors;
+
+	setup(function () {
+		editors = new ExtHostDocumentsAndEditors({
+			_serviceBrand: undefined,
+			get() { return undefined; },
+			set() { }
+		});
+	});
+
+	test('The value of TextDocument.isClosed is incorrect when a text document is closed, #27949', () => {
+
+		editors.$acceptDocumentsAndEditorsDelta({
+			addedDocuments: [{
+				EOL: '\n',
+				isDirty: true,
+				modeId: 'fooLang',
+				url: URI.parse('foo:bar'),
+				versionId: 1,
+				lines: [
+					'first',
+					'second'
+				]
+			}]
+		});
+
+		return new TPromise((resolve, reject) => {
+
+			editors.onDidRemoveDocuments(e => {
+				try {
+
+					for (const data of e) {
+						assert.equal(data.document.isClosed, true);
+					}
+					resolve(undefined);
+				} catch (e) {
+					reject(e);
+				}
+			});
+
+			editors.$acceptDocumentsAndEditorsDelta({
+				removedDocuments: ['foo:bar']
+			});
+
+		});
+	});
+
+});

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,9 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape`
`98`	`98`	`this._activeEditorId = delta.newActiveEditor;`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ dispose(removedDocuments);`
	`102`	`+ dispose(removedEditors);`
	`103`	`+`
`101`	`104`	`// now that the internal state is complete, fire events`
`102`	`105`	`if (delta.removedDocuments) {`
`103`	`106`	`this._onDidRemoveDocuments.fire(removedDocuments);`
`@@ -112,10 +115,6 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape`
`112`	`115`	`if (delta.newActiveEditor !== undefined) {`
`113`	`116`	`this._onDidChangeActiveTextEditor.fire(this.activeEditor());`
`114`	`117`	`}`
`115`		`-`
`116`		`- // now that the events are out, dispose removed documents and editors`
`117`		`- dispose(removedDocuments);`
`118`		`- dispose(removedEditors);`
`119`	`118`	`}`
`120`	`119`
`121`	`120`	`getDocument(strUrl: string): ExtHostDocumentData {`