Revert "improve revert logic for untitled"

This reverts commit 0256f00.

src/vs/workbench/browser/parts/editor/stringEditor.ts

@@ -51,10 +51,10 @@ export class StringEditor extends BaseTextEditor {
 
 		this.mapResourceToEditorViewState = Object.create(null);
 
-		this.toUnbind.push(this.eventService.addListener2(EventType.UNTITLED_FILE_SAVED, (e: UntitledEditorEvent) => this.onUntitledSavedEvent(e)));
+		this.toUnbind.push(this.eventService.addListener2(EventType.UNTITLED_FILE_DELETED, (e: UntitledEditorEvent) => this.onUntitledDeletedEvent(e)));
 	}
 
-	private onUntitledSavedEvent(e: UntitledEditorEvent): void {
+	private onUntitledDeletedEvent(e: UntitledEditorEvent): void {
 		delete this.mapResourceToEditorViewState[e.resource.toString()];
 	}
 

src/vs/workbench/common/editor/untitledEditorInput.ts

@@ -58,7 +58,7 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_SAVED, (e: UntitledEditorEvent) => this.onDirtyStateChange(e)));
+		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DELETED, (e: UntitledEditorEvent) => this.onDirtyStateChange(e)));
 		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DIRTY, (e: UntitledEditorEvent) => this.onDirtyStateChange(e)));
 	}
 
@@ -97,9 +97,7 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
 	}
 
 	public revert(): TPromise<boolean> {
-		this.cachedModel.revert();
-
-		return TPromise.as(true);
+		return this.textFileService.revert(this.resource);
 	}
 
 	public suggestFileName(): string {
@@ -181,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();
 	}
 }

src/vs/workbench/common/editor/untitledEditorModel.ts

@@ -86,12 +86,6 @@ export class UntitledEditorModel extends StringEditorModel implements IEncodingS
 		return this.dirty;
 	}
 
-	public revert(): void {
-		this.dirty = false;
-
-		this.eventService.emit(WorkbenchEventType.UNTITLED_FILE_SAVED, new UntitledEditorEvent(this.resource));
-	}
-
 	public load(): TPromise<EditorModel> {
 		return super.load().then((model) => {
 			const configuration = this.configurationService.getConfiguration<IFilesConfiguration>();
@@ -123,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;
@@ -132,5 +128,7 @@ export class UntitledEditorModel extends StringEditorModel implements IEncodingS
 			this.configurationChangeListener.dispose();
 			this.configurationChangeListener = null;
 		}
+
+		this.eventService.emit(WorkbenchEventType.UNTITLED_FILE_DELETED, new UntitledEditorEvent(this.resource));
 	}
 }

src/vs/workbench/common/events.ts

