Skip to content

Commit 41d65ec

Browse files
bpaserobpasero
committed
grid - more rename of nexteditor => editor
1 parent 743cf48 commit 41d65ec

125 files changed

Lines changed: 504 additions & 504 deletions

File tree

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/viewsContainersExtensionPoint.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
2828
import { forEach } from 'vs/base/common/collections';
2929
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
3030
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
31-
import { INextEditorService } from 'vs/workbench/services/editor/common/editorService';
32-
import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
31+
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
32+
import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
3333

3434
export interface IUserFriendlyViewsContainerDescriptor {
3535
id: string;
@@ -158,7 +158,7 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution {
158158
@ITelemetryService telemetryService: ITelemetryService,
159159
@IWorkspaceContextService contextService: IWorkspaceContextService,
160160
@IStorageService storageService: IStorageService,
161-
@INextEditorService editorService: INextEditorService,
161+
@IEditorService editorService: IEditorService,
162162
@IInstantiationService instantiationService: IInstantiationService,
163163
@IContextKeyService contextKeyService: IContextKeyService,
164164
@IThemeService themeService: IThemeService,
@@ -184,7 +184,7 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution {
184184
constructor(
185185
id: string, label: string,
186186
@IViewletService viewletService: IViewletService,
187-
@INextEditorGroupsService editorGroupService: INextEditorGroupsService
187+
@IEditorGroupsService editorGroupService: IEditorGroupsService
188188
) {
189189
super(id, label, id, viewletService, editorGroupService);
190190
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Event, Emitter } from 'vs/base/common/event';
1212
import { ExtHostContext, ExtHostDocumentsAndEditorsShape, IModelAddedData, ITextEditorAddData, IDocumentsAndEditorsDelta, IExtHostContext, MainContext } from '../node/extHost.protocol';
1313
import { MainThreadTextEditor } from './mainThreadEditor';
1414
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
15-
import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
15+
import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
1616
import { Position as EditorPosition } from 'vs/platform/editor/common/editor';
1717
import { IEditor } from 'vs/workbench/common/editor';
1818
import { extHostCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
@@ -22,7 +22,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
2222
import { IFileService } from 'vs/platform/files/common/files';
2323
import { ITextModelService } from 'vs/editor/common/services/resolverService';
2424
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
25-
import { INextEditorService } from 'vs/workbench/services/editor/common/editorService';
25+
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
2626
import { isDiffEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
2727
import URI from 'vs/base/common/uri';
2828
import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
@@ -161,7 +161,7 @@ class MainThreadDocumentAndEditorStateComputer {
161161
private readonly _onDidChangeState: (delta: DocumentAndEditorStateDelta) => void,
162162
@IModelService private readonly _modelService: IModelService,
163163
@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
164-
@INextEditorService private readonly _editorService: INextEditorService
164+
@IEditorService private readonly _editorService: IEditorService
165165
) {
166166
this._modelService.onModelAdded(this._updateStateOnModelAdd, this, this._toDispose);
167167
this._modelService.onModelRemoved(this._updateState, this, this._toDispose);
@@ -300,13 +300,13 @@ export class MainThreadDocumentsAndEditors {
300300
extHostContext: IExtHostContext,
301301
@IModelService private readonly _modelService: IModelService,
302302
@ITextFileService private readonly _textFileService: ITextFileService,
303-
@INextEditorService private readonly _editorService: INextEditorService,
303+
@IEditorService private readonly _editorService: IEditorService,
304304
@ICodeEditorService codeEditorService: ICodeEditorService,
305305
@IModeService modeService: IModeService,
306306
@IFileService fileService: IFileService,
307307
@ITextModelService textModelResolverService: ITextModelService,
308308
@IUntitledEditorService untitledEditorService: IUntitledEditorService,
309-
@INextEditorGroupsService private readonly _editorGroupService: INextEditorGroupsService,
309+
@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
310310
@IBulkEditService bulkEditService: IBulkEditService
311311

312312
) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import { IDecorationOptions, IDecorationRenderOptions, ILineChange } from 'vs/ed
1717
import { ISingleEditOperation } from 'vs/editor/common/model';
1818
import { ITextEditorOptions, Position as EditorPosition } from 'vs/platform/editor/common/editor';
1919
import { IApplyEditsOptions, ITextEditorConfigurationUpdate, IUndoStopOptions, TextEditorRevealType, WorkspaceEditDto, reviveWorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
20-
import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
21-
import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
20+
import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
21+
import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
2222
import { GroupIdentifier } from 'vs/workbench/common/editor';
2323
import { ExtHostContext, ExtHostEditorsShape, IExtHostContext, ITextDocumentShowOptions, ITextEditorPositionData, MainThreadTextEditorsShape } from '../node/extHost.protocol';
2424
import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors';
@@ -38,8 +38,8 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
3838
extHostContext: IExtHostContext,
3939
@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
4040
@IBulkEditService private readonly _bulkEditService: IBulkEditService,
41-
@INextEditorService private readonly _editorService: INextEditorService,
42-
@INextEditorGroupsService private readonly _editorGroupService: INextEditorGroupsService
41+
@IEditorService private readonly _editorService: IEditorService,
42+
@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService
4343
) {
4444
this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostEditors);
4545
this._documentsAndEditors = documentsAndEditors;
@@ -241,7 +241,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
241241
}
242242
}
243243

244-
export function findEditorGroup(editorGroupService: INextEditorGroupsService, position?: EditorPosition): GroupIdentifier {
244+
export function findEditorGroup(editorGroupService: IEditorGroupsService, position?: EditorPosition): GroupIdentifier {
245245
if (typeof position !== 'number') {
246246
return ACTIVE_GROUP; // prefer active group when position is undefined
247247
}

‎src/vs/workbench/api/electron-browser/mainThreadWebview.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, Mai
1515
import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor';
1616
import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
1717
import { IWebviewEditorService, WebviewInputOptions, WebviewReviver, ICreateWebViewShowOptions } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
18-
import { INextEditorService } from 'vs/workbench/services/editor/common/editorService';
18+
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
1919
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
20-
import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
20+
import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
2121
import { extHostNamedCustomer } from './extHostCustomers';
2222
import { findEditorGroup } from 'vs/workbench/api/electron-browser/mainThreadEditors';
2323
import { GroupIdentifier } from 'vs/workbench/common/editor';
@@ -42,9 +42,9 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
4242
constructor(
4343
context: IExtHostContext,
4444
@IContextKeyService contextKeyService: IContextKeyService,
45-
@INextEditorGroupsService private readonly _editorGroupService: INextEditorGroupsService,
45+
@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
4646
@ILifecycleService lifecycleService: ILifecycleService,
47-
@INextEditorService private readonly _editorService: INextEditorService,
47+
@IEditorService private readonly _editorService: IEditorService,
4848
@IWebviewEditorService private readonly _webviewService: IWebviewEditorService,
4949
@IOpenerService private readonly _openerService: IOpenerService,
5050
@IExtensionService private readonly _extensionService: IExtensionService,

‎src/vs/workbench/browser/actions/toggleEditorLayout.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
1515
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
1616
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
1717
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
18-
import { INextEditorGroupsService, GroupOrientation } from 'vs/workbench/services/group/common/editorGroupsService';
18+
import { IEditorGroupsService, GroupOrientation } from 'vs/workbench/services/group/common/editorGroupsService';
1919

2020
export class ToggleEditorLayoutAction extends Action {
2121

@@ -27,7 +27,7 @@ export class ToggleEditorLayoutAction extends Action {
2727
constructor(
2828
id: string,
2929
label: string,
30-
@INextEditorGroupsService private editorGroupService: INextEditorGroupsService
30+
@IEditorGroupsService private editorGroupService: IEditorGroupsService
3131
) {
3232
super(id, label);
3333

@@ -63,7 +63,7 @@ export class ToggleEditorLayoutAction extends Action {
6363
}
6464

6565
CommandsRegistry.registerCommand('_workbench.editor.setGroupOrientation', function (accessor: ServicesAccessor, args: [GroupOrientation]) {
66-
const editorGroupService = accessor.get(INextEditorGroupsService);
66+
const editorGroupService = accessor.get(IEditorGroupsService);
6767
const [orientation] = args;
6868

6969
editorGroupService.setGroupOrientation(orientation);

‎src/vs/workbench/browser/actions/workspaceActions.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common
1515
import { WORKSPACE_FILTER, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
1616
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1717
import { mnemonicButtonLabel } from 'vs/base/common/labels';
18-
import { INextEditorService } from 'vs/workbench/services/editor/common/editorService';
18+
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
1919
import { ICommandService } from 'vs/platform/commands/common/commands';
2020
import { IHistoryService } from 'vs/workbench/services/history/common/history';
2121
import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID, defaultWorkspacePath, defaultFilePath, defaultFolderPath } from 'vs/workbench/browser/actions/workspaceCommands';
@@ -206,7 +206,7 @@ export class OpenWorkspaceConfigFileAction extends Action {
206206
id: string,
207207
label: string,
208208
@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
209-
@INextEditorService private editorService: INextEditorService
209+
@IEditorService private editorService: IEditorService
210210
) {
211211
super(id, label);
212212

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati
3131
import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
3232
import { IEditorIdentifier, GroupIdentifier } from 'vs/workbench/common/editor';
3333
import { basenameOrAuthority } from 'vs/base/common/resources';
34-
import { INextEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
34+
import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
3535
import { Disposable } from 'vs/base/common/lifecycle';
3636
import { addDisposableListener, EventType } from 'vs/base/browser/dom';
3737

@@ -163,7 +163,7 @@ export class ResourcesDropHandler {
163163
@ITextFileService private textFileService: ITextFileService,
164164
@IBackupFileService private backupFileService: IBackupFileService,
165165
@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
166-
@INextEditorService private editorService: INextEditorService,
166+
@IEditorService private editorService: IEditorService,
167167
@IConfigurationService private configurationService: IConfigurationService
168168
) {
169169
}
@@ -385,7 +385,7 @@ export function fillResourceDataTransfers(accessor: ServicesAccessor, resources:
385385
// Editors: enables cross window DND of tabs into the editor area
386386
const textFileService = accessor.get(ITextFileService);
387387
const backupFileService = accessor.get(IBackupFileService);
388-
const editorService = accessor.get(INextEditorService);
388+
const editorService = accessor.get(IEditorService);
389389

390390
const draggedEditors: ISerializedDraggedEditor[] = [];
391391
files.forEach(file => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { memoize } from 'vs/base/common/decorators';
2020
import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
2121
import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
2222
import { Dimension, getClientArea, size, position, hide, show } from 'vs/base/browser/dom';
23-
import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
23+
import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
2424
import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
2525
import { TitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
2626
import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart';
@@ -90,7 +90,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
9090
@IPartService private partService: IPartService,
9191
@IViewletService private viewletService: IViewletService,
9292
@IThemeService private themeService: IThemeService,
93-
@INextEditorGroupsService private editorGroupService: INextEditorGroupsService
93+
@IEditorGroupsService private editorGroupService: IEditorGroupsService
9494
) {
9595
super();
9696

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
SplitEditorGroupUpAction, SplitEditorGroupDownAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToUpwardsGroupAction, MoveEditorToDownwardsGroupAction
3939
} from 'vs/workbench/browser/parts/editor/editorActions';
4040
import * as editorCommands from 'vs/workbench/browser/parts/editor/editorCommands';
41-
import { INextEditorService } from 'vs/workbench/services/editor/common/editorService';
41+
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
4242
import { getQuickNavigateHandler, inQuickOpenContext } from 'vs/workbench/browser/parts/quickopen/quickopen';
4343
import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
4444
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
@@ -139,7 +139,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
139139
const language = deserialized.modeId;
140140
const encoding = deserialized.encoding;
141141

142-
return accessor.get(INextEditorService).createInput({ resource, filePath, language, encoding }) as UntitledEditorInput;
142+
return accessor.get(IEditorService).createInput({ resource, filePath, language, encoding }) as UntitledEditorInput;
143143
});
144144
}
145145
}

0 commit comments

Comments
 (0)