untitled - align event names with files

src/vs/workbench/browser/labels.ts

@@ -148,8 +148,8 @@ export class ResourceLabels extends Disposable {
 		}));
 
 		// notify when untitled labels change
-		this.textFileService.untitled.onDidChangeLabel(resource => {
-			this._widgets.forEach(widget => widget.notifyUntitledLabelChange(resource));
+		this.textFileService.untitled.onDidChangeLabel(model => {
+			this._widgets.forEach(widget => widget.notifyUntitledLabelChange(model.resource));
 		});
 	}
 

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

@@ -314,8 +314,8 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 
 	private registerListeners(): void {
 		this._register(this.editorService.onDidActiveEditorChange(() => this.updateStatusBar()));
-		this._register(this.textFileService.untitled.onDidChangeEncoding(r => this.onResourceEncodingChange(r)));
-		this._register(this.textFileService.files.onDidChangeEncoding(m => this.onResourceEncodingChange((m.resource))));
+		this._register(this.textFileService.untitled.onDidChangeEncoding(model => this.onResourceEncodingChange(model.resource)));
+		this._register(this.textFileService.files.onDidChangeEncoding(model => this.onResourceEncodingChange((model.resource))));
 		this._register(TabFocus.onDidChangeTabFocus(e => this.onTabFocusModeChange()));
 	}
 

src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts

@@ -59,9 +59,9 @@ export class FileEditorTracker extends Disposable implements IWorkbenchContribut
 		this._register(this.fileService.onDidFilesChange(e => this.onDidFilesChange(e)));
 
 		// Ensure dirty text file and untitled models are always opened as editors
-		this._register(this.textFileService.files.onDidChangeDirty(m => this.ensureDirtyFilesAreOpenedWorker.work(m.resource)));
-		this._register(this.textFileService.files.onDidSaveError(m => this.ensureDirtyFilesAreOpenedWorker.work(m.resource)));
-		this._register(this.textFileService.untitled.onDidChangeDirty(r => this.ensureDirtyFilesAreOpenedWorker.work(r)));
+		this._register(this.textFileService.files.onDidChangeDirty(model => this.ensureDirtyFilesAreOpenedWorker.work(model.resource)));
+		this._register(this.textFileService.files.onDidSaveError(model => this.ensureDirtyFilesAreOpenedWorker.work(model.resource)));
+		this._register(this.textFileService.untitled.onDidChangeDirty(model => this.ensureDirtyFilesAreOpenedWorker.work(model.resource)));
 
 		// Out of workspace file watchers
 		this._register(this.editorService.onDidVisibleEditorsChange(() => this.onDidVisibleEditorsChange()));

src/vs/workbench/contrib/search/browser/searchView.ts

@@ -213,7 +213,7 @@ export class SearchView extends ViewPane {
 		this.viewletState = this.memento.getMemento(StorageScope.WORKSPACE);
 
 		this._register(this.fileService.onDidFilesChange(e => this.onFilesChanged(e)));
-		this._register(this.textFileService.untitled.onDidDisposeModel(e => this.onUntitledDidDispose(e)));
+		this._register(this.textFileService.untitled.onDidDispose(model => this.onUntitledDidDispose(model.resource)));
 		this._register(this.contextService.onDidChangeWorkbenchState(() => this.onDidChangeWorkbenchState()));
 		this._register(this.searchHistoryService.onDidClearHistory(() => this.clearHistory()));
 

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

@@ -67,22 +67,22 @@ export interface IUntitledTextEditorModelManager {
 	/**
 	 * Events for when untitled text editors change (e.g. getting dirty, saved or reverted).
 	 */
-	readonly onDidChangeDirty: Event<URI>;
+	readonly onDidChangeDirty: Event<IUntitledTextEditorModel>;
 
 	/**
 	 * Events for when untitled text editor encodings change.
 	 */
-	readonly onDidChangeEncoding: Event<URI>;
+	readonly onDidChangeEncoding: Event<IUntitledTextEditorModel>;
 
 	/**
 	 * Events for when untitled text editor labels change.
 	 */
-	readonly onDidChangeLabel: Event<URI>;
+	readonly onDidChangeLabel: Event<IUntitledTextEditorModel>;
 
 	/**
 	 * Events for when untitled text editors are disposed.
 	 */
-	readonly onDidDisposeModel: Event<URI>;
+	readonly onDidDispose: Event<IUntitledTextEditorModel>;
 
 	/**
 	 * Creates a new untitled editor model with the provided options. If the `untitledResource`
@@ -117,16 +117,16 @@ export class UntitledTextEditorService extends Disposable implements IUntitledTe
 
 	_serviceBrand: undefined;
 
-	private readonly _onDidChangeDirty = this._register(new Emitter<URI>());
+	private readonly _onDidChangeDirty = this._register(new Emitter<IUntitledTextEditorModel>());
 	readonly onDidChangeDirty = this._onDidChangeDirty.event;
 
-	private readonly _onDidChangeEncoding = this._register(new Emitter<URI>());
+	private readonly _onDidChangeEncoding = this._register(new Emitter<IUntitledTextEditorModel>());
 	readonly onDidChangeEncoding = this._onDidChangeEncoding.event;
 
-	private readonly _onDidDisposeModel = this._register(new Emitter<URI>());
-	readonly onDidDisposeModel = this._onDidDisposeModel.event;
+	private readonly _onDidDispose = this._register(new Emitter<IUntitledTextEditorModel>());
+	readonly onDidDispose = this._onDidDispose.event;
 
-	private readonly _onDidChangeLabel = this._register(new Emitter<URI>());
+	private readonly _onDidChangeLabel = this._register(new Emitter<IUntitledTextEditorModel>());
 	readonly onDidChangeLabel = this._onDidChangeLabel.event;
 
 	private readonly mapResourceToModel = new ResourceMap<UntitledTextEditorModel>();
@@ -220,10 +220,10 @@ export class UntitledTextEditorService extends Disposable implements IUntitledTe
 
 	private registerModel(model: UntitledTextEditorModel): void {
 		const modelDisposables = new DisposableStore();
-		modelDisposables.add(model.onDidChangeDirty(() => this._onDidChangeDirty.fire(model.resource)));
-		modelDisposables.add(model.onDidChangeName(() => this._onDidChangeLabel.fire(model.resource)));
-		modelDisposables.add(model.onDidChangeEncoding(() => this._onDidChangeEncoding.fire(model.resource)));
-		modelDisposables.add(model.onDispose(() => this._onDidDisposeModel.fire(model.resource)));
+		modelDisposables.add(model.onDidChangeDirty(() => this._onDidChangeDirty.fire(model)));
+		modelDisposables.add(model.onDidChangeName(() => this._onDidChangeLabel.fire(model)));
+		modelDisposables.add(model.onDidChangeEncoding(() => this._onDidChangeEncoding.fire(model)));
+		modelDisposables.add(model.onDispose(() => this._onDidDispose.fire(model)));
 
 		// Remove from cache on dispose
 		Event.once(model.onDispose)(() => {

src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts

@@ -108,10 +108,10 @@ suite('Untitled text editors', () => {
 
 	function awaitDidChangeDirty(service: IUntitledTextEditorService): Promise<URI> {
 		return new Promise(c => {
-			const listener = service.onDidChangeDirty(async resource => {
+			const listener = service.onDidChangeDirty(async model => {
 				listener.dispose();
 
-				c(resource);
+				c(model.resource);
 			});
 		});
 	}
@@ -328,9 +328,9 @@ suite('Untitled text editors', () => {
 
 		let counter = 0;
 
-		service.onDidChangeEncoding(r => {
+		service.onDidChangeEncoding(model => {
 			counter++;
-			assert.equal(r.toString(), input.resource.toString());
+			assert.equal(model.resource.toString(), input.resource.toString());
 		});
 
 		// encoding
@@ -347,9 +347,9 @@ suite('Untitled text editors', () => {
 
 		let counter = 0;
 
-		service.onDidChangeLabel(r => {
+		service.onDidChangeLabel(model => {
 			counter++;
-			assert.equal(r.toString(), input.resource.toString());
+			assert.equal(model.resource.toString(), input.resource.toString());
 		});
 
 		// label
@@ -366,9 +366,9 @@ suite('Untitled text editors', () => {
 
 		let counter = 0;
 
-		service.onDidDisposeModel(r => {
+		service.onDidDispose(model => {
 			counter++;
-			assert.equal(r.toString(), input.resource.toString());
+			assert.equal(model.resource.toString(), input.resource.toString());
 		});
 
 		const model = await input.resolve();