@@ -33,9 +33,9 @@ export class EventType {
 	static UNTITLED_FILE_DIRTY = 'untitledFileDirty';
 
 	/**
-	 * Event type for when an untitled file is saved.
+	 * Event type for when an untitled file is deleted.
 	 */
-	static UNTITLED_FILE_SAVED = 'untitledFileSaved';
+	static UNTITLED_FILE_DELETED = 'untitledFileDeleted';
 
 	/**
 	 * Event type for when a resources encoding changes.

src/vs/workbench/parts/files/browser/fileActions.ts

@@ -1535,7 +1535,7 @@ export abstract class BaseSaveAllAction extends BaseActionWithErrorReporting {
 
 		if (this.includeUntitled()) {
 			this.toDispose.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DIRTY, () => this.updateEnablement(true)));
-			this.toDispose.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_SAVED, () => this.updateEnablement(false)));
+			this.toDispose.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DELETED, () => this.updateEnablement(false)));
 		}
 	}
 

src/vs/workbench/parts/files/browser/fileTracker.ts

@@ -65,7 +65,7 @@ export class FileTracker implements IWorkbenchContribution {
 
 		// Update editors and inputs from local changes and saves
 		this.toUnbind.push(this.editorGroupService.onEditorsChanged(() => this.onEditorsChanged()));
-		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_SAVED, (e: UntitledEditorEvent) => this.onUntitledEditorSaved(e)));
+		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DELETED, (e: UntitledEditorEvent) => this.onUntitledEditorDeleted(e)));
 		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DIRTY, (e: UntitledEditorEvent) => this.onUntitledEditorDirty(e)));
 		this.toUnbind.push(this.eventService.addListener2(FileEventType.FILE_DIRTY, (e: TextFileChangeEvent) => this.onTextFileDirty(e)));
 		this.toUnbind.push(this.eventService.addListener2(FileEventType.FILE_SAVE_ERROR, (e: TextFileChangeEvent) => this.onTextFileSaveError(e)));
@@ -107,7 +107,7 @@ export class FileTracker implements IWorkbenchContribution {
 		this.updateActivityBadge();
 	}
 
-	private onUntitledEditorSaved(e: UntitledEditorEvent): void {
+	private onUntitledEditorDeleted(e: UntitledEditorEvent): void {
 		if (this.lastDirtyCount > 0) {
 			this.updateActivityBadge();
 		}

src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts

@@ -77,7 +77,7 @@ export class FileTracker implements IWorkbenchContribution {
 	private registerListeners(): void {
 
 		// Local text file changes
-		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_SAVED, () => this.onUntitledSavedEvent()));
+		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DELETED, () => this.onUntitledDeletedEvent()));
 		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DIRTY, () => this.onUntitledDirtyEvent()));
 		this.toUnbind.push(this.eventService.addListener2(FileEventType.FILE_DIRTY, (e: TextFileChangeEvent) => this.onTextFileDirty(e)));
 		this.toUnbind.push(this.eventService.addListener2(FileEventType.FILE_SAVED, (e: TextFileChangeEvent) => this.onTextFileSaved(e)));
@@ -199,7 +199,7 @@ export class FileTracker implements IWorkbenchContribution {
 		}
 	}
 
-	private onUntitledSavedEvent(): void {
+	private onUntitledDeletedEvent(): void {
 		if (this.isDocumentedEdited) {
 			this.updateDocumentEdited();
 		}

src/vs/workbench/parts/files/electron-browser/textFileServices.ts

@@ -117,8 +117,17 @@ export class TextFileService extends AbstractTextFileService {
 		return super.revertAll(resources, force).then(r => {
 
 			// Revert untitled
-			const reverted = this.untitledEditorService.revertAll(resources);
-			reverted.forEach(res => r.results.push({ source: res, success: true }));
+			let untitledInputs = this.untitledEditorService.getAll(resources);
+			untitledInputs.forEach(input => {
+				if (input) {
+					input.dispose();
+
+					r.results.push({
+						source: input.getResource(),
+						success: true
+					});
+				}
+			});
 
 			return r;
 		});

src/vs/workbench/parts/search/browser/searchViewlet.ts

@@ -692,7 +692,7 @@ export class SearchViewlet extends Viewlet {
 		this.viewletSettings = this.getMemento(storageService, Scope.WORKSPACE);
 
 		this.toUnbind.push(this.eventService.addListener2(FileEventType.FILE_CHANGES, (e) => this.onFilesChanged(e)));
-		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_SAVED, (e) => this.onUntitledFileSaved(e)));
+		this.toUnbind.push(this.eventService.addListener2(WorkbenchEventType.UNTITLED_FILE_DELETED, (e) => this.onUntitledFileDeleted(e)));
 		this.toUnbind.push(this.configurationService.onDidUpdateConfiguration(e => this.onConfigurationUpdated(e.config)));
 	}
 
@@ -1456,7 +1456,7 @@ export class SearchViewlet extends Viewlet {
 		}, sideBySide);
 	}
 
-	private onUntitledFileSaved(e: UntitledEditorEvent): void {
+	private onUntitledFileDeleted(e: UntitledEditorEvent): void {
 		if (!this.viewModel) {
 			return;
 		}

src/vs/workbench/services/untitled/common/untitledEditorService.ts

@@ -36,11 +36,6 @@ export interface IUntitledEditorService {
 	 */
 	isDirty(resource: URI): boolean;
 
-	/**
-	 * Reverts the untitled resources if found.
-	 */
-	revertAll(resources?: URI[]): URI[];
-
 	/**
 	 * Creates a new untitled input with the optional resource URI or returns an existing one
 	 * if the provided resource exists already as untitled input.
@@ -77,21 +72,6 @@ export class UntitledEditorService implements IUntitledEditorService {
 		return Object.keys(UntitledEditorService.CACHE).map((key) => UntitledEditorService.CACHE[key]);
 	}
 
-	public revertAll(resources?: URI[], force?: boolean): URI[] {
-		const reverted: URI[] = [];
-
-		const untitledInputs = this.getAll(resources);
-		untitledInputs.forEach(input => {
-			if (input) {
-				input.revert();
-
-				reverted.push(input.getResource());
-			}
-		});
-
-		return reverted;
-	}
-
 	public isDirty(resource: URI): boolean {
 		let input = this.get(resource);
 

src/vs/workbench/test/common/servicesTestUtils.ts

@@ -295,10 +295,6 @@ export class TestUntitledEditorService implements IUntitledEditorService {
 		return [];
 	}
 
-	public 	revertAll(resources?: URI[]): URI[] {
-		return [];
-	}
-
 	public isDirty() {
 		return false;
 	}