Skip to content

Commit 157abd2

Browse files
author
Benjamin Pasero
committed
untitled - align event names with files
1 parent 08b8316 commit 157abd2

6 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎src/vs/workbench/browser/labels.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ export class ResourceLabels extends Disposable {
148148
}));
149149

150150
// notify when untitled labels change
151-
this.textFileService.untitled.onDidChangeLabel(resource => {
152-
this._widgets.forEach(widget => widget.notifyUntitledLabelChange(resource));
151+
this.textFileService.untitled.onDidChangeLabel(model => {
152+
this._widgets.forEach(widget => widget.notifyUntitledLabelChange(model.resource));
153153
});
154154
}
155155

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
314314

315315
private registerListeners(): void {
316316
this._register(this.editorService.onDidActiveEditorChange(() => this.updateStatusBar()));
317-
this._register(this.textFileService.untitled.onDidChangeEncoding(r => this.onResourceEncodingChange(r)));
318-
this._register(this.textFileService.files.onDidChangeEncoding(m => this.onResourceEncodingChange((m.resource))));
317+
this._register(this.textFileService.untitled.onDidChangeEncoding(model => this.onResourceEncodingChange(model.resource)));
318+
this._register(this.textFileService.files.onDidChangeEncoding(model => this.onResourceEncodingChange((model.resource))));
319319
this._register(TabFocus.onDidChangeTabFocus(e => this.onTabFocusModeChange()));
320320
}
321321

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ export class FileEditorTracker extends Disposable implements IWorkbenchContribut
5959
this._register(this.fileService.onDidFilesChange(e => this.onDidFilesChange(e)));
6060

6161
// Ensure dirty text file and untitled models are always opened as editors
62-
this._register(this.textFileService.files.onDidChangeDirty(m => this.ensureDirtyFilesAreOpenedWorker.work(m.resource)));
63-
this._register(this.textFileService.files.onDidSaveError(m => this.ensureDirtyFilesAreOpenedWorker.work(m.resource)));
64-
this._register(this.textFileService.untitled.onDidChangeDirty(r => this.ensureDirtyFilesAreOpenedWorker.work(r)));
62+
this._register(this.textFileService.files.onDidChangeDirty(model => this.ensureDirtyFilesAreOpenedWorker.work(model.resource)));
63+
this._register(this.textFileService.files.onDidSaveError(model => this.ensureDirtyFilesAreOpenedWorker.work(model.resource)));
64+
this._register(this.textFileService.untitled.onDidChangeDirty(model => this.ensureDirtyFilesAreOpenedWorker.work(model.resource)));
6565

6666
// Out of workspace file watchers
6767
this._register(this.editorService.onDidVisibleEditorsChange(() => this.onDidVisibleEditorsChange()));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export class SearchView extends ViewPane {
213213
this.viewletState = this.memento.getMemento(StorageScope.WORKSPACE);
214214

215215
this._register(this.fileService.onDidFilesChange(e => this.onFilesChanged(e)));
216-
this._register(this.textFileService.untitled.onDidDisposeModel(e => this.onUntitledDidDispose(e)));
216+
this._register(this.textFileService.untitled.onDidDispose(model => this.onUntitledDidDispose(model.resource)));
217217
this._register(this.contextService.onDidChangeWorkbenchState(() => this.onDidChangeWorkbenchState()));
218218
this._register(this.searchHistoryService.onDidClearHistory(() => this.clearHistory()));
219219

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,22 @@ export interface IUntitledTextEditorModelManager {
6767
/**
6868
* Events for when untitled text editors change (e.g. getting dirty, saved or reverted).
6969
*/
70-
readonly onDidChangeDirty: Event<URI>;
70+
readonly onDidChangeDirty: Event<IUntitledTextEditorModel>;
7171

7272
/**
7373
* Events for when untitled text editor encodings change.
7474
*/
75-
readonly onDidChangeEncoding: Event<URI>;
75+
readonly onDidChangeEncoding: Event<IUntitledTextEditorModel>;
7676

7777
/**
7878
* Events for when untitled text editor labels change.
7979
*/
80-
readonly onDidChangeLabel: Event<URI>;
80+
readonly onDidChangeLabel: Event<IUntitledTextEditorModel>;
8181

8282
/**
8383
* Events for when untitled text editors are disposed.
8484
*/
85-
readonly onDidDisposeModel: Event<URI>;
85+
readonly onDidDispose: Event<IUntitledTextEditorModel>;
8686

8787
/**
8888
* Creates a new untitled editor model with the provided options. If the `untitledResource`
@@ -117,16 +117,16 @@ export class UntitledTextEditorService extends Disposable implements IUntitledTe
117117

118118
_serviceBrand: undefined;
119119

120-
private readonly _onDidChangeDirty = this._register(new Emitter<URI>());
120+
private readonly _onDidChangeDirty = this._register(new Emitter<IUntitledTextEditorModel>());
121121
readonly onDidChangeDirty = this._onDidChangeDirty.event;
122122

123-
private readonly _onDidChangeEncoding = this._register(new Emitter<URI>());
123+
private readonly _onDidChangeEncoding = this._register(new Emitter<IUntitledTextEditorModel>());
124124
readonly onDidChangeEncoding = this._onDidChangeEncoding.event;
125125

126-
private readonly _onDidDisposeModel = this._register(new Emitter<URI>());
127-
readonly onDidDisposeModel = this._onDidDisposeModel.event;
126+
private readonly _onDidDispose = this._register(new Emitter<IUntitledTextEditorModel>());
127+
readonly onDidDispose = this._onDidDispose.event;
128128

129-
private readonly _onDidChangeLabel = this._register(new Emitter<URI>());
129+
private readonly _onDidChangeLabel = this._register(new Emitter<IUntitledTextEditorModel>());
130130
readonly onDidChangeLabel = this._onDidChangeLabel.event;
131131

132132
private readonly mapResourceToModel = new ResourceMap<UntitledTextEditorModel>();
@@ -220,10 +220,10 @@ export class UntitledTextEditorService extends Disposable implements IUntitledTe
220220

221221
private registerModel(model: UntitledTextEditorModel): void {
222222
const modelDisposables = new DisposableStore();
223-
modelDisposables.add(model.onDidChangeDirty(() => this._onDidChangeDirty.fire(model.resource)));
224-
modelDisposables.add(model.onDidChangeName(() => this._onDidChangeLabel.fire(model.resource)));
225-
modelDisposables.add(model.onDidChangeEncoding(() => this._onDidChangeEncoding.fire(model.resource)));
226-
modelDisposables.add(model.onDispose(() => this._onDidDisposeModel.fire(model.resource)));
223+
modelDisposables.add(model.onDidChangeDirty(() => this._onDidChangeDirty.fire(model)));
224+
modelDisposables.add(model.onDidChangeName(() => this._onDidChangeLabel.fire(model)));
225+
modelDisposables.add(model.onDidChangeEncoding(() => this._onDidChangeEncoding.fire(model)));
226+
modelDisposables.add(model.onDispose(() => this._onDidDispose.fire(model)));
227227

228228
// Remove from cache on dispose
229229
Event.once(model.onDispose)(() => {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ suite('Untitled text editors', () => {
108108

109109
function awaitDidChangeDirty(service: IUntitledTextEditorService): Promise<URI> {
110110
return new Promise(c => {
111-
const listener = service.onDidChangeDirty(async resource => {
111+
const listener = service.onDidChangeDirty(async model => {
112112
listener.dispose();
113113

114-
c(resource);
114+
c(model.resource);
115115
});
116116
});
117117
}
@@ -328,9 +328,9 @@ suite('Untitled text editors', () => {
328328

329329
let counter = 0;
330330

331-
service.onDidChangeEncoding(r => {
331+
service.onDidChangeEncoding(model => {
332332
counter++;
333-
assert.equal(r.toString(), input.resource.toString());
333+
assert.equal(model.resource.toString(), input.resource.toString());
334334
});
335335

336336
// encoding
@@ -347,9 +347,9 @@ suite('Untitled text editors', () => {
347347

348348
let counter = 0;
349349

350-
service.onDidChangeLabel(r => {
350+
service.onDidChangeLabel(model => {
351351
counter++;
352-
assert.equal(r.toString(), input.resource.toString());
352+
assert.equal(model.resource.toString(), input.resource.toString());
353353
});
354354

355355
// label
@@ -366,9 +366,9 @@ suite('Untitled text editors', () => {
366366

367367
let counter = 0;
368368

369-
service.onDidDisposeModel(r => {
369+
service.onDidDispose(model => {
370370
counter++;
371-
assert.equal(r.toString(), input.resource.toString());
371+
assert.equal(model.resource.toString(), input.resource.toString());
372372
});
373373

374374
const model = await input.resolve();

0 commit comments

Comments
 (0)