Skip to content

Commit a03ea07

Browse files
author
Benjamin Pasero
committed
editors - include editor in name for inputs to make things clear
1 parent fd487a7 commit a03ea07

40 files changed

Lines changed: 255 additions & 253 deletions

‎src/vs/editor/browser/services/abstractCodeEditorService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
99
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
1010
import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
1111
import { IModelDecorationOptions, ITextModel } from 'vs/editor/common/model';
12-
import { IResourceInput } from 'vs/platform/editor/common/editor';
12+
import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
1313

1414
export abstract class AbstractCodeEditorService extends Disposable implements ICodeEditorService {
1515

@@ -135,7 +135,7 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC
135135
}
136136

137137
abstract getActiveCodeEditor(): ICodeEditor | null;
138-
abstract openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
138+
abstract openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
139139
}
140140

141141
export class ModelTransientSettingWatcher {

‎src/vs/editor/browser/services/codeEditorService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Event } from 'vs/base/common/event';
77
import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
88
import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
99
import { IModelDecorationOptions, ITextModel } from 'vs/editor/common/model';
10-
import { IResourceInput } from 'vs/platform/editor/common/editor';
10+
import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
1111
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1212

1313
export const ICodeEditorService = createDecorator<ICodeEditorService>('codeEditorService');
@@ -46,5 +46,5 @@ export interface ICodeEditorService {
4646
getTransientModelProperties(model: ITextModel): [string, any][] | undefined;
4747

4848
getActiveCodeEditor(): ICodeEditor | null;
49-
openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
49+
openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
5050
}

