Skip to content

Commit 87064db

Browse files
author
Benjamin Pasero
committed
debt - untitled editor => untitled text editor
1 parent b5daad6 commit 87064db

44 files changed

Lines changed: 296 additions & 292 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { MainThreadDocumentsAndEditors } from 'vs/workbench/api/browser/mainThre
1616
import { ExtHostContext, ExtHostDocumentsShape, IExtHostContext, MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protocol';
1717
import { ITextEditorModel } from 'vs/workbench/common/editor';
1818
import { ITextFileService, TextFileModelChangeEvent } from 'vs/workbench/services/textfile/common/textfiles';
19-
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
19+
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
2020
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
2121
import { toLocalResource } from 'vs/base/common/resources';
2222

@@ -70,7 +70,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
7070
private readonly _textModelResolverService: ITextModelService;
7171
private readonly _textFileService: ITextFileService;
7272
private readonly _fileService: IFileService;
73-
private readonly _untitledEditorService: IUntitledEditorService;
73+
private readonly _untitledTextEditorService: IUntitledTextEditorService;
7474
private readonly _environmentService: IWorkbenchEnvironmentService;
7575

7676
private readonly _toDispose = new DisposableStore();
@@ -87,14 +87,14 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
8787
@ITextFileService textFileService: ITextFileService,
8888
@IFileService fileService: IFileService,
8989
@ITextModelService textModelResolverService: ITextModelService,
90-
@IUntitledEditorService untitledEditorService: IUntitledEditorService,
90+
@IUntitledTextEditorService untitledTextEditorService: IUntitledTextEditorService,
9191
@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService
9292
) {
9393
this._modelService = modelService;
9494
this._textModelResolverService = textModelResolverService;
9595
this._textFileService = textFileService;
9696
this._fileService = fileService;
97-
this._untitledEditorService = untitledEditorService;
97+
this._untitledTextEditorService = untitledTextEditorService;
9898
this._environmentService = environmentService;
9999

100100
this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDocuments);
@@ -227,7 +227,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
227227
}
228228

