Explorer activity icon unsaved count decoration stays around (fixes #…

…7180)
microsoft · Jun 6, 2016 · 0fe5631 · 0fe5631
1 parent c215e7c
commit 0fe5631
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -158,8 +158,8 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
 				mime = mimeFromPath; // take most specific mime type if file path is associated and mime is specific
 			}
 		}
-		return this.instantiationService.createInstance(UntitledEditorModel, content, mime || MIME_TEXT,
-			this.resource, this.hasAssociatedFilePath);
+
+		return this.instantiationService.createInstance(UntitledEditorModel, content, mime || MIME_TEXT, this.resource, this.hasAssociatedFilePath);
 	}
 
 	public matches(otherInput: any): boolean {
@@ -179,15 +179,15 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
 
 	public dispose(): void {
 
-		// Listeners
-		dispose(this.toUnbind);
-
 		// Model
 		if (this.cachedModel) {
 			this.cachedModel.dispose();
 			this.cachedModel = null;
 		}
 
+		// Listeners
+		dispose(this.toUnbind);
+
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/common/editor/untitledEditorModel.ts b/src/vs/workbench/common/editor/untitledEditorModel.ts
@@ -117,6 +117,8 @@ export class UntitledEditorModel extends StringEditorModel implements IEncodingS
 	public dispose(): void {
 		super.dispose();
 
+		this.dirty = false; // we can no longer be dirty
+
 		if (this.textModelChangeListener) {
 			this.textModelChangeListener.dispose();
 			this.textModelChangeListener = null;

diff --git a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts
@@ -87,7 +87,7 @@ export class TextFileService extends AbstractTextFileService {
 
 		// Save
 		if (confirm === ConfirmResult.SAVE) {
-			return this.saveAll(true /* includeUntitled */).then((result) => {
+			return this.saveAll(true /* includeUntitled */).then(result => {
 				if (result.results.some((r) => !r.success)) {
 					return true; // veto if some saves failed
 				}
@@ -114,11 +114,11 @@ export class TextFileService extends AbstractTextFileService {
 	public revertAll(resources?: URI[], force?: boolean): TPromise<ITextFileOperationResult> {
 
 		// Revert files
-		return super.revertAll(resources, force).then((r) => {
+		return super.revertAll(resources, force).then(r => {
 
 			// Revert untitled
 			let untitledInputs = this.untitledEditorService.getAll(resources);
-			untitledInputs.forEach((input) => {
+			untitledInputs.forEach(input => {
 				if (input) {
 					input.dispose();