‎src/vs/editor/browser/services/codeEditorServiceImpl.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
1111
import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCodeEditorService';
1212
import { IContentDecorationRenderOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions, isThemeColor } from 'vs/editor/common/editorCommon';
1313
import { IModelDecorationOptions, IModelDecorationOverviewRulerOptions, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
14-
import { IResourceInput } from 'vs/platform/editor/common/editor';
14+
import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
1515
import { IColorTheme, IThemeService, ThemeColor } from 'vs/platform/theme/common/themeService';
1616

1717
class RefCountedStyleSheet {
@@ -136,7 +136,7 @@ export abstract class CodeEditorServiceImpl extends AbstractCodeEditorService {
136136
}
137137

138138
abstract getActiveCodeEditor(): ICodeEditor | null;
139-
abstract openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
139+
abstract openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
140140
}
141141

142142
interface IModelDecorationOptionsProvider extends IDisposable {

‎src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServ
1111
import { IRange } from 'vs/editor/common/core/range';
1212
import { ScrollType } from 'vs/editor/common/editorCommon';
1313
import { ITextModel } from 'vs/editor/common/model';
14-
import { IResourceInput } from 'vs/platform/editor/common/editor';
14+
import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
1515

1616
export class StandaloneCodeEditorServiceImpl extends CodeEditorServiceImpl {
1717

1818
public getActiveCodeEditor(): ICodeEditor | null {
1919
return null; // not supported in the standalone case
2020
}
2121

22-
public openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
22+
public openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
2323
if (!source) {
2424
return Promise.resolve(null);
2525
}
2626

2727
return Promise.resolve(this.doOpenEditor(source, input));
2828
}
2929

30-
private doOpenEditor(editor: ICodeEditor, input: IResourceInput): ICodeEditor | null {
30+
private doOpenEditor(editor: ICodeEditor, input: IResourceEditorInput): ICodeEditor | null {
3131
const model = this.findModel(editor, input.resource);
3232
if (!model) {
3333
if (input.resource) {

‎src/vs/editor/test/browser/editorTestServices.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCo
99
import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
1010
import { IModelDecorationOptions } from 'vs/editor/common/model';
1111
import { CommandsRegistry, ICommandEvent, ICommandService } from 'vs/platform/commands/common/commands';
12-
import { IResourceInput } from 'vs/platform/editor/common/editor';
12+
import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
1313
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1414

1515
export class TestCodeEditorService extends AbstractCodeEditorService {
16-
public lastInput?: IResourceInput;
16+
public lastInput?: IResourceEditorInput;
1717
public getActiveCodeEditor(): ICodeEditor | null { return null; }
18-
public openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
18+
public openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
1919
this.lastInput = input;
2020
return Promise.resolve(null);
2121
}

‎src/vs/editor/test/browser/services/decorationRenderOptions.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { URI } from 'vs/base/common/uri';
1010
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
1111
import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl';
1212
import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
13-
import { IResourceInput } from 'vs/platform/editor/common/editor';
13+
import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
1414
import { TestColorTheme, TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
1515

1616
const themeServiceMock = new TestThemeService();
@@ -20,7 +20,7 @@ export class TestCodeEditorServiceImpl extends CodeEditorServiceImpl {
2020
return null;
2121
}
2222

23-
openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
23+
openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
2424
return Promise.resolve(null);
2525
}
2626
}

‎src/vs/platform/editor/common/editor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export interface IEditorModel {
2424
dispose(): void;
2525
}
2626

27-
export interface IBaseResourceInput {
27+
export interface IBaseResourceEditorInput {
2828

2929
/**
3030
* Optional options to use when opening the text input.
@@ -60,7 +60,7 @@ export interface IBaseResourceInput {
6060
readonly forceUntitled?: boolean;
6161
}
6262

63-
export interface IResourceInput extends IBaseResourceInput {
63+
export interface IResourceEditorInput extends IBaseResourceEditorInput {
6464

6565
/**
6666
* The resource URI of the resource to open.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { ISelection } from 'vs/editor/common/core/selection';
1515
import { IDecorationOptions, IDecorationRenderOptions, ILineChange } from 'vs/editor/common/editorCommon';
1616
import { ISingleEditOperation } from 'vs/editor/common/model';
1717
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
18-
import { IEditorOptions, ITextEditorOptions, IResourceInput, EditorActivation } from 'vs/platform/editor/common/editor';
18+
import { IEditorOptions, ITextEditorOptions, IResourceEditorInput, EditorActivation } from 'vs/platform/editor/common/editor';
1919
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
2020
import { IOpenerService } from 'vs/platform/opener/common/opener';
2121
import { MainThreadDocumentsAndEditors } from 'vs/workbench/api/browser/mainThreadDocumentsAndEditors';
@@ -124,7 +124,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
124124
activation: options.preserveFocus ? EditorActivation.RESTORE : undefined
125125
};
126126

127-
const input: IResourceInput = {
127+
const input: IResourceEditorInput = {
128128
resource: uri,
129129
options: editorOptions
130130
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ export class ResourcesDropHandler {
239239

240240
// Untitled: always ensure that we open a new untitled editor for each file we drop
241241
if (droppedDirtyEditor.resource.scheme === Schemas.untitled) {
242-
const untitledEditorResource = this.editorService.createInput({ mode: droppedDirtyEditor.mode, encoding: droppedDirtyEditor.encoding, forceUntitled: true }).resource;
242+
const untitledEditorResource = this.editorService.createEditorInput({ mode: droppedDirtyEditor.mode, encoding: droppedDirtyEditor.encoding, forceUntitled: true }).resource;
243243
if (untitledEditorResource) {
244244
droppedDirtyEditor.resource = untitledEditorResource;
245245
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class UntitledTextEditorInputFactory implements IEditorInputFactory {
163163
const mode = deserialized.modeId;
164164
const encoding = deserialized.encoding;
165165

166-
return accessor.get(IEditorService).createInput({ resource, mode, encoding, forceUntitled: true }) as UntitledTextEditorInput;
166+
return accessor.get(IEditorService).createEditorInput({ resource, mode, encoding, forceUntitled: true }) as UntitledTextEditorInput;
167167
});
168168
}
169169
}

0 commit comments

Comments
 (0)