Skip to content

Commit 41eabcf

Browse files
author
Benjamin Pasero
committed
text files - rename models => files
1 parent 3d9d1f9 commit 41eabcf

27 files changed

Lines changed: 79 additions & 79 deletions

‎src/vs/workbench/api/browser/mainThreadDocuments.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
9898
this._toDispose.add(this._modelReferenceCollection);
9999
this._toDispose.add(modelService.onModelModeChanged(this._onModelModeChanged, this));
100100

101-
this._toDispose.add(textFileService.models.onDidSave(e => {
101+
this._toDispose.add(textFileService.files.onDidSave(e => {
102102
if (this._shouldHandleFileEvent(e.model.resource)) {
103103
this._proxy.$acceptModelSaved(e.model.resource);
104104
}
105105
}));
106-
this._toDispose.add(textFileService.models.onDidChangeDirty(m => {
106+
this._toDispose.add(textFileService.files.onDidChangeDirty(m => {
107107
if (this._shouldHandleFileEvent(m.resource)) {
108108
this._proxy.$acceptDirtyStateChanged(m.resource, m.isDirty());
109109
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ export function fillResourceDataTransfers(accessor: ServicesAccessor, resources:
377377
encoding = model.getEncoding();
378378
mode = model.getMode();
379379
} else {
380-
const model = textFileService.models.get(file.resource);
380+
const model = textFileService.files.get(file.resource);
381381
if (model) {
382382
encoding = model.getEncoding();
383383
mode = model.getMode();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
312312
private registerListeners(): void {
313313
this._register(this.editorService.onDidActiveEditorChange(() => this.updateStatusBar()));
314314
this._register(this.textFileService.untitled.onDidChangeEncoding(r => this.onResourceEncodingChange(r)));
315-
this._register(this.textFileService.models.onDidChangeEncoding(m => this.onResourceEncodingChange((m.resource))));
315+
this._register(this.textFileService.files.onDidChangeEncoding(m => this.onResourceEncodingChange((m.resource))));
316316
this._register(TabFocus.onDidChangeTabFocus(e => this.onTabFocusModeChange()));
317317
}
318318

‎src/vs/workbench/contrib/backup/test/electron-browser/backupOnShutdown.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ suite('BackupOnShutdown', () => {
6666
if (model) {
6767
model.dispose();
6868
}
69-
(<TextFileEditorModelManager>accessor.textFileService.models).dispose();
69+
(<TextFileEditorModelManager>accessor.textFileService.files).dispose();
7070
backupOnShutdown.dispose();
7171
});
7272

7373
test('confirm onWillShutdown - no veto', async function () {
7474
model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8', undefined);
75-
(<TextFileEditorModelManager>accessor.textFileService.models).add(model.resource, model);
75+
(<TextFileEditorModelManager>accessor.textFileService.files).add(model.resource, model);
7676

7777
const event = new BeforeShutdownEventImpl();
7878
accessor.lifecycleService.fireWillShutdown(event);
@@ -87,7 +87,7 @@ suite('BackupOnShutdown', () => {
8787

8888
test('confirm onWillShutdown - veto if user cancels', async function () {
8989
model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8', undefined);
90-
(<TextFileEditorModelManager>accessor.textFileService.models).add(model.resource, model);
90+
(<TextFileEditorModelManager>accessor.textFileService.files).add(model.resource, model);
9191

9292
accessor.fileDialogService.setConfirmResult(ConfirmResult.CANCEL);
9393

@@ -102,7 +102,7 @@ suite('BackupOnShutdown', () => {
102102

103103
test('confirm onWillShutdown - no veto and backups cleaned up if user does not want to save (hot.exit: off)', async function () {
104104
model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8', undefined);
105-
(<TextFileEditorModelManager>accessor.textFileService.models).add(model.resource, model);
105+
(<TextFileEditorModelManager>accessor.textFileService.files).add(model.resource, model);
106106

107107
accessor.fileDialogService.setConfirmResult(ConfirmResult.DONT_SAVE);
108108
accessor.filesConfigurationService.onFilesConfigurationChange({ files: { hotExit: 'off' } });
@@ -127,7 +127,7 @@ suite('BackupOnShutdown', () => {
127127

128128
test('confirm onWillShutdown - save (hot.exit: off)', async function () {
129129
model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8', undefined);
130-
(<TextFileEditorModelManager>accessor.textFileService.models).add(model.resource, model);
130+
(<TextFileEditorModelManager>accessor.textFileService.files).add(model.resource, model);
131131

132132
accessor.fileDialogService.setConfirmResult(ConfirmResult.SAVE);
133133
accessor.filesConfigurationService.onFilesConfigurationChange({ files: { hotExit: 'off' } });
@@ -248,7 +248,7 @@ suite('BackupOnShutdown', () => {
248248

249249
async function hotExitTest(this: any, setting: string, shutdownReason: ShutdownReason, multipleWindows: boolean, workspace: boolean, shouldVeto: boolean): Promise<void> {
250250
model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8', undefined);
251-
(<TextFileEditorModelManager>accessor.textFileService.models).add(model.resource, model);
251+
(<TextFileEditorModelManager>accessor.textFileService.files).add(model.resource, model);
252252

253253
// Set hot exit config
254254
accessor.filesConfigurationService.onFilesConfigurationChange({ files: { hotExit: setting } });

‎src/vs/workbench/contrib/backup/test/electron-browser/backupRestorer.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ suite('BackupRestorer', () => {
8484
dispose(disposables);
8585
disposables = [];
8686

87-
(<TextFileEditorModelManager>accessor.textFileService.models).dispose();
87+
(<TextFileEditorModelManager>accessor.textFileService.files).dispose();
8888

8989
return pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
9090
});
@@ -137,11 +137,11 @@ suite('BackupRestorer', () => {
137137
model.dispose();
138138
counter++;
139139
} else if (isEqual(resource, fooFile)) {
140-
const model = await accessor.textFileService.models.get(resource!)?.load();
140+
const model = await accessor.textFileService.files.get(resource!)?.load();
141141
assert.equal(model?.textEditorModel?.getValue(), 'fooFile');
142142
counter++;
143143
} else {
144-
const model = await accessor.textFileService.models.get(resource!)?.load();
144+
const model = await accessor.textFileService.files.get(resource!)?.load();
145145
assert.equal(model?.textEditorModel?.getValue(), 'barFile');
146146
counter++;
147147
}

‎src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ suite('BackupTracker', () => {
9090
dispose(disposables);
9191
disposables = [];
9292

93-
(<TextFileEditorModelManager>accessor.textFileService.models).dispose();
93+
(<TextFileEditorModelManager>accessor.textFileService.files).dispose();
9494

9595
return pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
9696
});
@@ -151,7 +151,7 @@ suite('BackupTracker', () => {
151151
const resource = toResource.call(this, '/path/index.txt');
152152
await accessor.editorService.openEditor({ resource, options: { pinned: true } });
153153

154-
const fileModel = accessor.textFileService.models.get(resource);
154+
const fileModel = accessor.textFileService.files.get(resource);
155155
fileModel?.textEditorModel?.setValue('Super Good');
156156

157157
await accessor.backupFileService.joinBackupResource();

‎src/vs/workbench/contrib/experiments/common/experimentService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ export class ExperimentService extends Disposable implements IExperimentService
448448
}
449449
}, 250));
450450

451-
const onSaveHandler = this._register(this.textFileService.models.onDidSave(e => onModelsSavedWorker.work(e.model)));
451+
const onSaveHandler = this._register(this.textFileService.files.onDidSave(e => onModelsSavedWorker.work(e.model)));
452452
return ExperimentState.Evaluating;
453453
});
454454
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ export class FileEditorTracker extends Disposable implements IWorkbenchContribut
5858
this._register(this.fileService.onFileChanges(e => this.onFileChanges(e)));
5959

6060
// Ensure dirty text file and untitled models are always opened as editors
61-
this._register(this.textFileService.models.onDidChangeDirty(m => this.ensureDirtyFilesAreOpenedWorker.work(m.resource)));
62-
this._register(this.textFileService.models.onDidSaveError(m => this.ensureDirtyFilesAreOpenedWorker.work(m.resource)));
61+
this._register(this.textFileService.files.onDidChangeDirty(m => this.ensureDirtyFilesAreOpenedWorker.work(m.resource)));
62+
this._register(this.textFileService.files.onDidSaveError(m => this.ensureDirtyFilesAreOpenedWorker.work(m.resource)));
6363
this._register(this.textFileService.untitled.onDidChangeDirty(r => this.ensureDirtyFilesAreOpenedWorker.work(r)));
6464

6565
// Out of workspace file watchers
@@ -112,7 +112,7 @@ export class FileEditorTracker extends Disposable implements IWorkbenchContribut
112112
}
113113

114114
let encoding: string | undefined = undefined;
115-
const model = this.textFileService.models.get(resource);
115+
const model = this.textFileService.files.get(resource);
116116
if (model) {
117117
encoding = model.getEncoding();
118118
}
@@ -283,7 +283,7 @@ export class FileEditorTracker extends Disposable implements IWorkbenchContribut
283283
return false; // resource must be dirty
284284
}
285285

286-
const model = this.textFileService.models.get(resource);
286+
const model = this.textFileService.files.get(resource);
287287
if (model?.hasState(ModelState.PENDING_SAVE)) {
288288
return false; // resource must not be pending to save
289289
}
@@ -362,7 +362,7 @@ export class FileEditorTracker extends Disposable implements IWorkbenchContribut
362362
return undefined;
363363
}
364364

365-
const model = this.textFileService.models.get(resource);
365+
const model = this.textFileService.files.get(resource);
366366
if (!model) {
367367
return undefined;
368368
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ export class TextFileSaveErrorHandler extends Disposable implements ISaveErrorHa
7171
}
7272

7373
private registerListeners(): void {
74-
this._register(this.textFileService.models.onDidSave(e => this.onFileSavedOrReverted(e.model.resource)));
75-
this._register(this.textFileService.models.onDidRevert(m => this.onFileSavedOrReverted(m.resource)));
74+
this._register(this.textFileService.files.onDidSave(e => this.onFileSavedOrReverted(e.model.resource)));
75+
this._register(this.textFileService.files.onDidRevert(m => this.onFileSavedOrReverted(m.resource)));
7676
this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
7777
}
7878

‎src/vs/workbench/contrib/files/browser/fileCommands.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ async function saveSelectedEditors(accessor: ServicesAccessor, options?: ISaveEd
358358

359359
// Check that the resource of the model was not saved already
360360
if (resource && !editors.some(({ editor }) => isEqual(toResource(editor, { supportSideBySide: SideBySideEditor.MASTER }), resource))) {
361-
const model = textFileService.models.get(resource);
361+
const model = textFileService.files.get(resource);
362362
if (!model?.isReadonly()) {
363363
await textFileService.save(resource, options);
364364
}

0 commit comments

Comments
 (0)