229229
private _doCreateUntitled(resource?: URI, mode?: string, initialValue?: string): Promise<URI> {
230-
return this._untitledEditorService.loadOrCreate({
230+
return this._untitledTextEditorService.loadOrCreate({
231231
resource,
232232
mode,
233233
initialValue,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
2828
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
2929
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
3030
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
31-
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
31+
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
3232
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
3333

3434
namespace delta {
@@ -327,15 +327,15 @@ export class MainThreadDocumentsAndEditors {
327327
@IModeService modeService: IModeService,
328328
@IFileService fileService: IFileService,
329329
@ITextModelService textModelResolverService: ITextModelService,
330-
@IUntitledEditorService untitledEditorService: IUntitledEditorService,
330+
@IUntitledTextEditorService untitledTextEditorService: IUntitledTextEditorService,
331331
@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
332332
@IBulkEditService bulkEditService: IBulkEditService,
333333
@IPanelService panelService: IPanelService,
334334
@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService
335335
) {
336336
this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDocumentsAndEditors);
337337

338-
const mainThreadDocuments = this._toDispose.add(new MainThreadDocuments(this, extHostContext, this._modelService, modeService, this._textFileService, fileService, textModelResolverService, untitledEditorService, environmentService));
338+
const mainThreadDocuments = this._toDispose.add(new MainThreadDocuments(this, extHostContext, this._modelService, modeService, this._textFileService, fileService, textModelResolverService, untitledTextEditorService, environmentService));
339339
extHostContext.set(MainContext.MainThreadDocuments, mainThreadDocuments);
340340

341341
const mainThreadTextEditors = this._toDispose.add(new MainThreadTextEditors(this, extHostContext, codeEditorService, bulkEditService, this._editorService, this._editorGroupService));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { URI } from 'vs/base/common/uri';
1212
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
1313
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
1414
import { Schemas } from 'vs/base/common/network';
15-
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
15+
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
1616
import { DefaultEndOfLine } from 'vs/editor/common/model';
1717
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1818
import { IEditorViewState } from 'vs/editor/common/editorCommon';
@@ -163,7 +163,7 @@ export class ResourcesDropHandler {
163163
@IWorkspacesService private readonly workspacesService: IWorkspacesService,
164164
@ITextFileService private readonly textFileService: ITextFileService,
165165
@IBackupFileService private readonly backupFileService: IBackupFileService,
166-
@IUntitledEditorService private readonly untitledEditorService: IUntitledEditorService,
166+
@IUntitledTextEditorService private readonly untitledTextEditorService: IUntitledTextEditorService,
167167
@IEditorService private readonly editorService: IEditorService,
168168
@IConfigurationService private readonly configurationService: IConfigurationService,
169169
@IWorkspaceEditingService private readonly workspaceEditingService: IWorkspaceEditingService,
@@ -234,7 +234,7 @@ export class ResourcesDropHandler {
234234

235235
// Untitled: always ensure that we open a new untitled for each file we drop
236236
if (droppedDirtyEditor.resource.scheme === Schemas.untitled) {
237-
droppedDirtyEditor.resource = this.untitledEditorService.createOrGet().getResource();
237+
droppedDirtyEditor.resource = this.untitledTextEditorService.createOrGet().getResource();
238238
}
239239

240240
// Return early if the resource is already dirty in target or opened already

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
1313
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
1414
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1515
import { IModelService } from 'vs/editor/common/services/modelService';
16-
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
16+
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
1717
import { IDecorationsService, IResourceDecorationChangeEvent } from 'vs/workbench/services/decorations/browser/decorations';
1818
import { Schemas } from 'vs/base/common/network';
1919
import { FileKind, FILES_ASSOCIATIONS_CONFIG, IFileService } from 'vs/platform/files/common/files';
@@ -259,7 +259,7 @@ class ResourceLabelWidget extends IconLabel {
259259
@IModelService private readonly modelService: IModelService,
260260
@IDecorationsService private readonly decorationsService: IDecorationsService,
261261
@ILabelService private readonly labelService: ILabelService,
262-
@IUntitledEditorService private readonly untitledEditorService: IUntitledEditorService,
262+
@IUntitledTextEditorService private readonly untitledTextEditorService: IUntitledTextEditorService,
263263
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService
264264
) {
265265
super(container, options);
@@ -389,7 +389,7 @@ class ResourceLabelWidget extends IconLabel {
389389
}
390390

391391
let description: string | undefined;
392-
const hidePath = (options && options.hidePath) || (resource.scheme === Schemas.untitled && !this.untitledEditorService.hasAssociatedFilePath(resource));
392+
const hidePath = (options && options.hidePath) || (resource.scheme === Schemas.untitled && !this.untitledTextEditorService.hasAssociatedFilePath(resource));
393393
if (!hidePath) {
394394
description = this.labelService.getUriLabel(resources.dirname(resource), { relative: true });
395395
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { EditorInput, IEditorInputFactory, SideBySideEditorInput, IEditorInputFa
1313
import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
1414
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
1515
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
16-
import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
16+
import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
1717
import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
1818
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1919
import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
@@ -62,7 +62,7 @@ Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
6262
nls.localize('textEditor', "Text Editor"),
6363
),
6464
[
65-
new SyncDescriptor(UntitledEditorInput),
65+
new SyncDescriptor(UntitledTextEditorInput),
6666
new SyncDescriptor(ResourceEditorInput)
6767
]
6868
);
@@ -102,15 +102,15 @@ Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
102102
]
103103
);
104104

105-
interface ISerializedUntitledEditorInput {
105+
interface ISerializedUntitledTextEditorInput {
106106
resource: string;
107107
resourceJSON: object;
108108
modeId: string | undefined;
109109
encoding: string | undefined;
110110
}
111111

112112
// Register Editor Input Factory
113-
class UntitledEditorInputFactory implements IEditorInputFactory {
113+
class UntitledTextEditorInputFactory implements IEditorInputFactory {
114114

115115
constructor(
116116
@ITextFileService private readonly textFileService: ITextFileService,
@@ -122,36 +122,36 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
122122
return undefined; // never restore untitled unless hot exit is enabled
123123
}
124124

125-
const untitledEditorInput = <UntitledEditorInput>editorInput;
125+
const untitledTextEditorInput = <UntitledTextEditorInput>editorInput;
126126

127-
let resource = untitledEditorInput.getResource();
128-
if (untitledEditorInput.hasAssociatedFilePath) {
127+
let resource = untitledTextEditorInput.getResource();
128+
if (untitledTextEditorInput.hasAssociatedFilePath) {
129129
resource = toLocalResource(resource, this.environmentService.configuration.remoteAuthority); // untitled with associated file path use the local schema
130130
}
131131

132-
const serialized: ISerializedUntitledEditorInput = {
132+
const serialized: ISerializedUntitledTextEditorInput = {
133133
resource: resource.toString(), // Keep for backwards compatibility
134134
resourceJSON: resource.toJSON(),
135-
modeId: untitledEditorInput.getMode(),
136-
encoding: untitledEditorInput.getEncoding()
135+
modeId: untitledTextEditorInput.getMode(),
136+
encoding: untitledTextEditorInput.getEncoding()
137137
};
138138

139139
return JSON.stringify(serialized);
140140
}
141141

142-
deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): UntitledEditorInput {
143-
return instantiationService.invokeFunction<UntitledEditorInput>(accessor => {
144-
const deserialized: ISerializedUntitledEditorInput = JSON.parse(serializedEditorInput);
142+
deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): UntitledTextEditorInput {
143+
return instantiationService.invokeFunction<UntitledTextEditorInput>(accessor => {
144+
const deserialized: ISerializedUntitledTextEditorInput = JSON.parse(serializedEditorInput);
145145
const resource = !!deserialized.resourceJSON ? URI.revive(<UriComponents>deserialized.resourceJSON) : URI.parse(deserialized.resource);
146146
const mode = deserialized.modeId;
147147
const encoding = deserialized.encoding;
148148

149-
return accessor.get(IEditorService).createInput({ resource, mode, encoding, forceUntitled: true }) as UntitledEditorInput;
149+
return accessor.get(IEditorService).createInput({ resource, mode, encoding, forceUntitled: true }) as UntitledTextEditorInput;
150150
});
151151
}
152152
}
153153

154-
Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).registerEditorInputFactory(UntitledEditorInput.ID, UntitledEditorInputFactory);
154+
Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).registerEditorInputFactory(UntitledTextEditorInput.ID, UntitledTextEditorInputFactory);
155155

156156
interface ISerializedSideBySideEditorInput {
157157
name: string;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { RunOnceWorker } from 'vs/base/common/async';
3232
import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch';
3333
import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
3434
import { IEditorGroupsAccessor, IEditorGroupView, IEditorPartOptionsChangeEvent, getActiveTextEditorOptions, IEditorOpeningEvent } from 'vs/workbench/browser/parts/editor/editor';
35-
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
35+
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
3636
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
3737
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
3838
import { ActionRunner, IAction, Action } from 'vs/base/common/actions';
@@ -128,7 +128,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
128128
@INotificationService private readonly notificationService: INotificationService,
129129
@IDialogService private readonly dialogService: IDialogService,
130130
@ITelemetryService private readonly telemetryService: ITelemetryService,
131-
@IUntitledEditorService private readonly untitledEditorService: IUntitledEditorService,
131+
@IUntitledTextEditorService private readonly untitledTextEditorService: IUntitledTextEditorService,
132132
@IKeybindingService private readonly keybindingService: IKeybindingService,
133133
@IMenuService private readonly menuService: IMenuService,
134134
@IContextMenuService private readonly contextMenuService: IContextMenuService
@@ -255,7 +255,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
255255
if (this.isEmpty) {
256256
EventHelper.stop(e);
257257

258-
this.openEditor(this.untitledEditorService.createOrGet(), EditorOptions.create({ pinned: true }));
258+
this.openEditor(this.untitledTextEditorService.createOrGet(), EditorOptions.create({ pinned: true }));
259259
}
260260
}));
261261

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import { areFunctions, withNullAsUndefined, withUndefinedAsNull } from 'vs/base/
1212
import { URI } from 'vs/base/common/uri';
1313
import { Action } from 'vs/base/common/actions';
1414
import { Language } from 'vs/base/common/platform';
15-
import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
15+
import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
1616
import { IFileEditorInput, EncodingMode, IEncodingSupport, toResource, SideBySideEditorInput, IEditor as IBaseEditor, IEditorInput, SideBySideEditor, IModeSupport } from 'vs/workbench/common/editor';
1717
import { Disposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';
18-
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
18+
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
1919
import { IEditorAction } from 'vs/editor/common/editorCommon';
2020
import { EndOfLineSequence } from 'vs/editor/common/model';
2121
import { IModelLanguageChangedEvent, IModelOptionsChangedEvent } from 'vs/editor/common/model/textModelEvents';
@@ -73,8 +73,8 @@ class SideBySideEditorModeSupport implements IModeSupport {
7373

7474
function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport | null {
7575

76-
// Untitled Editor
77-
if (input instanceof UntitledEditorInput) {
76+
// Untitled Text Editor
77+
if (input instanceof UntitledTextEditorInput) {
7878
return input;
7979
}
8080

@@ -102,8 +102,8 @@ function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport | nu
102102

103103
function toEditorWithModeSupport(input: IEditorInput): IModeSupport | null {
104104

105-
// Untitled Editor
106-
if (input instanceof UntitledEditorInput) {
105+
// Untitled Text Editor
106+
if (input instanceof UntitledTextEditorInput) {
107107
return input;
108108
}
109109

@@ -293,7 +293,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
293293
constructor(
294294
@IEditorService private readonly editorService: IEditorService,
295295
@IQuickInputService private readonly quickInputService: IQuickInputService,
296-
@IUntitledEditorService private readonly untitledEditorService: IUntitledEditorService,
296+
@IUntitledTextEditorService private readonly untitledTextEditorService: IUntitledTextEditorService,
297297
@IModeService private readonly modeService: IModeService,
298298
@ITextFileService private readonly textFileService: ITextFileService,
299299
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -309,7 +309,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
309309

310310
private registerListeners(): void {
311311
this._register(this.editorService.onDidActiveEditorChange(() => this.updateStatusBar()));
312-
this._register(this.untitledEditorService.onDidChangeEncoding(r => this.onResourceEncodingChange(r)));
312+
this._register(this.untitledTextEditorService.onDidChangeEncoding(r => this.onResourceEncodingChange(r)));
313313
this._register(this.textFileService.models.onModelEncodingChanged(e => this.onResourceEncodingChange((e.resource))));
314314
this._register(TabFocus.onDidChangeTabFocus(e => this.onTabFocusModeChange()));
315315
}
@@ -869,7 +869,7 @@ export class ChangeModeAction extends Action {
869869
@IQuickInputService private readonly quickInputService: IQuickInputService,
870870
@IPreferencesService private readonly preferencesService: IPreferencesService,
871871
@IInstantiationService private readonly instantiationService: IInstantiationService,
872-
@IUntitledEditorService private readonly untitledEditorService: IUntitledEditorService
872+
@IUntitledTextEditorService private readonly untitledTextEditorService: IUntitledTextEditorService
873873
) {
874874
super(actionId, actionLabel);
875875
}
@@ -884,7 +884,7 @@ export class ChangeModeAction extends Action {
884884
const resource = this.editorService.activeEditor ? toResource(this.editorService.activeEditor, { supportSideBySide: SideBySideEditor.MASTER }) : null;
885885

886886
let hasLanguageSupport = !!resource;
887-
if (resource?.scheme === Schemas.untitled && !this.untitledEditorService.hasAssociatedFilePath(resource)) {
887+
if (resource?.scheme === Schemas.untitled && !this.untitledTextEditorService.hasAssociatedFilePath(resource)) {
888888
hasLanguageSupport = false; // no configuration for untitled resources (e.g. "Untitled-1")
889889
}
890890

@@ -1152,7 +1152,7 @@ export class ChangeEncodingAction extends Action {
11521152
}
11531153

11541154
let action: IQuickPickItem;
1155-
if (encodingSupport instanceof UntitledEditorInput) {
1155+
if (encodingSupport instanceof UntitledTextEditorInput) {
11561156
action = saveWithEncodingPick;
11571157
} else if (!isWritableBaseEditor(activeControl)) {
11581158
action = reopenWithEncodingPick;

0 commit comments

Comments
 (0)