diff --git a/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts b/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts index 8a290dfc9a3..25c3a9b2916 100644 --- a/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts +++ b/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts @@ -28,8 +28,8 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { forEach } from 'vs/base/common/collections'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; export interface IUserFriendlyViewsContainerDescriptor { id: string; @@ -158,7 +158,7 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution { @ITelemetryService telemetryService: ITelemetryService, @IWorkspaceContextService contextService: IWorkspaceContextService, @IStorageService storageService: IStorageService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IInstantiationService instantiationService: IInstantiationService, @IContextKeyService contextKeyService: IContextKeyService, @IThemeService themeService: IThemeService, @@ -184,7 +184,7 @@ class ViewsContainersExtensionHandler implements IWorkbenchContribution { constructor( id: string, label: string, @IViewletService viewletService: IViewletService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, id, viewletService, editorGroupService); } diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts index 964816308dd..3e3ae1a1f3e 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts @@ -12,7 +12,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { ExtHostContext, ExtHostDocumentsAndEditorsShape, IModelAddedData, ITextEditorAddData, IDocumentsAndEditorsDelta, IExtHostContext, MainContext } from '../node/extHost.protocol'; import { MainThreadTextEditor } from './mainThreadEditor'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { Position as EditorPosition } from 'vs/platform/editor/common/editor'; import { IEditor } from 'vs/workbench/common/editor'; import { extHostCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; @@ -22,7 +22,7 @@ import { IModeService } from 'vs/editor/common/services/modeService'; import { IFileService } from 'vs/platform/files/common/files'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { isDiffEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser'; import URI from 'vs/base/common/uri'; import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService'; @@ -161,7 +161,7 @@ class MainThreadDocumentAndEditorStateComputer { private readonly _onDidChangeState: (delta: DocumentAndEditorStateDelta) => void, @IModelService private readonly _modelService: IModelService, @ICodeEditorService private readonly _codeEditorService: ICodeEditorService, - @INextEditorService private readonly _editorService: INextEditorService + @IEditorService private readonly _editorService: IEditorService ) { this._modelService.onModelAdded(this._updateStateOnModelAdd, this, this._toDispose); this._modelService.onModelRemoved(this._updateState, this, this._toDispose); @@ -300,13 +300,13 @@ export class MainThreadDocumentsAndEditors { extHostContext: IExtHostContext, @IModelService private readonly _modelService: IModelService, @ITextFileService private readonly _textFileService: ITextFileService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @ICodeEditorService codeEditorService: ICodeEditorService, @IModeService modeService: IModeService, @IFileService fileService: IFileService, @ITextModelService textModelResolverService: ITextModelService, @IUntitledEditorService untitledEditorService: IUntitledEditorService, - @INextEditorGroupsService private readonly _editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService, @IBulkEditService bulkEditService: IBulkEditService ) { diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts index 519502ef5ef..0fe76183315 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts @@ -17,8 +17,8 @@ import { IDecorationOptions, IDecorationRenderOptions, ILineChange } from 'vs/ed import { ISingleEditOperation } from 'vs/editor/common/model'; import { ITextEditorOptions, Position as EditorPosition } from 'vs/platform/editor/common/editor'; import { IApplyEditsOptions, ITextEditorConfigurationUpdate, IUndoStopOptions, TextEditorRevealType, WorkspaceEditDto, reviveWorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { GroupIdentifier } from 'vs/workbench/common/editor'; import { ExtHostContext, ExtHostEditorsShape, IExtHostContext, ITextDocumentShowOptions, ITextEditorPositionData, MainThreadTextEditorsShape } from '../node/extHost.protocol'; import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors'; @@ -38,8 +38,8 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { extHostContext: IExtHostContext, @ICodeEditorService private readonly _codeEditorService: ICodeEditorService, @IBulkEditService private readonly _bulkEditService: IBulkEditService, - @INextEditorService private readonly _editorService: INextEditorService, - @INextEditorGroupsService private readonly _editorGroupService: INextEditorGroupsService + @IEditorService private readonly _editorService: IEditorService, + @IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService ) { this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostEditors); this._documentsAndEditors = documentsAndEditors; @@ -241,7 +241,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { } } -export function findEditorGroup(editorGroupService: INextEditorGroupsService, position?: EditorPosition): GroupIdentifier { +export function findEditorGroup(editorGroupService: IEditorGroupsService, position?: EditorPosition): GroupIdentifier { if (typeof position !== 'number') { return ACTIVE_GROUP; // prefer active group when position is undefined } diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts index 82213c936d7..c6ad2693207 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts @@ -15,9 +15,9 @@ import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, Mai import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor'; import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput'; import { IWebviewEditorService, WebviewInputOptions, WebviewReviver, ICreateWebViewShowOptions } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { extHostNamedCustomer } from './extHostCustomers'; import { findEditorGroup } from 'vs/workbench/api/electron-browser/mainThreadEditors'; import { GroupIdentifier } from 'vs/workbench/common/editor'; @@ -42,9 +42,9 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv constructor( context: IExtHostContext, @IContextKeyService contextKeyService: IContextKeyService, - @INextEditorGroupsService private readonly _editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService, @ILifecycleService lifecycleService: ILifecycleService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @IWebviewEditorService private readonly _webviewService: IWebviewEditorService, @IOpenerService private readonly _openerService: IOpenerService, @IExtensionService private readonly _extensionService: IExtensionService, diff --git a/src/vs/workbench/browser/actions/toggleEditorLayout.ts b/src/vs/workbench/browser/actions/toggleEditorLayout.ts index cbe4f135de2..b65f251ae75 100644 --- a/src/vs/workbench/browser/actions/toggleEditorLayout.ts +++ b/src/vs/workbench/browser/actions/toggleEditorLayout.ts @@ -15,7 +15,7 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorGroupsService, GroupOrientation } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, GroupOrientation } from 'vs/workbench/services/group/common/editorGroupsService'; export class ToggleEditorLayoutAction extends Action { @@ -27,7 +27,7 @@ export class ToggleEditorLayoutAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label); @@ -63,7 +63,7 @@ export class ToggleEditorLayoutAction extends Action { } CommandsRegistry.registerCommand('_workbench.editor.setGroupOrientation', function (accessor: ServicesAccessor, args: [GroupOrientation]) { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const [orientation] = args; editorGroupService.setGroupOrientation(orientation); diff --git a/src/vs/workbench/browser/actions/workspaceActions.ts b/src/vs/workbench/browser/actions/workspaceActions.ts index bf73d26bbf3..46453e9343d 100644 --- a/src/vs/workbench/browser/actions/workspaceActions.ts +++ b/src/vs/workbench/browser/actions/workspaceActions.ts @@ -15,7 +15,7 @@ import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common import { WORKSPACE_FILTER, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { mnemonicButtonLabel } from 'vs/base/common/labels'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IHistoryService } from 'vs/workbench/services/history/common/history'; 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 { id: string, label: string, @IWorkspaceContextService private workspaceContextService: IWorkspaceContextService, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label); diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts index 47990722cdb..62ed2779a15 100644 --- a/src/vs/workbench/browser/dnd.ts +++ b/src/vs/workbench/browser/dnd.ts @@ -31,7 +31,7 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { IEditorIdentifier, GroupIdentifier } from 'vs/workbench/common/editor'; import { basenameOrAuthority } from 'vs/base/common/resources'; -import { INextEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService'; import { Disposable } from 'vs/base/common/lifecycle'; import { addDisposableListener, EventType } from 'vs/base/browser/dom'; @@ -163,7 +163,7 @@ export class ResourcesDropHandler { @ITextFileService private textFileService: ITextFileService, @IBackupFileService private backupFileService: IBackupFileService, @IUntitledEditorService private untitledEditorService: IUntitledEditorService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IConfigurationService private configurationService: IConfigurationService ) { } @@ -385,7 +385,7 @@ export function fillResourceDataTransfers(accessor: ServicesAccessor, resources: // Editors: enables cross window DND of tabs into the editor area const textFileService = accessor.get(ITextFileService); const backupFileService = accessor.get(IBackupFileService); - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const draggedEditors: ISerializedDraggedEditor[] = []; files.forEach(file => { diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index c18aed5e403..90fd9ecf35b 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -20,7 +20,7 @@ import { memoize } from 'vs/base/common/decorators'; import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter'; import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts'; import { Dimension, getClientArea, size, position, hide, show } from 'vs/base/browser/dom'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart'; import { TitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart'; import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart'; @@ -90,7 +90,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr @IPartService private partService: IPartService, @IViewletService private viewletService: IViewletService, @IThemeService private themeService: IThemeService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(); diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index e90bb289617..792f91ecb97 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -38,7 +38,7 @@ import { SplitEditorGroupUpAction, SplitEditorGroupDownAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToUpwardsGroupAction, MoveEditorToDownwardsGroupAction } from 'vs/workbench/browser/parts/editor/editorActions'; import * as editorCommands from 'vs/workbench/browser/parts/editor/editorCommands'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { getQuickNavigateHandler, inQuickOpenContext } from 'vs/workbench/browser/parts/quickopen/quickopen'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; @@ -139,7 +139,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory { const language = deserialized.modeId; const encoding = deserialized.encoding; - return accessor.get(INextEditorService).createInput({ resource, filePath, language, encoding }) as UntitledEditorInput; + return accessor.get(IEditorService).createInput({ resource, filePath, language, encoding }) as UntitledEditorInput; }); } } diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index a45b7b820aa..8b41c4ba41e 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -20,8 +20,8 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IWindowsService } from 'vs/platform/windows/common/windows'; import { CLOSE_EDITOR_COMMAND_ID, NAVIGATE_ALL_EDITORS_GROUP_PREFIX, MOVE_ACTIVE_EDITOR_COMMAND_ID, NAVIGATE_IN_ACTIVE_GROUP_PREFIX, ActiveEditorMoveArguments } from 'vs/workbench/browser/parts/editor/editorCommands'; -import { INextEditorGroupsService, IEditorGroup, GroupsArrangement, EditorsOrder, GroupLocation, GroupDirection, preferredGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; -import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService, IEditorGroup, GroupsArrangement, EditorsOrder, GroupLocation, GroupDirection, preferredGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; @@ -32,7 +32,7 @@ export class BaseSplitEditorGroupAction extends Action { label: string, clazz: string, protected direction: GroupDirection, - private editorGroupService: INextEditorGroupsService + private editorGroupService: IEditorGroupsService ) { super(id, label, clazz); } @@ -75,7 +75,7 @@ export class SplitEditorAction extends BaseSplitEditorGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, + @IEditorGroupsService editorGroupService: IEditorGroupsService, @IConfigurationService private configurationService: IConfigurationService ) { super(id, label, null, preferredGroupDirection(configurationService), editorGroupService); @@ -150,7 +150,7 @@ export class SplitEditorGroupVerticalAction extends BaseSplitEditorGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, 'split-editor-vertical-action', GroupDirection.DOWN, editorGroupService); } @@ -164,7 +164,7 @@ export class SplitEditorGroupHorizontalAction extends BaseSplitEditorGroupAction constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, 'split-editor-horizontal-action', GroupDirection.RIGHT, editorGroupService); } @@ -178,7 +178,7 @@ export class SplitEditorGroupLeftAction extends BaseSplitEditorGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, null, GroupDirection.LEFT, editorGroupService); } @@ -192,7 +192,7 @@ export class SplitEditorGroupRightAction extends BaseSplitEditorGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, null, GroupDirection.RIGHT, editorGroupService); } @@ -206,7 +206,7 @@ export class SplitEditorGroupUpAction extends BaseSplitEditorGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, null, GroupDirection.UP, editorGroupService); } @@ -220,7 +220,7 @@ export class SplitEditorGroupDownAction extends BaseSplitEditorGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, null, GroupDirection.DOWN, editorGroupService); } @@ -234,7 +234,7 @@ export class JoinTwoGroupsAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label); } @@ -269,7 +269,7 @@ export class NavigateBetweenGroupsAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label); } @@ -294,7 +294,7 @@ export class FocusActiveGroupAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label); } @@ -314,7 +314,7 @@ export class FocusFirstGroupAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label); } @@ -334,7 +334,7 @@ export class FocusLastGroupAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label); } @@ -354,7 +354,7 @@ export class FocusPreviousGroup extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label); } @@ -377,7 +377,7 @@ export class FocusNextGroup extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label); } @@ -398,7 +398,7 @@ export class OpenToSideAction extends Action { public static readonly OPEN_TO_SIDE_LABEL = nls.localize('openToSide', "Open to the Side"); constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IConfigurationService private configurationService: IConfigurationService ) { super(OpenToSideAction.OPEN_TO_SIDE_ID, OpenToSideAction.OPEN_TO_SIDE_LABEL); @@ -474,7 +474,7 @@ export class CloseOneEditorAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label, 'close-editor-action'); } @@ -519,7 +519,7 @@ export class RevertAndCloseEditorAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label); } @@ -552,8 +552,8 @@ export class CloseLeftEditorsInGroupAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService, - @INextEditorGroupsService private groupService: INextEditorGroupsService + @IEditorService private editorService: IEditorService, + @IEditorGroupsService private groupService: IEditorGroupsService ) { super(id, label); } @@ -568,7 +568,7 @@ export class CloseLeftEditorsInGroupAction extends Action { } } -function getTarget(editorService: INextEditorService, editorGroupService: INextEditorGroupsService, context?: IEditorIdentifier): { editor: IEditorInput, group: IEditorGroup } { +function getTarget(editorService: IEditorService, editorGroupService: IEditorGroupsService, context?: IEditorIdentifier): { editor: IEditorInput, group: IEditorGroup } { if (context) { return { editor: context.editor, group: editorGroupService.getGroup(context.groupId) }; } @@ -586,7 +586,7 @@ export class CloseAllEditorsAction extends Action { id: string, label: string, @ITextFileService private textFileService: ITextFileService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, label, 'action-close-all-files'); } @@ -630,7 +630,7 @@ export class CloseEditorsInOtherGroupsAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, ) { super(id, label); } @@ -653,7 +653,7 @@ export class BaseMoveGroupAction extends Action { id: string, label: string, private direction: GroupDirection, - private editorGroupService: INextEditorGroupsService + private editorGroupService: IEditorGroupsService ) { super(id, label); } @@ -683,7 +683,7 @@ export class MoveGroupLeftAction extends BaseMoveGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, GroupDirection.LEFT, editorGroupService); } @@ -697,7 +697,7 @@ export class MoveGroupRightAction extends BaseMoveGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, GroupDirection.RIGHT, editorGroupService); } @@ -711,7 +711,7 @@ export class MoveGroupUpAction extends BaseMoveGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, GroupDirection.UP, editorGroupService); } @@ -725,7 +725,7 @@ export class MoveGroupDownAction extends BaseMoveGroupAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, GroupDirection.DOWN, editorGroupService); } @@ -736,7 +736,7 @@ export class MinimizeOtherGroupsAction extends Action { public static readonly ID = 'workbench.action.minimizeOtherEditors'; public static readonly LABEL = nls.localize('minimizeOtherEditorGroups', "Minimize Other Editor Groups"); - constructor(id: string, label: string, @INextEditorGroupsService private editorGroupService: INextEditorGroupsService) { + constructor(id: string, label: string, @IEditorGroupsService private editorGroupService: IEditorGroupsService) { super(id, label); } @@ -752,7 +752,7 @@ export class EvenGroupWidthsAction extends Action { public static readonly ID = 'workbench.action.evenEditorWidths'; public static readonly LABEL = nls.localize('evenEditorGroups', "Even Editor Group Widths"); - constructor(id: string, label: string, @INextEditorGroupsService private editorGroupService: INextEditorGroupsService) { + constructor(id: string, label: string, @IEditorGroupsService private editorGroupService: IEditorGroupsService) { super(id, label); } @@ -771,8 +771,8 @@ export class MaximizeGroupAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorService private editorService: IEditorService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IPartService private partService: IPartService ) { super(id, label); @@ -794,8 +794,8 @@ export abstract class BaseNavigateEditorAction extends Action { constructor( id: string, label: string, - protected editorGroupService: INextEditorGroupsService, - protected editorService: INextEditorService + protected editorGroupService: IEditorGroupsService, + protected editorService: IEditorService ) { super(id, label); } @@ -826,8 +826,8 @@ export class OpenNextEditor extends BaseNavigateEditorAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, - @INextEditorService editorService: INextEditorService + @IEditorGroupsService editorGroupService: IEditorGroupsService, + @IEditorService editorService: IEditorService ) { super(id, label, editorGroupService, editorService); } @@ -861,8 +861,8 @@ export class OpenPreviousEditor extends BaseNavigateEditorAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, - @INextEditorService editorService: INextEditorService + @IEditorGroupsService editorGroupService: IEditorGroupsService, + @IEditorService editorService: IEditorService ) { super(id, label, editorGroupService, editorService); } @@ -896,8 +896,8 @@ export class OpenNextEditorInGroup extends BaseNavigateEditorAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, - @INextEditorService editorService: INextEditorService + @IEditorGroupsService editorGroupService: IEditorGroupsService, + @IEditorService editorService: IEditorService ) { super(id, label, editorGroupService, editorService); } @@ -919,8 +919,8 @@ export class OpenPreviousEditorInGroup extends BaseNavigateEditorAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, - @INextEditorService editorService: INextEditorService + @IEditorGroupsService editorGroupService: IEditorGroupsService, + @IEditorService editorService: IEditorService ) { super(id, label, editorGroupService, editorService); } @@ -942,8 +942,8 @@ export class OpenFirstEditorInGroup extends BaseNavigateEditorAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, - @INextEditorService editorService: INextEditorService + @IEditorGroupsService editorGroupService: IEditorGroupsService, + @IEditorService editorService: IEditorService ) { super(id, label, editorGroupService, editorService); } @@ -964,8 +964,8 @@ export class OpenLastEditorInGroup extends BaseNavigateEditorAction { constructor( id: string, label: string, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, - @INextEditorService editorService: INextEditorService + @IEditorGroupsService editorGroupService: IEditorGroupsService, + @IEditorService editorService: IEditorService ) { super(id, label, editorGroupService, editorService); } diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index bbbc856ec1e..3b44f4d9868 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -8,7 +8,7 @@ import * as types from 'vs/base/common/types'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { TextCompareEditorVisibleContext, EditorInput, IEditorIdentifier, IEditorCommandsContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, CloseDirection, IEditor, IEditorInput } from 'vs/workbench/common/editor'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor'; import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes'; @@ -19,7 +19,7 @@ import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions'; import { IListService } from 'vs/platform/list/browser/listService'; import { List } from 'vs/base/browser/ui/list/listWidget'; import { distinct } from 'vs/base/common/arrays'; -import { INextEditorGroupsService, IEditorGroup, GroupDirection, GroupLocation, GroupsOrder, preferredGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, IEditorGroup, GroupDirection, GroupLocation, GroupsOrder, preferredGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; @@ -88,7 +88,7 @@ function moveActiveEditor(args: ActiveEditorMoveArguments = Object.create(null), args.by = args.by || 'tab'; args.value = typeof args.value === 'number' ? args.value : 1; - const activeControl = accessor.get(INextEditorService).activeControl; + const activeControl = accessor.get(IEditorService).activeControl; if (activeControl) { switch (args.by) { case 'tab': @@ -128,7 +128,7 @@ function moveActiveTab(args: ActiveEditorMoveArguments, control: IEditor, access } function moveActiveEditorToGroup(args: ActiveEditorMoveArguments, control: IEditor, accessor: ServicesAccessor): void { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const groups = editorGroupService.groups; const sourceGroup = control.group; @@ -202,7 +202,7 @@ function registerDiffEditorCommands(): void { }); function navigateInDiffEditor(accessor: ServicesAccessor, next: boolean): void { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const candidates = [editorService.activeControl, ...editorService.visibleControls].filter(e => e instanceof TextDiffEditor); if (candidates.length > 0) { @@ -216,7 +216,7 @@ function registerDiffEditorCommands(): void { when: void 0, primary: void 0, handler: (accessor, resource, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const { control } = resolveCommandsContext(editorGroupService, context); if (control instanceof TextDiffEditor) { @@ -244,7 +244,7 @@ function registerOpenEditorAtIndexCommands(): void { primary: KeyMod.Alt | toKeyCode(visibleIndex), mac: { primary: KeyMod.WinCtrl | toKeyCode(visibleIndex) }, handler: accessor => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const activeControl = editorService.activeControl; if (activeControl) { @@ -289,7 +289,7 @@ function registerFocusEditorGroupAtIndexCommands(): void { when: void 0, primary: KeyMod.CtrlCmd | toKeyCode(groupIndex), handler: accessor => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const configurationService = accessor.get(IConfigurationService); // To keep backwards compatibility (pre-grid), allow to focus a group @@ -360,7 +360,7 @@ function registerEditorCommands() { when: void 0, primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_U), handler: (accessor, resource: URI | object, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const contexts = getMultiSelectedEditorContexts(context, accessor.get(IListService), editorGroupService); if (contexts.length === 0 && editorGroupService.activeGroup) { contexts.push({ groupId: editorGroupService.activeGroup.id }); // If command is triggered from the command palette use the active group @@ -378,7 +378,7 @@ function registerEditorCommands() { when: void 0, primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_W), handler: (accessor, resource: URI | object, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const contexts = getMultiSelectedEditorContexts(context, accessor.get(IListService), editorGroupService); const distinctGroupIds = distinct(contexts.map(c => c.groupId)); @@ -399,7 +399,7 @@ function registerEditorCommands() { primary: KeyMod.CtrlCmd | KeyCode.KEY_W, win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_W] }, handler: (accessor, resource: URI | object, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const contexts = getMultiSelectedEditorContexts(context, accessor.get(IListService), editorGroupService); const activeGroup = editorGroupService.activeGroup; if (contexts.length === 0 && activeGroup && activeGroup.activeEditor) { @@ -422,7 +422,7 @@ function registerEditorCommands() { primary: KeyMod.CtrlCmd | KeyCode.KEY_W, win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_W] }, handler: (accessor, resource: URI | object, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); let group: IEditorGroup; if (context && typeof context.groupId === 'number') { @@ -442,7 +442,7 @@ function registerEditorCommands() { primary: void 0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_T }, handler: (accessor, resource: URI | object, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const contexts = getMultiSelectedEditorContexts(context, accessor.get(IListService), editorGroupService); if (contexts.length === 0) { @@ -471,7 +471,7 @@ function registerEditorCommands() { when: void 0, primary: void 0, handler: (accessor, resource: URI, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const { group, editor } = resolveCommandsContext(editorGroupService, context); if (group && editor) { @@ -488,7 +488,7 @@ function registerEditorCommands() { when: void 0, primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.Enter), handler: (accessor, resource: URI, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const { group, editor } = resolveCommandsContext(editorGroupService, context); if (group && editor) { @@ -505,7 +505,7 @@ function registerEditorCommands() { when: void 0, primary: void 0, handler: (accessor, resource: URI, context: IEditorCommandsContext) => { - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const quickOpenService = accessor.get(IQuickOpenService); if (editorGroupService.count <= 1) { @@ -521,7 +521,7 @@ function registerEditorCommands() { }); } -function resolveCommandsContext(editorGroupService: INextEditorGroupsService, context?: IEditorCommandsContext): { group: IEditorGroup, editor: IEditorInput, control: IEditor } { +function resolveCommandsContext(editorGroupService: IEditorGroupsService, context?: IEditorCommandsContext): { group: IEditorGroup, editor: IEditorInput, control: IEditor } { // Resolve from context let group = context && typeof context.groupId === 'number' ? editorGroupService.getGroup(context.groupId) : undefined; @@ -538,7 +538,7 @@ function resolveCommandsContext(editorGroupService: INextEditorGroupsService, co return { group, editor, control }; } -export function getMultiSelectedEditorContexts(editorContext: IEditorCommandsContext, listService: IListService, editorGroupService: INextEditorGroupsService): IEditorCommandsContext[] { +export function getMultiSelectedEditorContexts(editorContext: IEditorCommandsContext, listService: IListService, editorGroupService: IEditorGroupsService): IEditorCommandsContext[] { // First check for a focused list to return the selected items from const list = listService.lastFocusedList; diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 9d0039db7c5..7bddf73aec7 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -11,7 +11,7 @@ import { Part } from 'vs/workbench/browser/part'; import { Dimension, isAncestor, toggleClass, addClass, clearNode } from 'vs/base/browser/dom'; import { Event, Emitter, once } from 'vs/base/common/event'; import { contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry'; -import { INextEditorGroupsService, GroupDirection, IAddGroupOptions, GroupsArrangement, GroupOrientation, IMergeGroupOptions, MergeGroupMode, ICopyEditorOptions, GroupsOrder, GroupChangeKind, GroupLocation, IFindGroupScope } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, GroupDirection, IAddGroupOptions, GroupsArrangement, GroupOrientation, IMergeGroupOptions, MergeGroupMode, ICopyEditorOptions, GroupsOrder, GroupChangeKind, GroupLocation, IFindGroupScope } from 'vs/workbench/services/group/common/editorGroupsService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Direction, SerializableGrid, Sizing, ISerializedGrid, Orientation, ISerializedNode, GridBranchNode, isGridBranchNode, GridNode } from 'vs/base/browser/ui/grid/grid'; import { GroupIdentifier, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor'; @@ -44,7 +44,7 @@ interface IEditorPartUIState { mostRecentActiveGroups: GroupIdentifier[]; } -export class EditorPart extends Part implements INextEditorGroupsService, IEditorGroupsAccessor { +export class EditorPart extends Part implements IEditorGroupsService, IEditorGroupsAccessor { _serviceBrand: any; diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts index 2c5cf00e484..13c879b8f6c 100644 --- a/src/vs/workbench/browser/parts/editor/editorPicker.ts +++ b/src/vs/workbench/browser/parts/editor/editorPicker.ts @@ -15,8 +15,8 @@ import { IModeService } from 'vs/editor/common/services/modeService'; import { getIconClasses } from 'vs/workbench/browser/labels'; import { IModelService } from 'vs/editor/common/services/modelService'; import { QuickOpenHandler } from 'vs/workbench/browser/quickopen'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService, IEditorGroup, EditorsOrder, GroupsOrder } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService, IEditorGroup, EditorsOrder, GroupsOrder } from 'vs/workbench/services/group/common/editorGroupsService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { EditorInput, toResource } from 'vs/workbench/common/editor'; import { compareItemsByScore, scoreItem, ScorerCache, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer'; @@ -83,8 +83,8 @@ export abstract class BaseEditorPicker extends QuickOpenHandler { constructor( @IInstantiationService protected instantiationService: IInstantiationService, - @INextEditorService protected editorService: INextEditorService, - @INextEditorGroupsService protected editorGroupService: INextEditorGroupsService + @IEditorService protected editorService: IEditorService, + @IEditorGroupsService protected editorGroupService: IEditorGroupsService ) { super(); diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 64714c4f474..93286561d9d 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -30,7 +30,7 @@ import { TrimTrailingWhitespaceAction } from 'vs/editor/contrib/linesOperations/ import { IndentUsingSpaces, IndentUsingTabs, DetectIndentation, IndentationToSpacesAction, IndentationToTabsAction } from 'vs/editor/contrib/indentation/indentation'; import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor'; import { BinaryResourceDiffEditor } from 'vs/workbench/browser/parts/editor/binaryDiffEditor'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IQuickOpenService, IPickOpenEntry, IFilePickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { SUPPORTED_ENCODINGS, IFileService, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files'; @@ -57,7 +57,7 @@ import { Schemas } from 'vs/base/common/network'; import { IAnchor } from 'vs/base/browser/ui/contextview/contextview'; import { Themable } from 'vs/workbench/common/theme'; import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; class SideBySideEditorEncodingSupport implements IEncodingSupport { constructor(private master: IEncodingSupport, private details: IEncodingSupport) { } @@ -295,8 +295,8 @@ export class EditorStatus implements IStatusbarItem { private screenReaderExplanation: ScreenReaderDetectedExplanation; constructor( - @INextEditorService private editorService: INextEditorService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorService private editorService: IEditorService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IQuickOpenService private quickOpenService: IQuickOpenService, @IInstantiationService private instantiationService: IInstantiationService, @IUntitledEditorService private untitledEditorService: IUntitledEditorService, @@ -827,7 +827,7 @@ export class ChangeModeAction extends Action { actionLabel: string, @IModeService private modeService: IModeService, @IModelService private modelService: IModelService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService, @IQuickOpenService private quickOpenService: IQuickOpenService, @IPreferencesService private preferencesService: IPreferencesService, @@ -1038,7 +1038,7 @@ class ChangeIndentationAction extends Action { constructor( actionId: string, actionLabel: string, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IQuickOpenService private quickOpenService: IQuickOpenService ) { super(actionId, actionLabel); @@ -1088,7 +1088,7 @@ export class ChangeEOLAction extends Action { constructor( actionId: string, actionLabel: string, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IQuickOpenService private quickOpenService: IQuickOpenService ) { super(actionId, actionLabel); @@ -1133,7 +1133,7 @@ export class ChangeEncodingAction extends Action { constructor( actionId: string, actionLabel: string, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IQuickOpenService private quickOpenService: IQuickOpenService, @ITextResourceConfigurationService private textResourceConfigurationService: ITextResourceConfigurationService, @IFileService private fileService: IFileService diff --git a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts index 1937dbf8f07..6924bfb1f12 100644 --- a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts +++ b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts @@ -6,7 +6,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import URI from 'vs/base/common/uri'; import { Event, Emitter } from 'vs/base/common/event'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IRange } from 'vs/editor/common/core/range'; import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModel'; @@ -28,7 +28,7 @@ export class RangeHighlightDecorations implements IDisposable { private readonly _onHighlightRemoved: Emitter = new Emitter(); public readonly onHighlghtRemoved: Event = this._onHighlightRemoved.event; - constructor(@INextEditorService private editorService: INextEditorService) { + constructor(@IEditorService private editorService: IEditorService) { } public removeHighlightRange() { diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 5df42d98991..b7962916769 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -21,7 +21,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { Registry } from 'vs/platform/registry/common/platform'; import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { memoize } from 'vs/base/common/decorators'; import * as platform from 'vs/base/common/platform'; import { IFileService } from 'vs/platform/files/common/files'; @@ -245,7 +245,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem { constructor( @IContextMenuService private contextMenuService: IContextMenuService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IThemeService themeService: IThemeService ) { super(themeService); diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts index eef5565af39..8dacac617d3 100644 --- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts @@ -36,8 +36,8 @@ import { Registry } from 'vs/platform/registry/common/platform'; import URI from 'vs/base/common/uri'; import { once } from 'vs/base/common/event'; import { DelegatingWorkbenchEditorService } from 'vs/workbench/services/editor/browser/editorService'; -import { IEditorGroup, INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { CancellationToken } from 'vs/base/common/cancellation'; /** @@ -59,9 +59,9 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor { @IStorageService storageService: IStorageService, @ITextResourceConfigurationService configurationService: ITextResourceConfigurationService, @IConfigurationService private readonly _actualConfigurationService: IConfigurationService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IThemeService themeService: IThemeService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, + @IEditorGroupsService editorGroupService: IEditorGroupsService, @ITextFileService textFileService: ITextFileService, ) { super(TextDiffEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService); @@ -120,7 +120,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor { }); // Create a special child of instantiator that will delegate all calls to openEditor() to the same diff editor if the input matches with the modified one - const diffEditorInstantiator = this.instantiationService.createChild(new ServiceCollection([INextEditorService, delegatingEditorService])); + const diffEditorInstantiator = this.instantiationService.createChild(new ServiceCollection([IEditorService, delegatingEditorService])); return diffEditorInstantiator.createInstance(DiffEditorWidget, parent, configuration); } diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index 80f1963fe8b..254d873a42a 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -24,9 +24,9 @@ import { ITextFileService, SaveReason, AutoSaveMode } from 'vs/workbench/service import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration'; import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { isDiffEditor, isCodeEditor, ICodeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser'; -import { INextEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; const TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'textEditorViewState'; @@ -54,8 +54,8 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor { @ITextResourceConfigurationService private readonly _configurationService: ITextResourceConfigurationService, @IThemeService protected themeService: IThemeService, @ITextFileService private readonly _textFileService: ITextFileService, - @INextEditorService protected editorService: INextEditorService, - @INextEditorGroupsService protected editorGroupService: INextEditorGroupsService, + @IEditorService protected editorService: IEditorService, + @IEditorGroupsService protected editorGroupService: IEditorGroupsService, ) { super(id, telemetryService, themeService); diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts index 20b0ce156e8..e58de5a1c6e 100644 --- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts @@ -22,9 +22,9 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { once } from 'vs/base/common/event'; import { ScrollType } from 'vs/editor/common/editorCommon'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; /** * An editor implementation that is capable of showing the contents of resource inputs. Uses @@ -39,9 +39,9 @@ export class AbstractTextResourceEditor extends BaseTextEditor { @IStorageService storageService: IStorageService, @ITextResourceConfigurationService configurationService: ITextResourceConfigurationService, @IThemeService themeService: IThemeService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, + @IEditorGroupsService editorGroupService: IEditorGroupsService, @ITextFileService textFileService: ITextFileService, - @INextEditorService editorService: INextEditorService + @IEditorService editorService: IEditorService ) { super(id, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService); } @@ -209,8 +209,8 @@ export class TextResourceEditor extends AbstractTextResourceEditor { @ITextResourceConfigurationService configurationService: ITextResourceConfigurationService, @IThemeService themeService: IThemeService, @ITextFileService textFileService: ITextFileService, - @INextEditorService editorService: INextEditorService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorService editorService: IEditorService, + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(TextResourceEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, editorGroupService, textFileService, editorService); } diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts index ce437e5c7ad..750aeb9764f 100644 --- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts +++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts @@ -18,7 +18,7 @@ import { NotificationsList } from 'vs/workbench/browser/parts/notifications/noti import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { addClass, removeClass, isAncestor, Dimension } from 'vs/base/browser/dom'; import { widgetShadow } from 'vs/platform/theme/common/colorRegistry'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { localize } from 'vs/nls'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { ClearAllNotificationsAction, HideNotificationsCenterAction, NotificationActionRunner } from 'vs/workbench/browser/parts/notifications/notificationsActions'; @@ -45,7 +45,7 @@ export class NotificationsCenter extends Themable { @IInstantiationService private instantiationService: IInstantiationService, @IPartService private partService: IPartService, @IContextKeyService contextKeyService: IContextKeyService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IKeybindingService private keybindingService: IKeybindingService ) { super(themeService); diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts index f21a961f614..3c51fb8c2f0 100644 --- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts +++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts @@ -16,7 +16,7 @@ import { IPartService, Parts } from 'vs/workbench/services/part/common/partServi import { Themable, NOTIFICATIONS_TOAST_BORDER } from 'vs/workbench/common/theme'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { widgetShadow } from 'vs/platform/theme/common/colorRegistry'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { NotificationsToastsVisibleContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { localize } from 'vs/nls'; @@ -64,7 +64,7 @@ export class NotificationsToasts extends Themable { @IInstantiationService private instantiationService: IInstantiationService, @IPartService private partService: IPartService, @IThemeService themeService: IThemeService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IContextKeyService contextKeyService: IContextKeyService, @ILifecycleService private lifecycleService: ILifecycleService ) { diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts index e43aa8598d0..230e77eb960 100644 --- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts +++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts @@ -33,7 +33,7 @@ import { Button } from 'vs/base/browser/ui/button/button'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { onUnexpectedError, canceled } from 'vs/base/common/errors'; import Severity from 'vs/base/common/severity'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { Action } from 'vs/base/common/actions'; @@ -369,7 +369,7 @@ export class QuickInputService extends Component implements IQuickInputService { @IInstantiationService private instantiationService: IInstantiationService, @IPartService private partService: IPartService, @IQuickOpenService private quickOpenService: IQuickOpenService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IContextKeyService contextKeyService: IContextKeyService, @IThemeService themeService: IThemeService ) { diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 869c280bce9..e19932ffc94 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -55,8 +55,8 @@ import { Schemas } from 'vs/base/common/network'; import Severity from 'vs/base/common/severity'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { Dimension, addClass } from 'vs/base/browser/dom'; -import { INextEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; const HELP_PREFIX = '?'; @@ -101,8 +101,8 @@ export class QuickOpenController extends Component implements IQuickOpenService private editorHistoryHandler: EditorHistoryHandler; constructor( - @INextEditorService private editorService: INextEditorService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorService private editorService: IEditorService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @INotificationService private notificationService: INotificationService, @IContextKeyService private contextKeyService: IContextKeyService, @IConfigurationService private configurationService: IConfigurationService, @@ -1168,7 +1168,7 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry { constructor( input: IEditorInput | IResourceInput, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IModeService private modeService: IModeService, @IModelService private modelService: IModelService, @ITextFileService private textFileService: ITextFileService, diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index 5f8aa551168..beebc378ade 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -14,7 +14,7 @@ import { $ } from 'vs/base/browser/builder'; import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel'; import { Registry } from 'vs/platform/registry/common/platform'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Part } from 'vs/workbench/browser/part'; import { StatusbarAlignment, IStatusbarRegistry, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -228,7 +228,7 @@ class StatusBarEntryItem implements IStatusbarItem { @INotificationService private notificationService: INotificationService, @ITelemetryService private telemetryService: ITelemetryService, @IContextMenuService private contextMenuService: IContextMenuService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IThemeService private themeService: IThemeService ) { this.entry = entry; diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts index 28d128d4f5f..54b15980d2d 100644 --- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts @@ -18,7 +18,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { IAction, Action } from 'vs/base/common/actions'; import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import * as nls from 'vs/nls'; import * as labels from 'vs/base/common/labels'; @@ -60,7 +60,7 @@ export class TitlebarPart extends Part implements ITitleService { @IWindowService private windowService: IWindowService, @IConfigurationService private configurationService: IConfigurationService, @IWindowsService private windowsService: IWindowsService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IEnvironmentService private environmentService: IEnvironmentService, @IWorkspaceContextService private contextService: IWorkspaceContextService, @IThemeService themeService: IThemeService, diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts index ff9fc52714a..407acc7b5d5 100644 --- a/src/vs/workbench/browser/quickopen.ts +++ b/src/vs/workbench/browser/quickopen.ts @@ -18,7 +18,7 @@ import { EditorOptions, EditorInput, IEditorInput } from 'vs/workbench/common/ed import { IResourceInput, IEditorOptions } from 'vs/platform/editor/common/editor'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; export const CLOSE_ON_FOCUS_LOST_CONFIG = 'workbench.quickOpen.closeOnFocusLost'; @@ -245,7 +245,7 @@ export interface IEditorQuickOpenEntry { */ export class EditorQuickOpenEntry extends QuickOpenEntry implements IEditorQuickOpenEntry { - constructor(private _editorService: INextEditorService) { + constructor(private _editorService: IEditorService) { super(); } diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index db51855af2b..b67b491a4b1 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -17,7 +17,7 @@ import { ToggleSidebarVisibilityAction } from 'vs/workbench/browser/actions/togg import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; export abstract class Viewlet extends Composite implements IViewlet { @@ -120,7 +120,7 @@ export class ToggleViewletAction extends Action { name: string, viewletId: string, @IViewletService protected viewletService: IViewletService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService + @IEditorGroupsService private editorGroupService: IEditorGroupsService ) { super(id, name); diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index b63f658c10b..76742869fd2 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -18,7 +18,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { ITextModel } from 'vs/editor/common/model'; import { Schemas } from 'vs/base/common/network'; import { LRUCache } from 'vs/base/common/map'; -import { INextEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { ICompositeControl } from 'vs/workbench/common/composite'; export const EditorsVisibleContext = new RawContextKey('editorIsOpen', false); @@ -1024,7 +1024,7 @@ export class EditorViewStateMemento { private cache: LRUCache>; constructor( - private editorGroupService: INextEditorGroupsService, + private editorGroupService: IEditorGroupsService, private memento: object, private key: string, private limit: number = 10 diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index f714c5c7a06..8e53aa0a7cc 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -26,7 +26,7 @@ import * as browser from 'vs/base/browser/browser'; import { IIntegrityService } from 'vs/platform/integrity/common/integrity'; import { IEntryRunContext } from 'vs/base/parts/quickopen/common/quickOpen'; import { ITimerService, IStartupMetrics } from 'vs/workbench/services/timer/common/timerService'; -import { INextEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { IPartService, Parts, Position as PartPosition } from 'vs/workbench/services/part/common/partService'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; @@ -1136,7 +1136,7 @@ export abstract class BaseNavigationAction extends Action { constructor( id: string, label: string, - @INextEditorGroupsService protected groupService: INextEditorGroupsService, + @IEditorGroupsService protected groupService: IEditorGroupsService, @IPanelService protected panelService: IPanelService, @IPartService protected partService: IPartService, @IViewletService protected viewletService: IViewletService @@ -1224,7 +1224,7 @@ export class NavigateLeftAction extends BaseNavigationAction { constructor( id: string, label: string, - @INextEditorGroupsService groupService: INextEditorGroupsService, + @IEditorGroupsService groupService: IEditorGroupsService, @IPanelService panelService: IPanelService, @IPartService partService: IPartService, @IViewletService viewletService: IViewletService @@ -1276,7 +1276,7 @@ export class NavigateRightAction extends BaseNavigationAction { constructor( id: string, label: string, - @INextEditorGroupsService groupService: INextEditorGroupsService, + @IEditorGroupsService groupService: IEditorGroupsService, @IPanelService panelService: IPanelService, @IPartService partService: IPartService, @IViewletService viewletService: IViewletService @@ -1328,7 +1328,7 @@ export class NavigateUpAction extends BaseNavigationAction { constructor( id: string, label: string, - @INextEditorGroupsService groupService: INextEditorGroupsService, + @IEditorGroupsService groupService: IEditorGroupsService, @IPanelService panelService: IPanelService, @IPartService partService: IPartService, @IViewletService viewletService: IViewletService @@ -1357,7 +1357,7 @@ export class NavigateDownAction extends BaseNavigationAction { constructor( id: string, label: string, - @INextEditorGroupsService groupService: INextEditorGroupsService, + @IEditorGroupsService groupService: IEditorGroupsService, @IPanelService panelService: IPanelService, @IPartService partService: IPartService, @IViewletService viewletService: IViewletService diff --git a/src/vs/workbench/electron-browser/commands.ts b/src/vs/workbench/electron-browser/commands.ts index a4beed3550e..859842b2cb4 100644 --- a/src/vs/workbench/electron-browser/commands.ts +++ b/src/vs/workbench/electron-browser/commands.ts @@ -14,7 +14,7 @@ import { IWindowsService, IWindowService } from 'vs/platform/windows/common/wind import { List } from 'vs/base/browser/ui/list/listWidget'; import * as errors from 'vs/base/common/errors'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import URI from 'vs/base/common/uri'; import { IEditorOptions, Position as EditorPosition } from 'vs/platform/editor/common/editor'; import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey, ListWidget } from 'vs/platform/list/browser/listService'; @@ -536,7 +536,7 @@ export function registerCommands(): void { }); CommandsRegistry.registerCommand('_workbench.diff', function (accessor: ServicesAccessor, args: [URI, URI, string, string, IEditorOptions, EditorPosition]) { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); let [leftResource, rightResource, label, description, options, position] = args; if (!options || typeof options !== 'object') { @@ -553,7 +553,7 @@ export function registerCommands(): void { }); CommandsRegistry.registerCommand('_workbench.open', function (accessor: ServicesAccessor, args: [URI, IEditorOptions, EditorPosition]) { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const [resource, options, column] = args; return editorService.openEditor({ resource, options }, column).then(() => void 0); diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index ccf8b004137..a826136ec7f 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -17,7 +17,7 @@ import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; import { IAction, Action } from 'vs/base/common/actions'; import { AutoSaveConfiguration, IFileService } from 'vs/platform/files/common/files'; import { toResource, IUntitledResourceInput } from 'vs/workbench/common/editor'; -import { INextEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { IWindowsService, IWindowService, IWindowSettings, IPath, IOpenFileRequest, IWindowsConfiguration, IAddFoldersRequest, IRunActionInWindowRequest } from 'vs/platform/windows/common/windows'; @@ -74,7 +74,7 @@ export class ElectronWindow extends Themable { constructor( shellContainer: HTMLElement, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IWindowsService private windowsService: IWindowsService, @IWindowService private windowService: IWindowService, @IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService, diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index caf5a7d8923..b6fea9b62af 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -107,9 +107,9 @@ import { IPCClient } from 'vs/base/parts/ipc/common/ipc'; import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver'; import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; import { PreferencesService } from 'vs/workbench/services/preferences/browser/preferencesService'; -import { INextEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; -import { NextEditorService } from 'vs/workbench/services/editor/browser/editorService'; +import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; +import { EditorService } from 'vs/workbench/services/editor/browser/editorService'; import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler'; interface WorkbenchParams { @@ -188,8 +188,8 @@ export class Workbench extends Disposable implements IPartService { private workbenchCreated: boolean; private workbenchShutdown: boolean; - private editorService: NextEditorService; - private editorGroupService: INextEditorGroupsService; + private editorService: EditorService; + private editorGroupService: IEditorGroupsService; private viewletService: IViewletService; private contextKeyService: IContextKeyService; private keybindingService: IKeybindingService; @@ -381,9 +381,9 @@ export class Workbench extends Disposable implements IPartService { this.editorPart = this.instantiationService.createInstance(EditorPart, Identifiers.EDITOR_PART, restorePreviousEditorState); this._register(toDisposable(() => this.editorPart.shutdown())); this.editorGroupService = this.editorPart; - serviceCollection.set(INextEditorGroupsService, this.editorPart); - this.editorService = this.instantiationService.createInstance(NextEditorService); - serviceCollection.set(INextEditorService, this.editorService); + serviceCollection.set(IEditorGroupsService, this.editorPart); + this.editorService = this.instantiationService.createInstance(EditorService); + serviceCollection.set(IEditorService, this.editorService); // Title bar this.titlebarPart = this.instantiationService.createInstance(TitlebarPart, Identifiers.TITLEBAR_PART); diff --git a/src/vs/workbench/parts/backup/common/backupRestorer.ts b/src/vs/workbench/parts/backup/common/backupRestorer.ts index cf67b1aec3f..e9630f6804c 100644 --- a/src/vs/workbench/parts/backup/common/backupRestorer.ts +++ b/src/vs/workbench/parts/backup/common/backupRestorer.ts @@ -11,7 +11,7 @@ import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/un import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import * as errors from 'vs/base/common/errors'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IResourceInput } from 'vs/platform/editor/common/editor'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { Schemas } from 'vs/base/common/network'; @@ -25,7 +25,7 @@ export class BackupRestorer implements IWorkbenchContribution { constructor( @IUntitledEditorService private untitledEditorService: IUntitledEditorService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IBackupFileService private backupFileService: IBackupFileService, @ITextFileService private textFileService: ITextFileService, @ILifecycleService private lifecycleService: ILifecycleService, diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.ts b/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.ts index 62f14717e36..ac1e2d84e81 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import { registerEditorAction, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { WorkbenchKeybindingService } from 'vs/workbench/services/keybinding/electron-browser/keybindingService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { IUntitledResourceInput } from 'vs/workbench/common/editor'; @@ -25,7 +25,7 @@ class InspectKeyMap extends EditorAction { public run(accessor: ServicesAccessor, editor: ICodeEditor): void { const keybindingService = accessor.get(IKeybindingService); - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); if (keybindingService instanceof WorkbenchKeybindingService) { editorService.openEditor({ contents: keybindingService.dumpDebugInfo(), options: { pinned: true } } as IUntitledResourceInput); diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts b/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts index 36e7b6db5f5..8155d1693a0 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts @@ -25,7 +25,7 @@ import URI from 'vs/base/common/uri'; import { Location } from 'vs/editor/common/modes'; import { provideReferences, defaultReferenceSearchOptions } from 'vs/editor/contrib/referenceSearch/referenceSearch'; import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class WorkbenchReferencesController extends ReferencesController { @@ -70,7 +70,7 @@ let findReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour throw new Error('illegal argument, position'); } - return accessor.get(INextEditorService).openEditor({ resource }).then(editor => { + return accessor.get(IEditorService).openEditor({ resource }).then(editor => { let control = editor.getControl(); if (!isCodeEditor(control)) { return undefined; @@ -92,7 +92,7 @@ let showReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour throw new Error('illegal argument, uri expected'); } - return accessor.get(INextEditorService).openEditor({ resource }).then(editor => { + return accessor.get(IEditorService).openEditor({ resource }).then(editor => { let control = editor.getControl(); if (!isCodeEditor(control)) { return undefined; diff --git a/src/vs/workbench/parts/debug/browser/breakpointsView.ts b/src/vs/workbench/parts/debug/browser/breakpointsView.ts index 8a53aa73836..676e9a5d323 100644 --- a/src/vs/workbench/parts/debug/browser/breakpointsView.ts +++ b/src/vs/workbench/parts/debug/browser/breakpointsView.ts @@ -34,7 +34,7 @@ import { attachInputBoxStyler } from 'vs/platform/theme/common/styler'; import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; const $ = dom.$; @@ -53,7 +53,7 @@ export class BreakpointsView extends ViewsViewletPanel { @IKeybindingService keybindingService: IKeybindingService, @IInstantiationService private instantiationService: IInstantiationService, @IThemeService private themeService: IThemeService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IContextViewService private contextViewService: IContextViewService, @IConfigurationService configurationService: IConfigurationService ) { @@ -520,7 +520,7 @@ class FunctionBreakpointInputRenderer implements IRenderer { +export function openBreakpointSource(breakpoint: Breakpoint, sideBySide: boolean, preserveFocus: boolean, debugService: IDebugService, editorService: IEditorService): TPromise { if (breakpoint.uri.scheme === DEBUG_SCHEME && debugService.state === State.Inactive) { return TPromise.as(null); } diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts index 8694ab47a07..24a2ea496a5 100644 --- a/src/vs/workbench/parts/debug/browser/debugActions.ts +++ b/src/vs/workbench/parts/debug/browser/debugActions.ts @@ -16,7 +16,7 @@ import { IDebugService, State, ISession, IThread, IEnablement, IBreakpoint, ISta import { Variable, Expression, Thread, Breakpoint, Session } from 'vs/workbench/parts/debug/common/debugModel'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { TogglePanelAction } from 'vs/workbench/browser/panel'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { INotificationService } from 'vs/platform/notification/common/notification'; @@ -770,7 +770,7 @@ export class FocusSessionAction extends AbstractDebugAction { constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label, null, debugService, keybindingService, 100); } diff --git a/src/vs/workbench/parts/debug/browser/debugCommands.ts b/src/vs/workbench/parts/debug/browser/debugCommands.ts index c73002c7f4d..401444d241f 100644 --- a/src/vs/workbench/parts/debug/browser/debugCommands.ts +++ b/src/vs/workbench/parts/debug/browser/debugCommands.ts @@ -17,7 +17,7 @@ import { IExtensionsViewlet, VIEWLET_ID as EXTENSIONS_VIEWLET_ID } from 'vs/work import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { openBreakpointSource } from 'vs/workbench/parts/debug/browser/breakpointsView'; @@ -53,7 +53,7 @@ export function registerCommands(): void { when: EditorContextKeys.editorTextFocus, handler: (accessor) => { const debugService = accessor.get(IDebugService); - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const widget = editorService.activeTextEditorWidget; if (isCodeEditor(widget)) { const model = widget.getModel(); @@ -200,7 +200,7 @@ export function registerCommands(): void { const INLINE_BREAKPOINT_COMMAND_ID = 'editor.debug.action.toggleInlineBreakpoint'; const inlineBreakpointHandler = (accessor: ServicesAccessor) => { const debugService = accessor.get(IDebugService); - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const widget = editorService.activeTextEditorWidget; if (isCodeEditor(widget)) { const position = widget.getPosition(); @@ -259,7 +259,7 @@ export function registerCommands(): void { if (list instanceof List) { const focus = list.getFocusedElements(); if (focus.length && focus[0] instanceof Breakpoint) { - return openBreakpointSource(focus[0], true, false, accessor.get(IDebugService), accessor.get(INextEditorService)); + return openBreakpointSource(focus[0], true, false, accessor.get(IDebugService), accessor.get(IEditorService)); } } diff --git a/src/vs/workbench/parts/debug/browser/linkDetector.ts b/src/vs/workbench/parts/debug/browser/linkDetector.ts index d887c3082d7..e26b2ba73c0 100644 --- a/src/vs/workbench/parts/debug/browser/linkDetector.ts +++ b/src/vs/workbench/parts/debug/browser/linkDetector.ts @@ -8,7 +8,7 @@ import { isMacintosh } from 'vs/base/common/platform'; import * as errors from 'vs/base/common/errors'; import { IMouseEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import * as nls from 'vs/nls'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; export class LinkDetector { private static readonly MAX_LENGTH = 500; @@ -23,7 +23,7 @@ export class LinkDetector { ]; constructor( - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { // noop } diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts index bae775a1358..c4258a03d83 100644 --- a/src/vs/workbench/parts/debug/common/debug.ts +++ b/src/vs/workbench/parts/debug/common/debug.ts @@ -19,7 +19,7 @@ import { Source } from 'vs/workbench/parts/debug/common/debugSource'; import { Range, IRange } from 'vs/editor/common/core/range'; import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IDisposable } from 'vs/base/common/lifecycle'; export const VIEWLET_ID = 'workbench.view.debug'; @@ -222,7 +222,7 @@ export interface IStackFrame extends ITreeElement { getSpecificSourceName(): string; restart(): TPromise; toString(): string; - openInEditor(editorService: INextEditorService, preserveFocus?: boolean, sideBySide?: boolean): TPromise; + openInEditor(editorService: IEditorService, preserveFocus?: boolean, sideBySide?: boolean): TPromise; } export interface IEnablement extends ITreeElement { diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 72952ae1c25..42ba19d73a7 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -26,7 +26,7 @@ import { Source } from 'vs/workbench/parts/debug/common/debugSource'; import { mixin } from 'vs/base/common/objects'; import { commonSuffixLength } from 'vs/base/common/strings'; import { sep } from 'vs/base/common/paths'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; const MAX_REPL_LENGTH = 10000; @@ -400,7 +400,7 @@ export class StackFrame implements IStackFrame { return `${this.name} (${this.source.inMemory ? this.source.name : this.source.uri.fsPath}:${this.range.startLineNumber})`; } - public openInEditor(editorService: INextEditorService, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): TPromise { + public openInEditor(editorService: IEditorService, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): TPromise { return !this.source.available ? TPromise.as(null) : this.source.openInEditor(editorService, this.range, preserveFocus, sideBySide, pinned); } diff --git a/src/vs/workbench/parts/debug/common/debugSource.ts b/src/vs/workbench/parts/debug/common/debugSource.ts index c9c51b9f29b..71510c78264 100644 --- a/src/vs/workbench/parts/debug/common/debugSource.ts +++ b/src/vs/workbench/parts/debug/common/debugSource.ts @@ -10,7 +10,7 @@ import * as paths from 'vs/base/common/paths'; import * as resources from 'vs/base/common/resources'; import { DEBUG_SCHEME } from 'vs/workbench/parts/debug/common/debug'; import { IRange } from 'vs/editor/common/core/range'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { Schemas } from 'vs/base/common/network'; const UNKNOWN_SOURCE_LABEL = nls.localize('unknownSource', "Unknown Source"); @@ -72,7 +72,7 @@ export class Source { return this.uri.scheme === DEBUG_SCHEME; } - public openInEditor(editorService: INextEditorService, selection: IRange, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): TPromise { + public openInEditor(editorService: IEditorService, selection: IRange, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): TPromise { return !this.available ? TPromise.as(null) : editorService.openEditor({ resource: this.uri, description: this.origin, diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts index 220b2009dbf..8930ae3a9e9 100644 --- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts @@ -22,7 +22,7 @@ import { RestartAction, StopAction, ContinueAction, StepOverAction, StepIntoActi import { CopyStackTraceAction } from 'vs/workbench/parts/debug/electron-browser/electronDebugActions'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -47,7 +47,7 @@ export class CallStackView extends TreeViewsViewletPanel { @IDebugService private debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService, @IInstantiationService private instantiationService: IInstantiationService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IConfigurationService configurationService: IConfigurationService, @IContextKeyService contextKeyService: IContextKeyService ) { diff --git a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts index ff0b53c3839..2d6e35a22d1 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts @@ -50,7 +50,7 @@ import { DebugQuickOpenHandler } from 'vs/workbench/parts/debug/browser/debugQui import { DebugStatus } from 'vs/workbench/parts/debug/browser/debugStatus'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; class OpenDebugViewletAction extends ToggleViewletAction { public static readonly ID = VIEWLET_ID; @@ -60,7 +60,7 @@ class OpenDebugViewletAction extends ToggleViewletAction { id: string, label: string, @IViewletService viewletService: IViewletService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, VIEWLET_ID, viewletService, editorGroupService); } diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts index 58cf14a16b9..5fcd84e61a6 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts @@ -24,7 +24,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { ICommandService } from 'vs/platform/commands/common/commands'; import { IDebugConfigurationProvider, ICompound, IDebugConfiguration, IConfig, IGlobalConfig, IConfigurationManager, ILaunch, IAdapterExecutable, IDebugAdapterProvider, IDebugAdapter, ITerminalSettings, ITerminalLauncher } from 'vs/workbench/parts/debug/common/debug'; import { Debugger } from 'vs/workbench/parts/debug/node/debugger'; -import { INextEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration'; @@ -55,7 +55,7 @@ export class ConfigurationManager implements IConfigurationManager { constructor( @IWorkspaceContextService private contextService: IWorkspaceContextService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IConfigurationService private configurationService: IConfigurationService, @IQuickOpenService private quickOpenService: IQuickOpenService, @IInstantiationService private instantiationService: IInstantiationService, @@ -382,7 +382,7 @@ class Launch implements ILaunch { private configurationManager: ConfigurationManager, public workspace: IWorkspaceFolder, @IFileService private fileService: IFileService, - @INextEditorService protected editorService: INextEditorService, + @IEditorService protected editorService: IEditorService, @IConfigurationService protected configurationService: IConfigurationService, @IWorkspaceContextService protected contextService: IWorkspaceContextService, ) { @@ -504,7 +504,7 @@ class WorkspaceLaunch extends Launch implements ILaunch { constructor( configurationManager: ConfigurationManager, @IFileService fileService: IFileService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IConfigurationService configurationService: IConfigurationService, @IWorkspaceContextService contextService: IWorkspaceContextService, ) { @@ -533,7 +533,7 @@ class UserLaunch extends Launch implements ILaunch { constructor( configurationManager: ConfigurationManager, @IFileService fileService: IFileService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IConfigurationService configurationService: IConfigurationService, @IPreferencesService private preferencesService: IPreferencesService, @IWorkspaceContextService contextService: IWorkspaceContextService diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 64f50dff9af..d09112df0a9 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -42,7 +42,7 @@ import { IPartService, Parts } from 'vs/workbench/services/part/common/partServi import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL, EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost'; import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-browser/broadcastService'; import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/node/console'; @@ -88,7 +88,7 @@ export class DebugService implements debug.IDebugService { constructor( @IStorageService private storageService: IStorageService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @ITextFileService private textFileService: ITextFileService, @IViewletService private viewletService: IViewletService, @IPanelService private panelService: IPanelService, diff --git a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts index c4dcc9a5aaa..a44da207de2 100644 --- a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts +++ b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts @@ -21,7 +21,7 @@ import { renderVariable, renderExpressionValue, IVariableTemplateData, BaseDebug import { ClearReplAction, ReplCollapseAllAction } from 'vs/workbench/parts/debug/browser/debugActions'; import { CopyAction, CopyAllAction } from 'vs/workbench/parts/debug/electron-browser/electronDebugActions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { LinkDetector } from 'vs/workbench/parts/debug/browser/linkDetector'; const $ = dom.$; @@ -93,7 +93,7 @@ export class ReplExpressionsRenderer implements IRenderer { private linkDetector: LinkDetector; constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IInstantiationService private instantiationService: IInstantiationService ) { this.linkDetector = this.instantiationService.createInstance(LinkDetector); diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts index 3a49f222ebd..3bd97be51bb 100644 --- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts @@ -27,7 +27,7 @@ import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/file import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { Schemas } from 'vs/base/common/network'; import { distinct } from 'vs/base/common/arrays'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; if (env.isWindows) { registerSingleton(ITerminalService, WinTerminalService); @@ -81,7 +81,7 @@ CommandsRegistry.registerCommand({ id: OPEN_IN_TERMINAL_COMMAND_ID, handler: (accessor, resource: uri) => { const configurationService = accessor.get(IConfigurationService); - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const fileService = accessor.get(IFileService); const integratedTerminalService = accessor.get(IIntegratedTerminalService); const terminalService = accessor.get(ITerminalService); diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts index 63d90cf302b..6688b1125d7 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts @@ -46,8 +46,8 @@ import { IOpenerService } from 'vs/platform/opener/common/opener'; import { mnemonicButtonLabel } from 'vs/base/common/labels'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; const promptDownloadManually = (extension: IExtension, message: string, instantiationService: IInstantiationService, notificationService: INotificationService, openerService: IOpenerService) => { notificationService.prompt(Severity.Error, message, [{ @@ -958,7 +958,7 @@ export class OpenExtensionsViewletAction extends ToggleViewletAction { id: string, label: string, @IViewletService viewletService: IViewletService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, VIEWLET_ID, viewletService, editorGroupService); } @@ -1487,7 +1487,7 @@ export abstract class AbstractConfigureRecommendedExtensionsAction extends Actio label: string, @IWorkspaceContextService protected contextService: IWorkspaceContextService, @IFileService private fileService: IFileService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IJSONEditingService private jsonEditingService: IJSONEditingService, @ITextModelService private textModelResolverService: ITextModelService ) { @@ -1578,7 +1578,7 @@ export class ConfigureWorkspaceRecommendedExtensionsAction extends AbstractConfi label: string, @IFileService fileService: IFileService, @IWorkspaceContextService contextService: IWorkspaceContextService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IJSONEditingService jsonEditingService: IJSONEditingService, @ITextModelService textModelResolverService: ITextModelService ) { @@ -1619,7 +1619,7 @@ export class ConfigureWorkspaceFolderRecommendedExtensionsAction extends Abstrac label: string, @IFileService fileService: IFileService, @IWorkspaceContextService contextService: IWorkspaceContextService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IJSONEditingService jsonEditingService: IJSONEditingService, @ITextModelService textModelResolverService: ITextModelService, @ICommandService private commandService: ICommandService diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts index af7d5713589..b996540352b 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts @@ -43,7 +43,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel'; import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { Color } from 'vs/base/common/color'; import { WorkbenchTree } from 'vs/platform/list/browser/listService'; @@ -988,7 +988,7 @@ class ShowExtensionEditorFindCommand extends Command { } private getExtensionEditor(accessor: ServicesAccessor): ExtensionEditor { - const activeControl = accessor.get(INextEditorService).activeControl as ExtensionEditor; + const activeControl = accessor.get(IEditorService).activeControl as ExtensionEditor; if (activeControl instanceof ExtensionEditor) { return activeControl; } @@ -1021,7 +1021,7 @@ class ShowExtensionEditorFindTermCommand extends Command { } private getExtensionEditor(accessor: ServicesAccessor): ExtensionEditor { - const activeControl = accessor.get(INextEditorService).activeControl as ExtensionEditor; + const activeControl = accessor.get(IEditorService).activeControl as ExtensionEditor; if (activeControl instanceof ExtensionEditor) { return activeControl; } diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts index 9ad02bdae7b..7ecf2cae755 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts @@ -15,7 +15,7 @@ import { append, $, addDisposableListener } from 'vs/base/browser/dom'; import { StatusbarAlignment, IStatusbarRegistry, StatusbarItemDescriptor, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { Registry } from 'vs/platform/registry/common/platform'; import { IExtensionHostProfileService, ProfileSessionState, RuntimeExtensionsInput } from 'vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IWindowsService } from 'vs/platform/windows/common/windows'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { randomPort } from 'vs/base/node/ports'; @@ -40,7 +40,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio constructor( @IExtensionService private readonly _extensionService: IExtensionService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @IInstantiationService private readonly _instantiationService: IInstantiationService, @IWindowsService private readonly _windowsService: IWindowsService, @IDialogService private readonly _dialogService: IDialogService diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts index 20a4ce49792..e94f05884f9 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts @@ -35,7 +35,7 @@ import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensions import { ExtensionsListView, InstalledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInExtensionsView, BuiltInThemesExtensionsView, BuiltInBasicsExtensionsView } from './extensionsViews'; import { OpenGlobalSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions'; import { IProgressService } from 'vs/platform/progress/common/progress'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import Severity from 'vs/base/common/severity'; import { IActivityService, ProgressBadge, NumberBadge } from 'vs/workbench/services/activity/common/activity'; import { IThemeService } from 'vs/platform/theme/common/themeService'; @@ -218,7 +218,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens @ITelemetryService telemetryService: ITelemetryService, @IProgressService private progressService: IProgressService, @IInstantiationService instantiationService: IInstantiationService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IExtensionManagementService private extensionManagementService: IExtensionManagementService, @INotificationService private notificationService: INotificationService, @IViewletService private viewletService: IViewletService, diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts index ec868440de2..572c52e3ac1 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts @@ -26,7 +26,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { attachBadgeStyler } from 'vs/platform/theme/common/styler'; import { IViewletViewOptions, IViewOptions, ViewsViewletPanel } from 'vs/workbench/browser/parts/views/viewsViewlet'; import { OpenGlobalSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IModeService } from 'vs/editor/common/services/modeService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge'; @@ -53,7 +53,7 @@ export class ExtensionsListView extends ViewsViewletPanel { @IThemeService private themeService: IThemeService, @IExtensionService private extensionService: IExtensionService, @IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IExtensionTipsService private tipsService: IExtensionTipsService, @IModeService private modeService: IModeService, @ITelemetryService private telemetryService: ITelemetryService, diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts index dfb26e54ecd..9ce9541ff34 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts @@ -19,7 +19,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/extensions/common/extensions'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IExtensionService, IExtensionDescription, IExtensionsStatus, IExtensionHostProfile } from 'vs/workbench/services/extensions/common/extensions'; import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list'; import { WorkbenchList } from 'vs/platform/list/browser/listService'; @@ -465,7 +465,7 @@ export class ShowRuntimeExtensionsAction extends Action { constructor( id: string, label: string, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @IInstantiationService private readonly _instantiationService: IInstantiationService ) { super(id, label); diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 69d71ce36b4..1d67150e378 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -29,7 +29,7 @@ import { IWindowService } from 'vs/platform/windows/common/windows'; import Severity from 'vs/base/common/severity'; import URI from 'vs/base/common/uri'; import { IExtension, IExtensionDependencies, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IURLService, IURLHandler } from 'vs/platform/url/common/url'; import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput'; import product from 'vs/platform/node/product'; @@ -343,7 +343,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService, constructor( @IInstantiationService private instantiationService: IInstantiationService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IExtensionManagementService private extensionService: IExtensionManagementService, @IExtensionGalleryService private galleryService: IExtensionGalleryService, @IConfigurationService private configurationService: IConfigurationService, diff --git a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts index 418218de195..8014071ddc1 100644 --- a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts +++ b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts @@ -15,7 +15,7 @@ import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEdi import URI from 'vs/base/common/uri'; import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files'; import { IFileService } from 'vs/platform/files/common/files'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; /** * An implementation of editor for binary files like images. @@ -29,7 +29,7 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor { @IThemeService themeService: IThemeService, @IFileService fileService: IFileService, @IWindowsService private windowsService: IWindowsService, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super( BinaryFileEditor.ID, diff --git a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts index 49165255da7..9299d35fc2a 100644 --- a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts +++ b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts @@ -27,8 +27,8 @@ import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor'; import { IWindowService } from 'vs/platform/windows/common/windows'; import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; export class FileEditorTracker implements IWorkbenchContribution { @@ -39,10 +39,10 @@ export class FileEditorTracker implements IWorkbenchContribution { private activeOutOfWorkspaceWatchers: ResourceMap; constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @ITextFileService private textFileService: ITextFileService, @ILifecycleService private lifecycleService: ILifecycleService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IFileService private fileService: IFileService, @IEnvironmentService private environmentService: IEnvironmentService, @IConfigurationService private configurationService: IConfigurationService, diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts index a41976cbd22..81484dbf269 100644 --- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts +++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts @@ -29,8 +29,8 @@ import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/prefer import { IThemeService } from 'vs/platform/theme/common/themeService'; import { ScrollType } from 'vs/editor/common/editorCommon'; import { IWindowsService } from 'vs/platform/windows/common/windows'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { CancellationToken } from 'vs/base/common/cancellation'; /** @@ -48,9 +48,9 @@ export class TextFileEditor extends BaseTextEditor { @IWorkspaceContextService private contextService: IWorkspaceContextService, @IStorageService storageService: IStorageService, @ITextResourceConfigurationService configurationService: ITextResourceConfigurationService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IThemeService themeService: IThemeService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, + @IEditorGroupsService editorGroupService: IEditorGroupsService, @ITextFileService textFileService: ITextFileService, @IWindowsService private windowsService: IWindowsService, @IPreferencesService private preferencesService: IPreferencesService diff --git a/src/vs/workbench/parts/files/browser/files.ts b/src/vs/workbench/parts/files/browser/files.ts index e9fc253abf8..5b1d88c8454 100644 --- a/src/vs/workbench/parts/files/browser/files.ts +++ b/src/vs/workbench/parts/files/browser/files.ts @@ -11,11 +11,11 @@ import { ExplorerItem, OpenEditor } from 'vs/workbench/parts/files/common/explor import { toResource } from 'vs/workbench/common/editor'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { List } from 'vs/base/browser/ui/list/listWidget'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; // Commands can get exeucted from a command pallete, from a context menu or from some list using a keybinding // To cover all these cases we need to properly compute the resource on which the command is being executed -export function getResourceForCommand(resource: URI | object, listService: IListService, editorService: INextEditorService): URI { +export function getResourceForCommand(resource: URI | object, listService: IListService, editorService: IEditorService): URI { if (URI.isUri(resource)) { return resource; } @@ -42,7 +42,7 @@ export function getResourceForCommand(resource: URI | object, listService: IList return toResource(editorService.activeEditor, { supportSideBySide: true }); } -export function getMultiSelectedResources(resource: URI | object, listService: IListService, editorService: INextEditorService): URI[] { +export function getMultiSelectedResources(resource: URI | object, listService: IListService, editorService: IEditorService): URI[] { const list = listService.lastFocusedList; if (list && list.isDOMFocused()) { // Explorer diff --git a/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts b/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts index de66d813da4..059557b25ed 100644 --- a/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts +++ b/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts @@ -18,8 +18,8 @@ import URI from 'vs/base/common/uri'; import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import * as arrays from 'vs/base/common/arrays'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class DirtyFilesTracker implements IWorkbenchContribution { private isDocumentedEdited: boolean; @@ -30,8 +30,8 @@ export class DirtyFilesTracker implements IWorkbenchContribution { constructor( @ITextFileService private textFileService: ITextFileService, @ILifecycleService private lifecycleService: ILifecycleService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, - @INextEditorService private editorService: INextEditorService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, + @IEditorService private editorService: IEditorService, @IActivityService private activityService: IActivityService, @IWindowService private windowService: IWindowService, @IUntitledEditorService private untitledEditorService: IUntitledEditorService diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts index 59a5d1a0379..1a783d17478 100644 --- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts +++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts @@ -32,8 +32,8 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { DelegatingWorkbenchEditorService } from 'vs/workbench/services/editor/browser/editorService'; -import { IEditorGroup, INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorOptions } from 'vs/platform/editor/common/editor'; import { IEditorInput } from 'vs/workbench/common/editor'; @@ -155,8 +155,8 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer @ITelemetryService telemetryService: ITelemetryService, @IWorkspaceContextService protected contextService: IWorkspaceContextService, @IStorageService protected storageService: IStorageService, - @INextEditorService private editorService: INextEditorService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorService private editorService: IEditorService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IConfigurationService private configurationService: IConfigurationService, @IInstantiationService protected instantiationService: IInstantiationService, @IContextKeyService contextKeyService: IContextKeyService, @@ -218,7 +218,7 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer return this.editorService.openEditor(editor, options, group).then(onSuccessOrError, onSuccessOrError); }); - const explorerInstantiator = this.instantiationService.createChild(new ServiceCollection([INextEditorService, delegatingEditorService])); + const explorerInstantiator = this.instantiationService.createChild(new ServiceCollection([IEditorService, delegatingEditorService])); return explorerInstantiator.createInstance(ExplorerView, { ...options, viewletState: this.viewletState }); } return super.createView(viewDescriptor, options); diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index 8e7c2e2fd91..6cbaf55fd1d 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -49,7 +49,7 @@ import { RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common import { Schemas } from 'vs/base/common/network'; import { IDialogService, IConfirmationResult, IConfirmation, getConfirmMessage } from 'vs/platform/dialogs/common/dialogs'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export interface IEditableData { action: IAction; @@ -480,7 +480,7 @@ export class GlobalNewUntitledFileAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label); } @@ -511,7 +511,7 @@ class CreateFileAction extends BaseCreateAction { constructor( element: ExplorerItem, @IFileService fileService: IFileService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @INotificationService notificationService: INotificationService, @ITextFileService textFileService: ITextFileService ) { @@ -789,7 +789,7 @@ export class AddFilesAction extends BaseFileAction { element: ExplorerItem, clazz: string, @IFileService fileService: IFileService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IDialogService private dialogService: IDialogService, @INotificationService notificationService: INotificationService, @ITextFileService textFileService: ITextFileService @@ -944,7 +944,7 @@ class PasteFileAction extends BaseFileAction { @IFileService fileService: IFileService, @INotificationService notificationService: INotificationService, @ITextFileService textFileService: ITextFileService, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(PasteFileAction.ID, PASTE_FILE_LABEL, fileService, notificationService, textFileService); @@ -1007,7 +1007,7 @@ export class DuplicateFileAction extends BaseFileAction { fileToDuplicate: ExplorerItem, target: ExplorerItem, @IFileService fileService: IFileService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @INotificationService notificationService: INotificationService, @ITextFileService textFileService: ITextFileService ) { @@ -1104,7 +1104,7 @@ export class GlobalCompareResourcesAction extends Action { id: string, label: string, @IQuickOpenService private quickOpenService: IQuickOpenService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @INotificationService private notificationService: INotificationService, ) { super(id, label); @@ -1305,7 +1305,7 @@ export class ShowActiveFileInExplorer extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @INotificationService private notificationService: INotificationService, @ICommandService private commandService: ICommandService ) { @@ -1384,7 +1384,7 @@ export class ShowOpenedFileInNewWindow extends Action { id: string, label: string, @IWindowsService private windowsService: IWindowsService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @INotificationService private notificationService: INotificationService, ) { super(id, label); @@ -1495,7 +1495,7 @@ export class CompareWithClipboardAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IInstantiationService private instantiationService: IInstantiationService, @ITextModelService private textModelService: ITextModelService, @IFileService private fileService: IFileService diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 6af478c90ba..057ca1600e4 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -40,8 +40,8 @@ import { getMultiSelectedEditorContexts } from 'vs/workbench/browser/parts/edito import { Schemas } from 'vs/base/common/network'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; -import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; // Commands @@ -81,8 +81,8 @@ export const openWindowCommand = (accessor: ServicesAccessor, paths: string[], f windowsService.openWindow(paths, { forceNewWindow }); }; -function save(resource: URI, isSaveAs: boolean, editorService: INextEditorService, fileService: IFileService, untitledEditorService: IUntitledEditorService, - textFileService: ITextFileService, editorGroupService: INextEditorGroupsService): TPromise { +function save(resource: URI, isSaveAs: boolean, editorService: IEditorService, fileService: IFileService, untitledEditorService: IUntitledEditorService, + textFileService: ITextFileService, editorGroupService: IEditorGroupsService): TPromise { if (resource && (fileService.canHandleResource(resource) || resource.scheme === Schemas.untitled)) { @@ -158,8 +158,8 @@ function save(resource: URI, isSaveAs: boolean, editorService: INextEditorServic return TPromise.as(false); } -function saveAll(saveAllArguments: any, editorService: INextEditorService, untitledEditorService: IUntitledEditorService, - textFileService: ITextFileService, editorGroupService: INextEditorGroupsService): TPromise { +function saveAll(saveAllArguments: any, editorService: IEditorService, untitledEditorService: IUntitledEditorService, + textFileService: ITextFileService, editorGroupService: IEditorGroupsService): TPromise { // Store some properties per untitled file to restore later after save is completed const groupIdToUntitledResourceInput = new Map(); @@ -206,7 +206,7 @@ function saveAll(saveAllArguments: any, editorService: INextEditorService, untit CommandsRegistry.registerCommand({ id: REVERT_FILE_COMMAND_ID, handler: (accessor, resource: URI | object) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const textFileService = accessor.get(ITextFileService); const notificationService = accessor.get(INotificationService); const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService) @@ -230,7 +230,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ primary: KeyMod.WinCtrl | KeyCode.Enter }, id: OPEN_TO_SIDE_COMMAND_ID, handler: (accessor, resource: URI | object) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const listService = accessor.get(IListService); const fileService = accessor.get(IFileService); const tree = listService.lastFocusedList; @@ -271,7 +271,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ textModelService.registerTextModelContentProvider(COMPARE_WITH_SAVED_SCHEMA, provider); } - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const uri = getResourceForCommand(resource, accessor.get(IListService), editorService); if (uri && uri.scheme === Schemas.file /* only files on disk supported for now */) { @@ -298,7 +298,7 @@ CommandsRegistry.registerCommand({ tree.domFocus(); } - globalResourceToCompare = getResourceForCommand(resource, listService, accessor.get(INextEditorService)); + globalResourceToCompare = getResourceForCommand(resource, listService, accessor.get(IEditorService)); if (!resourceSelectedForCompareContext) { resourceSelectedForCompareContext = ResourceSelectedForCompareContext.bindTo(accessor.get(IContextKeyService)); } @@ -309,7 +309,7 @@ CommandsRegistry.registerCommand({ CommandsRegistry.registerCommand({ id: COMPARE_SELECTED_COMMAND_ID, handler: (accessor, resource: URI | object) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService); if (resources.length === 2) { @@ -326,7 +326,7 @@ CommandsRegistry.registerCommand({ CommandsRegistry.registerCommand({ id: COMPARE_RESOURCE_COMMAND_ID, handler: (accessor, resource: URI | object) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const listService = accessor.get(IListService); const tree = listService.lastFocusedList; @@ -360,7 +360,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_R }, handler: (accessor: ServicesAccessor, resource: URI | object) => { - const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(INextEditorService)); + const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService)); revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService)); } }); @@ -370,7 +370,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_R), id: 'workbench.action.files.revealActiveFileInWindows', handler: (accessor: ServicesAccessor) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const activeInput = editorService.activeEditor; const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : []; revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService)); @@ -395,7 +395,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ }, id: COPY_PATH_COMMAND_ID, handler: (accessor, resource: URI | object) => { - const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(INextEditorService)); + const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService)); resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService)); } }); @@ -406,7 +406,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_P), id: 'workbench.action.files.copyPathOfActiveFile', handler: (accessor) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const activeInput = editorService.activeEditor; const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : []; resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService)); @@ -418,7 +418,7 @@ CommandsRegistry.registerCommand({ handler: (accessor, resource: URI | object) => { const viewletService = accessor.get(IViewletService); const contextService = accessor.get(IWorkspaceContextService); - const uri = getResourceForCommand(resource, accessor.get(IListService), accessor.get(INextEditorService)); + const uri = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IEditorService)); viewletService.openViewlet(VIEWLET_ID, false).then((viewlet: ExplorerViewlet) => { const isInsideWorkspace = contextService.isInsideWorkspace(uri); @@ -444,7 +444,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: undefined, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_S, handler: (accessor, resourceOrObject: URI | object | { from: string }) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); let resource: URI = undefined; if (resourceOrObject && 'from' in resourceOrObject && resourceOrObject.from === 'menu') { resource = toResource(editorService.activeEditor); @@ -452,7 +452,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ resource = getResourceForCommand(resourceOrObject, accessor.get(IListService), editorService); } - return save(resource, true, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(INextEditorGroupsService)); + return save(resource, true, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupsService)); } }); @@ -462,29 +462,29 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ primary: KeyMod.CtrlCmd | KeyCode.KEY_S, id: SAVE_FILE_COMMAND_ID, handler: (accessor, resource: URI | object) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService); if (resources.length === 1) { // If only one resource is selected explictly call save since the behavior is a bit different than save all #41841 - return save(resources[0], false, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(INextEditorGroupsService)); + return save(resources[0], false, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupsService)); } - return saveAll(resources, editorService, accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(INextEditorGroupsService)); + return saveAll(resources, editorService, accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupsService)); } }); CommandsRegistry.registerCommand({ id: SAVE_ALL_COMMAND_ID, handler: (accessor) => { - return saveAll(true, accessor.get(INextEditorService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(INextEditorGroupsService)); + return saveAll(true, accessor.get(IEditorService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupsService)); } }); CommandsRegistry.registerCommand({ id: SAVE_ALL_IN_GROUP_COMMAND_ID, handler: (accessor, resource: URI | object, editorContext: IEditorCommandsContext) => { - const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService), accessor.get(INextEditorGroupsService)); - const editorGroupService = accessor.get(INextEditorGroupsService); + const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService), accessor.get(IEditorGroupsService)); + const editorGroupService = accessor.get(IEditorGroupsService); let saveAllArg: any; if (!contexts.length) { saveAllArg = true; @@ -502,14 +502,14 @@ CommandsRegistry.registerCommand({ }); } - return saveAll(saveAllArg, accessor.get(INextEditorService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(INextEditorGroupsService)); + return saveAll(saveAllArg, accessor.get(IEditorService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupsService)); } }); CommandsRegistry.registerCommand({ id: SAVE_FILES_COMMAND_ID, handler: (accessor) => { - return saveAll(false, accessor.get(INextEditorService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(INextEditorGroupsService)); + return saveAll(false, accessor.get(IEditorService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupsService)); } }); @@ -519,7 +519,7 @@ CommandsRegistry.registerCommand({ const workspaceEditingService = accessor.get(IWorkspaceEditingService); const contextService = accessor.get(IWorkspaceContextService); const workspace = contextService.getWorkspace(); - const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(INextEditorService)).filter(r => + const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService)).filter(r => // Need to verify resources are workspaces since multi selection can trigger this command on some non workspace resources workspace.folders.some(f => f.uri.toString() === r.toString()) ); diff --git a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts index 9cd99ddd1a6..0a121924703 100644 --- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts @@ -32,8 +32,8 @@ import { ExplorerViewlet, ExplorerViewletViewsContribution } from 'vs/workbench/ import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { DataUriEditorInput } from 'vs/workbench/common/editor/dataUriEditorInput'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; // Viewlet Action export class OpenExplorerViewletAction extends ToggleViewletAction { @@ -44,7 +44,7 @@ export class OpenExplorerViewletAction extends ToggleViewletAction { id: string, label: string, @IViewletService viewletService: IViewletService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(id, label, VIEWLET_ID, viewletService, editorGroupService); } @@ -137,7 +137,7 @@ class FileEditorInputFactory implements IEditorInputFactory { const resource = !!fileInput.resourceJSON ? URI.revive(fileInput.resourceJSON) : URI.parse(fileInput.resource); const encoding = fileInput.encoding; - return accessor.get(INextEditorService).createInput({ resource, encoding }) as FileEditorInput; + return accessor.get(IEditorService).createInput({ resource, encoding }) as FileEditorInput; }); } } diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts index 01d16d5bed0..ca120f667fc 100644 --- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts +++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts @@ -33,7 +33,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; import { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { once } from 'vs/base/common/event'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext'; export const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution'; @@ -53,7 +53,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi @INotificationService private notificationService: INotificationService, @ITextFileService private textFileService: ITextFileService, @IContextKeyService contextKeyService: IContextKeyService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @ITextModelService textModelService: ITextModelService, @IInstantiationService private instantiationService: IInstantiationService, @IStorageService private storageService: IStorageService @@ -230,7 +230,7 @@ class ResolveSaveConflictAction extends Action { constructor( private model: ITextFileEditorModel, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @INotificationService private notificationService: INotificationService, @IInstantiationService private instantiationService: IInstantiationService, @IStorageService private storageService: IStorageService, @@ -311,7 +311,7 @@ class OverwriteReadonlyAction extends Action { } export const acceptLocalChangesCommand = (accessor: ServicesAccessor, resource: URI) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const resolverService = accessor.get(ITextModelService); const modelService = accessor.get(IModelService); @@ -348,7 +348,7 @@ export const acceptLocalChangesCommand = (accessor: ServicesAccessor, resource: }; export const revertLocalChangesCommand = (accessor: ServicesAccessor, resource: URI) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const resolverService = accessor.get(ITextModelService); const control = editorService.activeControl; diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts index 04f7e2af2eb..fdf42f381cd 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts @@ -41,7 +41,7 @@ import { WorkbenchTree } from 'vs/platform/list/browser/listService'; import { DelayedDragHandler } from 'vs/base/browser/dnd'; import { Schemas } from 'vs/base/common/network'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export interface IExplorerViewOptions extends IViewletViewOptions { viewletState: FileViewletState; @@ -85,7 +85,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView @IInstantiationService private instantiationService: IInstantiationService, @IWorkspaceContextService private contextService: IWorkspaceContextService, @IProgressService private progressService: IProgressService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IFileService private fileService: IFileService, @IPartService private partService: IPartService, @IKeybindingService keybindingService: IKeybindingService, diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts index b4f3eb0a061..da4ee1f1ca3 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -56,7 +56,7 @@ import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/work import { rtrim } from 'vs/base/common/strings'; import { IDialogService, IConfirmationResult, IConfirmation, getConfirmMessage } from 'vs/platform/dialogs/common/dialogs'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; export class FileDataSource implements IDataSource { constructor( @@ -395,7 +395,7 @@ export class FileController extends WorkbenchTreeController implements IDisposab private previousSelectionRangeStop: ExplorerItem; constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IContextMenuService private contextMenuService: IContextMenuService, @ITelemetryService private telemetryService: ITelemetryService, @IMenuService private menuService: IMenuService, diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index edd519f2fb3..26e36224475 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -10,7 +10,7 @@ import { IAction } from 'vs/base/common/actions'; import * as dom from 'vs/base/browser/dom'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorGroupsService, IEditorGroup, GroupChangeKind } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, IEditorGroup, GroupChangeKind } from 'vs/workbench/services/group/common/editorGroupsService'; import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IEditorInput } from 'vs/workbench/common/editor'; @@ -32,7 +32,7 @@ import { EditorLabel } from 'vs/workbench/browser/labels'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { TPromise } from 'vs/base/common/winjs.base'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { fillInActions } from 'vs/platform/actions/browser/menuItemActionItem'; import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions'; @@ -63,8 +63,8 @@ export class OpenEditorsView extends ViewsViewletPanel { @IInstantiationService private instantiationService: IInstantiationService, @IContextMenuService contextMenuService: IContextMenuService, @ITextFileService private textFileService: ITextFileService, - @INextEditorService private editorService: INextEditorService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorService private editorService: IEditorService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IConfigurationService configurationService: IConfigurationService, @IKeybindingService keybindingService: IKeybindingService, @IUntitledEditorService private untitledEditorService: IUntitledEditorService, @@ -493,7 +493,7 @@ class EditorGroupRenderer implements IRenderer c instanceof HtmlPreviewPart && c.model) .map(e => e as HtmlPreviewPart) .filter(e => e.model.uri.scheme === uri.scheme && e.model.uri.toString() === uri.toString()); @@ -48,7 +48,7 @@ CommandsRegistry.registerCommand('_workbench.previewHtml', function ( let input: HtmlInput; - const editorGroupService = accessor.get(INextEditorGroupsService); + const editorGroupService = accessor.get(IEditorGroupsService); const groups = editorGroupService.groups; // Find already opened HTML input if any @@ -80,7 +80,7 @@ CommandsRegistry.registerCommand('_workbench.previewHtml', function ( input.setName(label); // make sure to use passed in label } - return accessor.get(INextEditorService) + return accessor.get(IEditorService) .openEditor(input, { pinned: true }, findEditorGroup(editorGroupService, position)) .then(editor => true); }); diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts index 8655fe94b1e..cd17142a8d0 100644 --- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts +++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts @@ -24,7 +24,7 @@ import { Dimension } from 'vs/base/browser/dom'; import { BaseWebviewEditor } from 'vs/workbench/parts/webview/electron-browser/baseWebviewEditor'; import { WebviewElement, WebviewOptions } from 'vs/workbench/parts/webview/electron-browser/webviewElement'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { CancellationToken } from 'vs/base/common/cancellation'; export interface HtmlPreviewEditorViewState { @@ -60,7 +60,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor { @IStorageService readonly _storageService: IStorageService, @ITextModelService private readonly _textModelResolverService: ITextModelService, @IInstantiationService private readonly _instantiationService: IInstantiationService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(HtmlPreviewPart.ID, telemetryService, themeService, contextKeyService); diff --git a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts index 81411549c75..4b5f9f657a9 100644 --- a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts +++ b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts @@ -12,7 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IEditor } from 'vs/workbench/common/editor'; import { join } from 'vs/base/common/paths'; import URI from 'vs/base/common/uri'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { getPathLabel } from 'vs/base/common/labels'; import { language } from 'vs/base/common/platform'; @@ -33,7 +33,7 @@ export class ConfigureLocaleAction extends Action { @IFileService private fileService: IFileService, @IWorkspaceContextService private contextService: IWorkspaceContextService, @IEnvironmentService private environmentService: IEnvironmentService, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label); } diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts index 705222eeed1..22654994ff3 100644 --- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts +++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts @@ -13,7 +13,7 @@ import * as dom from 'vs/base/browser/dom'; import { IAction, IActionItem } from 'vs/base/common/actions'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { Panel } from 'vs/workbench/browser/panel'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import Constants from 'vs/workbench/parts/markers/electron-browser/constants'; import { Marker, ResourceMarkers, RelatedInformation } from 'vs/workbench/parts/markers/electron-browser/markersModel'; import { Controller } from 'vs/workbench/parts/markers/electron-browser/markersTreeController'; @@ -56,7 +56,7 @@ export class MarkersPanel extends Panel { constructor( @IInstantiationService private instantiationService: IInstantiationService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IConfigurationService private configurationService: IConfigurationService, @ITelemetryService telemetryService: ITelemetryService, @IThemeService themeService: IThemeService, diff --git a/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts b/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts index b9f0d56a40f..c2e19eb1320 100644 --- a/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts +++ b/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts @@ -35,7 +35,7 @@ import { attachInputBoxStyler } from 'vs/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IViewOptions, ViewsViewletPanel } from 'vs/workbench/browser/parts/views/viewsViewlet'; import { CollapseAction } from 'vs/workbench/browser/viewlet'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { OutlineElement, OutlineModel, TreeElement } from './outlineModel'; import { OutlineController, OutlineDataSource, OutlineItemComparator, OutlineItemCompareType, OutlineItemFilter, OutlineRenderer, OutlineTreeState } from './outlineTree'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; @@ -73,7 +73,7 @@ class RequestOracle { constructor( private readonly _callback: (editor: ICodeEditor, change: IModelContentChangedEvent) => any, private readonly _featureRegistry: LanguageFeatureRegistry, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, ) { _editorService.onDidActiveEditorChange(this._update, this, this._disposables); _featureRegistry.onDidChange(this._update, this, this._disposables); @@ -211,7 +211,7 @@ export class OutlinePanel extends ViewsViewletPanel { @IInstantiationService private readonly _instantiationService: IInstantiationService, @IThemeService private readonly _themeService: IThemeService, @IStorageService private readonly _storageService: IStorageService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @IConfigurationService configurationService: IConfigurationService, @IKeybindingService keybindingService: IKeybindingService, @IContextMenuService contextMenuService: IContextMenuService, diff --git a/src/vs/workbench/parts/output/browser/logViewer.ts b/src/vs/workbench/parts/output/browser/logViewer.ts index e926cc43c18..69588a3fd24 100644 --- a/src/vs/workbench/parts/output/browser/logViewer.ts +++ b/src/vs/workbench/parts/output/browser/logViewer.ts @@ -18,8 +18,8 @@ import URI from 'vs/base/common/uri'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { IHashService } from 'vs/workbench/services/hash/common/hashService'; import { LOG_SCHEME } from 'vs/workbench/parts/output/common/output'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class LogViewerInput extends ResourceEditorInput { @@ -52,9 +52,9 @@ export class LogViewer extends AbstractTextResourceEditor { @IConfigurationService baseConfigurationService: IConfigurationService, @ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService, @IThemeService themeService: IThemeService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, + @IEditorGroupsService editorGroupService: IEditorGroupsService, @ITextFileService textFileService: ITextFileService, - @INextEditorService editorService: INextEditorService + @IEditorService editorService: IEditorService ) { super(LogViewer.LOG_VIEWER_EDITOR_ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, textFileService, editorService); } diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts index bc944ace4f7..a9151ee685c 100644 --- a/src/vs/workbench/parts/output/browser/outputPanel.ts +++ b/src/vs/workbench/parts/output/browser/outputPanel.ts @@ -22,9 +22,9 @@ import { SwitchOutputAction, SwitchOutputActionItem, ClearOutputAction, ToggleOu import { IThemeService } from 'vs/platform/theme/common/themeService'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class OutputPanel extends AbstractTextResourceEditor { private actions: IAction[]; @@ -39,9 +39,9 @@ export class OutputPanel extends AbstractTextResourceEditor { @IThemeService themeService: IThemeService, @IOutputService private outputService: IOutputService, @IContextKeyService private contextKeyService: IContextKeyService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, + @IEditorGroupsService editorGroupService: IEditorGroupsService, @ITextFileService textFileService: ITextFileService, - @INextEditorService editorService: INextEditorService + @IEditorService editorService: IEditorService ) { super(OUTPUT_PANEL_ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, textFileService, editorService); diff --git a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts index c4764fde7d6..63be0b0f1c2 100644 --- a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts +++ b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts @@ -26,7 +26,7 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import URI from 'vs/base/common/uri'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; // Register Service registerSingleton(IOutputService, OutputService); @@ -182,7 +182,7 @@ registerAction({ CommandsRegistry.registerCommand(COMMAND_OPEN_LOG_VIEWER, function (accessor: ServicesAccessor, file: URI) { if (file) { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); return editorService.openEditor(accessor.get(IInstantiationService).createInstance(LogViewerInput, file)); } return null; diff --git a/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts b/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts index e04914e7294..74eb0b8e04c 100644 --- a/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts +++ b/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts @@ -16,7 +16,7 @@ import { ITimerService } from 'vs/workbench/services/timer/common/timerService'; import { onUnexpectedError } from 'vs/base/common/errors'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import * as files from 'vs/workbench/parts/files/common/files'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { isFalsyOrEmpty } from 'vs/base/common/arrays'; import { ILogService } from 'vs/platform/log/common/log'; @@ -28,7 +28,7 @@ class StartupTimings implements IWorkbenchContribution { @ILogService private readonly _logService: ILogService, @ITimerService private readonly _timerService: ITimerService, @IWindowsService private readonly _windowsService: IWindowsService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @IViewletService private readonly _viewletService: IViewletService, @IPanelService private readonly _panelService: IPanelService, @ITelemetryService private readonly _telemetryService: ITelemetryService, diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts index 67da56a202c..ed28ed4d36a 100644 --- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts @@ -38,7 +38,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode, ResolvedKeybinding } from 'vs/base/common/keyCodes'; import { listHighlightForeground } from 'vs/platform/theme/common/colorRegistry'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions'; import { WorkbenchList } from 'vs/platform/list/browser/listService'; import { INotificationService } from 'vs/platform/notification/common/notification'; @@ -85,7 +85,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor @INotificationService private notificationService: INotificationService, @IClipboardService private clipboardService: IClipboardService, @IInstantiationService private instantiationService: IInstantiationService, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(KeybindingsEditor.ID, telemetryService, themeService); this.delayedFiltering = new Delayer(300); diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 86de784f787..ec21c0788ba 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -59,9 +59,9 @@ import { IProgressService } from 'vs/platform/progress/common/progress'; import { ILogService } from 'vs/platform/log/common/log'; import { PreferencesEditorInput, DefaultPreferencesEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput'; import { PREFERENCES_EDITOR_ID } from 'vs/workbench/parts/files/common/files'; -import { INextEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class PreferencesEditor extends BaseEditor { @@ -84,7 +84,7 @@ export class PreferencesEditor extends BaseEditor { constructor( @IPreferencesService private preferencesService: IPreferencesService, @ITelemetryService telemetryService: ITelemetryService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IContextKeyService private contextKeyService: IContextKeyService, @IInstantiationService private instantiationService: IInstantiationService, @IThemeService themeService: IThemeService, @@ -965,8 +965,8 @@ export class DefaultPreferencesEditor extends BaseTextEditor { @ITextResourceConfigurationService configurationService: ITextResourceConfigurationService, @IThemeService themeService: IThemeService, @ITextFileService textFileService: ITextFileService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, - @INextEditorService editorService: INextEditorService + @IEditorGroupsService editorGroupService: IEditorGroupsService, + @IEditorService editorService: IEditorService ) { super(DefaultPreferencesEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService); } @@ -1237,7 +1237,7 @@ registerEditorContribution(SettingsEditorContribution); abstract class SettingsCommand extends Command { protected getPreferencesEditor(accessor: ServicesAccessor): PreferencesEditor { - const activeControl = accessor.get(INextEditorService).activeControl; + const activeControl = accessor.get(IEditorService).activeControl; if (activeControl instanceof PreferencesEditor) { return activeControl; } diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index f6e8315fe3e..f34a233233f 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -37,7 +37,7 @@ import { getDomNodePagePosition } from 'vs/base/browser/dom'; import { IssueType, ISettingsSearchIssueReporterData, ISettingSearchResult } from 'vs/platform/issue/common/issue'; import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue'; -import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { ContextSubMenu } from 'vs/base/browser/contextmenu'; import { IWorkbenchSettingsConfiguration } from 'vs/workbench/parts/preferences/common/preferences'; @@ -592,7 +592,7 @@ export class FeedbackWidgetRenderer extends Disposable { constructor(private editor: ICodeEditor, @IInstantiationService private instantiationService: IInstantiationService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @ITelemetryService private telemetryService: ITelemetryService, @INotificationService private notificationService: INotificationService, @IEnvironmentService private environmentService: IEnvironmentService, diff --git a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts index 4ce020f12e5..518a6146d12 100644 --- a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts +++ b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts @@ -15,7 +15,7 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { IPreferencesService, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/services/preferences/common/preferences'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; -import { INextEditorService, IOpenEditorOverride } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, IOpenEditorOverride } from 'vs/workbench/services/editor/common/editorService'; import { IEditorOptions, ITextEditorOptions } from 'vs/platform/editor/common/editor'; import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { endsWith } from 'vs/base/common/strings'; @@ -35,7 +35,7 @@ export class PreferencesContribution implements IWorkbenchContribution { @ITextModelService private textModelResolverService: ITextModelService, @IPreferencesService private preferencesService: IPreferencesService, @IModeService private modeService: IModeService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IEnvironmentService private environmentService: IEnvironmentService, @IWorkspaceContextService private workspaceService: IWorkspaceContextService, @IConfigurationService private configurationService: IConfigurationService diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts index 6fadd51dbb9..0b249cf72b6 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts @@ -28,7 +28,7 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { PreferencesContribution } from 'vs/workbench/parts/preferences/common/preferencesContribution'; import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; @@ -204,7 +204,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS), primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_K), handler: (accessor, args: any) => { - const control = accessor.get(INextEditorService).activeControl as IKeybindingsEditor; + const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor; control.defineKeybinding(control.activeKeybindingEntry); } }); @@ -218,7 +218,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.Backspace) }, handler: (accessor, args: any) => { - const control = accessor.get(INextEditorService).activeControl as IKeybindingsEditor; + const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor; control.removeKeybinding(control.activeKeybindingEntry); } }); @@ -229,7 +229,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS), primary: null, handler: (accessor, args: any) => { - const control = accessor.get(INextEditorService).activeControl as IKeybindingsEditor; + const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor; control.resetKeybinding(control.activeKeybindingEntry); } }); @@ -239,7 +239,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS), primary: KeyMod.CtrlCmd | KeyCode.KEY_F, - handler: (accessor, args: any) => (accessor.get(INextEditorService).activeControl as IKeybindingsEditor).search('') + handler: (accessor, args: any) => (accessor.get(IEditorService).activeControl as IKeybindingsEditor).search('') }); KeybindingsRegistry.registerCommandAndKeybindingRule({ @@ -248,7 +248,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS), primary: null, handler: (accessor, args: any) => { - const control = accessor.get(INextEditorService).activeControl as IKeybindingsEditor; + const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor; control.showSimilarKeybindings(control.activeKeybindingEntry); } }); @@ -259,7 +259,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS), primary: KeyMod.CtrlCmd | KeyCode.KEY_C, handler: (accessor, args: any) => { - const control = accessor.get(INextEditorService).activeControl as IKeybindingsEditor; + const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor; control.copyKeybinding(control.activeKeybindingEntry); } }); @@ -270,7 +270,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS), primary: null, handler: (accessor, args: any) => { - const control = accessor.get(INextEditorService).activeControl as IKeybindingsEditor; + const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor; control.copyKeybindingCommand(control.activeKeybindingEntry); } }); @@ -281,7 +281,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS), primary: KeyCode.DownArrow, handler: (accessor, args: any) => { - const control = accessor.get(INextEditorService).activeControl as IKeybindingsEditor; + const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor; control.focusKeybindings(); } }); @@ -292,7 +292,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS), primary: KeyCode.Escape, handler: (accessor, args: any) => { - const control = accessor.get(INextEditorService).activeControl as IKeybindingsEditor; + const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor; control.clearSearchResults(); } }); diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 8f573aedf7d..0e1dd8af193 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -29,7 +29,7 @@ import { once } from 'vs/base/common/event'; import { LRUCache } from 'vs/base/common/map'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ResolvedKeybinding } from 'vs/base/common/keyCodes'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { isPromiseCanceledError } from 'vs/base/common/errors'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { INotificationService } from 'vs/platform/notification/common/notification'; @@ -379,7 +379,7 @@ export class CommandsHandler extends QuickOpenHandler { private commandsHistory: CommandsHistory; constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IInstantiationService private instantiationService: IInstantiationService, @IKeybindingService private keybindingService: IKeybindingService, @IMenuService private menuService: IMenuService, diff --git a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts index 0cb22b680a0..d858f369bd9 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts @@ -19,7 +19,7 @@ import { IRange } from 'vs/editor/common/core/range'; import { overviewRulerRangeHighlight } from 'vs/editor/common/view/editorColorRegistry'; import { themeColorFromId } from 'vs/platform/theme/common/themeService'; import { IEditorOptions, RenderLineNumbersType } from 'vs/editor/common/config/editorOptions'; -import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser'; import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; @@ -32,7 +32,7 @@ export class GotoLineAction extends QuickOpenAction { constructor(actionId: string, actionLabel: string, @IQuickOpenService private readonly _quickOpenService: IQuickOpenService, - @INextEditorService private readonly editorService: INextEditorService + @IEditorService private readonly editorService: IEditorService ) { super(actionId, actionLabel, GOTO_LINE_PREFIX, _quickOpenService); } @@ -79,7 +79,7 @@ class GotoLineEntry extends EditorQuickOpenEntry { private column: number; private handler: GotoLineHandler; - constructor(line: string, editorService: INextEditorService, handler: GotoLineHandler) { + constructor(line: string, editorService: IEditorService, handler: GotoLineHandler) { super(editorService); this.parseInput(line); @@ -213,7 +213,7 @@ export class GotoLineHandler extends QuickOpenHandler { private rangeHighlightDecorationId: IEditorLineDecoration; private lastKnownEditorViewState: IEditorViewState; - constructor(@INextEditorService private editorService: INextEditorService) { + constructor(@IEditorService private editorService: IEditorService) { super(); } diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index 8f042dc0079..5c9f7406346 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -24,7 +24,7 @@ import { IRange } from 'vs/editor/common/core/range'; import { themeColorFromId } from 'vs/platform/theme/common/themeService'; import { overviewRulerRangeHighlight } from 'vs/editor/common/view/editorColorRegistry'; import { GroupIdentifier, IEditorInput } from 'vs/workbench/common/editor'; -import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; export const GOTO_SYMBOL_PREFIX = '@'; @@ -239,7 +239,7 @@ class OutlineModel extends QuickOpenModel { } class SymbolEntry extends EditorQuickOpenEntryGroup { - private editorService: INextEditorService; + private editorService: IEditorService; private index: number; private name: string; private type: string; @@ -248,7 +248,7 @@ class SymbolEntry extends EditorQuickOpenEntryGroup { private range: IRange; private handler: GotoSymbolHandler; - constructor(index: number, name: string, type: string, description: string, icon: string, range: IRange, highlights: IHighlight[], editorService: INextEditorService, handler: GotoSymbolHandler) { + constructor(index: number, name: string, type: string, description: string, icon: string, range: IRange, highlights: IHighlight[], editorService: IEditorService, handler: GotoSymbolHandler) { super(); this.index = index; @@ -377,7 +377,7 @@ export class GotoSymbolHandler extends QuickOpenHandler { private activeOutlineRequest: TPromise; constructor( - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(); diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts index b53829a5b35..7a8a2bd5871 100644 --- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts @@ -16,7 +16,7 @@ import * as ext from 'vs/workbench/common/contributions'; import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import URI from 'vs/base/common/uri'; @@ -1120,7 +1120,7 @@ export class DirtyDiffWorkbenchController implements ext.IWorkbenchContribution, private disposables: IDisposable[] = []; constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IInstantiationService private instantiationService: IInstantiationService, @IConfigurationService private configurationService: IConfigurationService ) { diff --git a/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts b/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts index 0f092a76452..56943a892a0 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts @@ -19,14 +19,14 @@ import { StatusUpdater, StatusBarController } from './scmActivity'; import { SCMViewlet } from 'vs/workbench/parts/scm/electron-browser/scmViewlet'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; class OpenSCMViewletAction extends ToggleViewletAction { static readonly ID = VIEWLET_ID; static LABEL = localize('toggleGitViewlet', "Show Git"); - constructor(id: string, label: string, @IViewletService viewletService: IViewletService, @INextEditorGroupsService editorGroupService: INextEditorGroupsService) { + constructor(id: string, label: string, @IViewletService viewletService: IViewletService, @IEditorGroupsService editorGroupService: IEditorGroupsService) { super(id, label, VIEWLET_ID, viewletService, editorGroupService); } } diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts index a9699ea6cd1..a9dc9a6401d 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts @@ -22,7 +22,7 @@ import { VIEWLET_ID } from 'vs/workbench/parts/scm/common/scm'; import { FileLabel } from 'vs/workbench/browser/labels'; import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge'; import { ISCMService, ISCMRepository, ISCMResourceGroup, ISCMResource, InputValidationType } from 'vs/workbench/services/scm/common/scm'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -756,7 +756,7 @@ export class RepositoryPanel extends ViewletPanel { @IContextViewService protected contextViewService: IContextViewService, @ICommandService protected commandService: ICommandService, @INotificationService private notificationService: INotificationService, - @INextEditorService protected editorService: INextEditorService, + @IEditorService protected editorService: IEditorService, @IInstantiationService protected instantiationService: IInstantiationService, @IConfigurationService protected configurationService: IConfigurationService, @IContextKeyService protected contextKeyService: IContextKeyService, diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts index 249b298f6c7..2a08068c698 100644 --- a/src/vs/workbench/parts/search/browser/openFileHandler.ts +++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts @@ -31,7 +31,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IRange } from 'vs/editor/common/core/range'; import { getOutOfWorkspaceEditorResources } from 'vs/workbench/parts/search/common/search'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class FileQuickOpenModel extends QuickOpenModel { @@ -48,7 +48,7 @@ export class FileEntry extends EditorQuickOpenEntry { private name: string, private description: string, private icon: string, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IModeService private modeService: IModeService, @IModelService private modelService: IModelService, @IConfigurationService private configurationService: IConfigurationService, @@ -117,7 +117,7 @@ export class OpenFileHandler extends QuickOpenHandler { private cacheState: CacheState; constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IInstantiationService private instantiationService: IInstantiationService, @IWorkbenchThemeService private themeService: IWorkbenchThemeService, @IWorkspaceContextService private contextService: IWorkspaceContextService, diff --git a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts index f6c0bdbd95e..c3a855cb222 100644 --- a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts +++ b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts @@ -25,7 +25,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IWorkspaceSymbolProvider, getWorkspaceSymbols } from 'vs/workbench/parts/search/common/search'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { basename } from 'vs/base/common/paths'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; class SymbolEntry extends EditorQuickOpenEntry { @@ -36,7 +36,7 @@ class SymbolEntry extends EditorQuickOpenEntry { private _provider: IWorkspaceSymbolProvider, @IConfigurationService private readonly _configurationService: IConfigurationService, @IWorkspaceContextService private readonly _contextService: IWorkspaceContextService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IEnvironmentService private readonly _environmentService: IEnvironmentService ) { super(editorService); diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts index 1a721a7ddd9..73fe8903f8a 100644 --- a/src/vs/workbench/parts/search/browser/replaceService.ts +++ b/src/vs/workbench/parts/search/browser/replaceService.ts @@ -10,7 +10,7 @@ import URI from 'vs/base/common/uri'; import * as network from 'vs/base/common/network'; import { Disposable } from 'vs/base/common/lifecycle'; import { IReplaceService } from 'vs/workbench/parts/search/common/replace'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IModelService } from 'vs/editor/common/services/modelService'; import { IModeService } from 'vs/editor/common/services/modeService'; import { Match, FileMatch, FileMatchOrMatch, ISearchWorkbenchService } from 'vs/workbench/parts/search/common/searchModel'; @@ -93,7 +93,7 @@ export class ReplaceService implements IReplaceService { constructor( @ITextFileService private textFileService: ITextFileService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @ITextModelService private textModelResolverService: ITextModelService, @IBulkEditService private bulkEditorService: IBulkEditService ) { } diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts index 8c547a377f1..1ab776156f4 100644 --- a/src/vs/workbench/parts/search/browser/searchActions.ts +++ b/src/vs/workbench/parts/search/browser/searchActions.ts @@ -14,7 +14,7 @@ import { SearchView } from 'vs/workbench/parts/search/browser/searchView'; import { Match, FileMatch, FileMatchOrMatch, FolderMatch, RenderableMatch, SearchResult, searchMatchComparer } from 'vs/workbench/parts/search/common/searchModel'; import { IReplaceService } from 'vs/workbench/parts/search/common/replace'; import * as Constants from 'vs/workbench/parts/search/common/constants'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ResolvedKeybinding, createKeybinding } from 'vs/base/common/keyCodes'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; @@ -288,7 +288,7 @@ export class FocusPreviousInputAction extends Action { } export const FocusActiveEditorCommand = (accessor: ServicesAccessor) => { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const activeControl = editorService.activeControl; if (activeControl) { activeControl.focus(); @@ -663,7 +663,7 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction { constructor(private viewer: ITree, private element: Match, private viewlet: SearchView, @IReplaceService private replaceService: IReplaceService, @IKeybindingService keyBindingService: IKeybindingService, - @INextEditorService private editorService: INextEditorService) { + @IEditorService private editorService: IEditorService) { super(Constants.ReplaceActionId, appendKeyBindingLabel(ReplaceAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceActionId), keyBindingService), 'action-replace'); } diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts index 5db469cf331..26da15f32aa 100644 --- a/src/vs/workbench/parts/search/browser/searchView.ts +++ b/src/vs/workbench/parts/search/browser/searchView.ts @@ -29,7 +29,7 @@ import { Match, FileMatch, SearchModel, FileMatchOrMatch, IChangeEvent, ISearchW import { QueryBuilder } from 'vs/workbench/parts/search/common/queryBuilder'; import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; import { ISearchProgressItem, ISearchComplete, ISearchQuery, IQueryOptions, ISearchConfiguration, IPatternInfo, VIEW_ID } from 'vs/platform/search/common/search'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; @@ -116,7 +116,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel { @IPartService partService: IPartService, @ITelemetryService telemetryService: ITelemetryService, @IFileService private fileService: IFileService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IProgressService private progressService: IProgressService, @INotificationService private notificationService: INotificationService, @IDialogService private dialogService: IDialogService, diff --git a/src/vs/workbench/parts/search/common/search.ts b/src/vs/workbench/parts/search/common/search.ts index f6a6fdb453f..c7eb5fd5b87 100644 --- a/src/vs/workbench/parts/search/common/search.ts +++ b/src/vs/workbench/parts/search/common/search.ts @@ -13,7 +13,7 @@ import { SymbolInformation } from 'vs/editor/common/modes'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import URI from 'vs/base/common/uri'; import { toResource } from 'vs/workbench/common/editor'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export interface IWorkspaceSymbolProvider { provideWorkspaceSymbols(search: string): TPromise; @@ -76,7 +76,7 @@ export interface IWorkbenchSearchConfiguration extends ISearchConfiguration { /** * Helper to return all opened editors with resources not belonging to the currently opened workspace. */ -export function getOutOfWorkspaceEditorResources(editorService: INextEditorService, contextService: IWorkspaceContextService): URI[] { +export function getOutOfWorkspaceEditorResources(editorService: IEditorService, contextService: IWorkspaceContextService): URI[] { const resources: URI[] = []; editorService.editors.forEach(editor => { diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts index 4e555dbbc80..212ef51c2be 100644 --- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts @@ -58,7 +58,7 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } fr import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { SearchViewLocationUpdater } from 'vs/workbench/parts/search/browser/searchViewLocationUpdater'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; registerSingleton(ISearchWorkbenchService, SearchWorkbenchService); replaceContributions(); @@ -337,7 +337,7 @@ CommandsRegistry.registerCommand({ const viewletService = accessor.get(IViewletService); const panelService = accessor.get(IPanelService); const fileService = accessor.get(IFileService); - const resources = getMultiSelectedResources(resource, listService, accessor.get(INextEditorService)); + const resources = getMultiSelectedResources(resource, listService, accessor.get(IEditorService)); return openSearchView(viewletService, panelService, true).then(searchView => { if (resources && resources.length) { diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts index ccec9c0b503..12460e7dd35 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -60,7 +60,7 @@ import { IQuickOpenService, IPickOpenEntry, IPickOpenAction, IPickOpenItem } fro import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import Constants from 'vs/workbench/parts/markers/electron-browser/constants'; import { IPartService } from 'vs/workbench/services/part/common/partService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver'; import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; @@ -462,7 +462,7 @@ class TaskService implements ITaskService { @IConfigurationService private configurationService: IConfigurationService, @IMarkerService private markerService: IMarkerService, @IOutputService private outputService: IOutputService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IFileService private fileService: IFileService, @IWorkspaceContextService private contextService: IWorkspaceContextService, @ITelemetryService private telemetryService: ITelemetryService, diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts index 0d4c874d565..d19528a9e31 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts @@ -15,7 +15,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal'; import { ITextEditorSelection } from 'vs/platform/editor/common/editor'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; const pathPrefix = '(\\.\\.?|\\~)'; const pathSeparatorClause = '\\/'; @@ -69,7 +69,7 @@ export class TerminalLinkHandler { private _platform: platform.Platform, private _initialCwd: string, @IOpenerService private readonly _openerService: IOpenerService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @IConfigurationService private readonly _configurationService: IConfigurationService, @ITerminalService private readonly _terminalService: ITerminalService ) { diff --git a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts index a97c4d4ea7f..90f76d2a51f 100644 --- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts +++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts @@ -21,7 +21,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { Delayer } from 'vs/base/common/async'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { IColorRegistry, Extensions as ColorRegistryExtensions } from 'vs/platform/theme/common/colorRegistry'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Color } from 'vs/base/common/color'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { LIGHT, DARK, HIGH_CONTRAST } from 'vs/platform/theme/common/themeService'; @@ -178,7 +178,7 @@ class GenerateColorThemeAction extends Action { id: string, label: string, @IWorkbenchThemeService private themeService: IWorkbenchThemeService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, ) { super(id, label); } diff --git a/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts b/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts index 1cd02bfd0b8..871bbc06dce 100644 --- a/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts +++ b/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts @@ -13,7 +13,7 @@ import * as pfs from 'vs/base/node/pfs'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { toResource } from 'vs/workbench/common/editor'; import { ITextMateService } from 'vs/workbench/services/textMate/electron-browser/textMateService'; import { IGrammar, StackElement } from 'vscode-textmate'; @@ -249,7 +249,7 @@ CommandsRegistry.registerCommand('_workbench.captureSyntaxTokens', function (acc }; if (!resource) { - let editorService = accessor.get(INextEditorService); + let editorService = accessor.get(IEditorService); let file = toResource(editorService.activeEditor, { filter: 'file' }); if (file) { process(file).then(result => { diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts index 932d34e9f3f..f1dcc32c086 100644 --- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts +++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts @@ -24,7 +24,7 @@ import { IRequestService } from 'vs/platform/request/node/request'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils'; import { IWebviewEditorService } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService'; -import { INextEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO'; import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput'; @@ -59,7 +59,7 @@ export class ReleaseNotesManager { @IOpenerService private readonly _openerService: IOpenerService, @IRequestService private readonly _requestService: IRequestService, @ITelemetryService private readonly _telemetryService: ITelemetryService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @IWebviewEditorService private readonly _webviewEditorService: IWebviewEditorService, ) { } diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts index f6eedf35b54..8655aa91f32 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts @@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions'; import * as nls from 'vs/nls'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { BaseWebviewEditor } from './baseWebviewEditor'; export class ShowWebViewEditorFindWidgetCommand extends Command { @@ -83,7 +83,7 @@ export class ReloadWebviewAction extends Action { public constructor( id: string, label: string, - @INextEditorService private readonly editorService: INextEditorService + @IEditorService private readonly editorService: IEditorService ) { super(id, label); } @@ -103,7 +103,7 @@ export class ReloadWebviewAction extends Action { } function getActiveWebviewEditor(accessor: ServicesAccessor): BaseWebviewEditor | null { - const editorService = accessor.get(INextEditorService); + const editorService = accessor.get(IEditorService); const activeControl = editorService.activeControl as BaseWebviewEditor; return activeControl.isWebviewEditor ? activeControl : null; } \ No newline at end of file diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts index 0fe80e10e9a..66bf601c159 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts @@ -17,7 +17,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import { EditorOptions } from 'vs/workbench/common/editor'; import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IPartService, Parts } from 'vs/workbench/services/part/common/partService'; import { BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor'; import { WebviewElement } from './webviewElement'; @@ -44,7 +44,7 @@ export class WebviewEditor extends BaseWebviewEditor { @IPartService private readonly _partService: IPartService, @IWorkspaceContextService private readonly _contextService: IWorkspaceContextService, @IInstantiationService private readonly _instantiationService: IInstantiationService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService ) { super(WebviewEditor.ID, telemetryService, themeService, _contextKeyService); } diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts index a95bca9b408..e690fb8f048 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts @@ -8,8 +8,8 @@ import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; import { Position } from 'vs/platform/editor/common/editor'; import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorService, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService'; -import { INextEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import * as vscode from 'vscode'; import { WebviewEditorInput } from './webviewEditorInput'; import { GroupIdentifier } from 'vs/workbench/common/editor'; @@ -85,9 +85,9 @@ export class WebviewEditorService implements IWebviewEditorService { private _awaitingRevival: { input: WebviewEditorInput, resolve: (x: any) => void }[] = []; constructor( - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @IInstantiationService private readonly _instantiationService: IInstantiationService, - @INextEditorGroupsService private readonly _editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService, ) { } createWebview( diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts index 0416ae7f185..8bff80b2110 100644 --- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts +++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts @@ -10,7 +10,7 @@ import * as dom from 'vs/base/browser/dom'; import { Registry } from 'vs/platform/registry/common/platform'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Parts, IPartService } from 'vs/workbench/services/part/common/partService'; import { TPromise } from 'vs/base/common/winjs.base'; import { localize } from 'vs/nls'; @@ -154,7 +154,7 @@ class WelcomeOverlay { constructor( @IPartService private partService: IPartService, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @ICommandService private commandService: ICommandService, @IContextKeyService private readonly _contextKeyService: IContextKeyService, @IKeybindingService private keybindingService: IKeybindingService diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts index 3f9117ba247..2a6e3695400 100644 --- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts +++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts @@ -11,7 +11,7 @@ import * as arrays from 'vs/base/common/arrays'; import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { onUnexpectedError, isPromiseCanceledError } from 'vs/base/common/errors'; import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -50,7 +50,7 @@ export class WelcomePageContribution implements IWorkbenchContribution { constructor( @IInstantiationService instantiationService: IInstantiationService, @IConfigurationService configurationService: IConfigurationService, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IBackupFileService backupFileService: IBackupFileService, @ITelemetryService telemetryService: ITelemetryService, @ILifecycleService lifecycleService: ILifecycleService, @@ -217,7 +217,7 @@ class WelcomePage { readonly editorInput: WalkThroughInput; constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IInstantiationService private instantiationService: IInstantiationService, @IWindowService private windowService: IWindowService, @IWindowsService private windowsService: IWindowsService, diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts index 47fd46f78e6..71316038c95 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts +++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts @@ -5,7 +5,7 @@ 'use strict'; import { localize } from 'vs/nls'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Action } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -31,7 +31,7 @@ export class EditorWalkThroughAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IInstantiationService private instantiationService: IInstantiationService ) { super(id, label); diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts index f412941db0b..1e5bfeabad6 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts +++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts @@ -5,7 +5,7 @@ 'use strict'; import { localize } from 'vs/nls'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Action } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; import { WalkThroughPart } from 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart'; @@ -18,7 +18,7 @@ export class WalkThroughArrowUpAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label); } @@ -40,7 +40,7 @@ export class WalkThroughArrowDownAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label); } @@ -62,7 +62,7 @@ export class WalkThroughPageUpAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label); } @@ -84,7 +84,7 @@ export class WalkThroughPageDownAction extends Action { constructor( id: string, label: string, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { super(id, label); } diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts index 65657868ea1..a42d207c3c6 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts +++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts @@ -38,7 +38,7 @@ import { OS, OperatingSystem } from 'vs/base/common/platform'; import { deepClone } from 'vs/base/common/objects'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { Dimension, size } from 'vs/base/browser/dom'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { CancellationToken } from 'vs/base/common/cancellation'; export const WALK_THROUGH_FOCUS = new RawContextKey('interactivePlaygroundFocus', false); @@ -78,7 +78,7 @@ export class WalkThroughPart extends BaseEditor { @IContextKeyService private contextKeyService: IContextKeyService, @IConfigurationService private configurationService: IConfigurationService, @INotificationService private notificationService: INotificationService, - @INextEditorGroupsService editorGroupService: INextEditorGroupsService + @IEditorGroupsService editorGroupService: IEditorGroupsService ) { super(WalkThroughPart.ID, telemetryService, themeService); this.editorFocus = WALK_THROUGH_FOCUS.bindTo(this.contextKeyService); diff --git a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts index a6ce4471655..fcb3ae878be 100644 --- a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts +++ b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts @@ -22,7 +22,7 @@ import { localize } from 'vs/nls'; import { FileChangeType, IFileService } from 'vs/platform/files/common/files'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { IProgress, IProgressRunner, emptyProgressRunner } from 'vs/platform/progress/common/progress'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; abstract class Recording { @@ -380,7 +380,7 @@ export class BulkEditService implements IBulkEditService { constructor( @IModelService private readonly _modelService: IModelService, - @INextEditorService private readonly _editorService: INextEditorService, + @IEditorService private readonly _editorService: IEditorService, @ITextModelService private readonly _textModelService: ITextModelService, @IFileService private readonly _fileService: IFileService ) { diff --git a/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts b/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts index 1dd32dd005e..d3276328793 100644 --- a/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts +++ b/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts @@ -8,14 +8,14 @@ import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl'; import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser'; import { IResourceInput } from 'vs/platform/editor/common/editor'; -import { INextEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { TPromise } from 'vs/base/common/winjs.base'; export class CodeEditorService extends CodeEditorServiceImpl { constructor( - @INextEditorService private editorService: INextEditorService, + @IEditorService private editorService: IEditorService, @IThemeService themeService: IThemeService ) { super(themeService); diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts index 4894e676c8e..ffea6529bbf 100644 --- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts +++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts @@ -28,7 +28,7 @@ import { IFileService } from 'vs/platform/files/common/files'; import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService'; import { OVERRIDE_PROPERTY_PATTERN, IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ITextModel } from 'vs/editor/common/model'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; @@ -133,7 +133,7 @@ export class ConfigurationEditingService { @ITextFileService private textFileService: ITextFileService, @INotificationService private notificationService: INotificationService, @ICommandService private commandService: ICommandService, - @INextEditorService private editorService: INextEditorService + @IEditorService private editorService: IEditorService ) { this.queue = new Queue(); } diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts index bbce4263e28..a0ca4baff20 100644 --- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts +++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts @@ -15,7 +15,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IWorkspaceFolder, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IProcessEnvironment } from 'vs/base/common/platform'; import { VariableResolver } from 'vs/workbench/services/configurationResolver/node/variableResolver'; import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; @@ -29,7 +29,7 @@ export class ConfigurationResolverService implements IConfigurationResolverServi constructor( envVariables: IProcessEnvironment, - @INextEditorService editorService: INextEditorService, + @IEditorService editorService: IEditorService, @IEnvironmentService environmentService: IEnvironmentService, @IConfigurationService configurationService: IConfigurationService, @ICommandService private commandService: ICommandService, diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index cbf09a848d3..d338ee39ef0 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -24,8 +24,8 @@ import { basename } from 'vs/base/common/paths'; import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput'; import { localize } from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; -import { INextEditorGroupsService, IEditorGroup, GroupsOrder, IEditorReplacement, GroupChangeKind, preferredGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; -import { INextEditorService, IResourceEditor, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE, SIDE_GROUP, ACTIVE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorReplacement, GroupChangeKind, preferredGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService, IResourceEditor, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE, SIDE_GROUP, ACTIVE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { Disposable, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle'; import { coalesce } from 'vs/base/common/arrays'; @@ -33,7 +33,7 @@ import { isCodeEditor, isDiffEditor, ICodeEditor, IDiffEditor } from 'vs/editor/ type ICachedEditorInput = ResourceEditorInput | IFileEditorInput | DataUriEditorInput; -export class NextEditorService extends Disposable implements INextEditorService { +export class EditorService extends Disposable implements IEditorService { _serviceBrand: any; @@ -60,7 +60,7 @@ export class NextEditorService extends Disposable implements INextEditorService private lastActiveEditor: IEditorInput; constructor( - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IUntitledEditorService private untitledEditorService: IUntitledEditorService, @IWorkspaceContextService private workspaceContextService: IWorkspaceContextService, @IInstantiationService private instantiationService: IInstantiationService, @@ -529,8 +529,8 @@ export class NextEditorService extends Disposable implements INextEditorService } private createOrGet(resource: URI, instantiationService: IInstantiationService, label: string, description: string, encoding?: string): ICachedEditorInput { - if (NextEditorService.CACHE.has(resource)) { - const input = NextEditorService.CACHE.get(resource); + if (EditorService.CACHE.has(resource)) { + const input = EditorService.CACHE.get(resource); if (input instanceof ResourceEditorInput) { input.setName(label); input.setDescription(description); @@ -558,9 +558,9 @@ export class NextEditorService extends Disposable implements INextEditorService input = instantiationService.createInstance(ResourceEditorInput, label, description, resource); } - NextEditorService.CACHE.set(resource, input); + EditorService.CACHE.set(resource, input); once(input.onDispose)(() => { - NextEditorService.CACHE.delete(resource); + EditorService.CACHE.delete(resource); }); return input; @@ -589,11 +589,11 @@ export interface IEditorOpenHandler { * The delegating workbench editor service can be used to override the behaviour of the openEditor() * method by providing a IEditorOpenHandler. */ -export class DelegatingWorkbenchEditorService extends NextEditorService { +export class DelegatingWorkbenchEditorService extends EditorService { private editorOpenHandler: IEditorOpenHandler; constructor( - @INextEditorGroupsService editorGroupService: INextEditorGroupsService, + @IEditorGroupsService editorGroupService: IEditorGroupsService, @IUntitledEditorService untitledEditorService: IUntitledEditorService, @IWorkspaceContextService workspaceContextService: IWorkspaceContextService, @IInstantiationService instantiationService: IInstantiationService, diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts index 3e630627daa..e7279698e99 100644 --- a/src/vs/workbench/services/editor/common/editorService.ts +++ b/src/vs/workbench/services/editor/common/editorService.ts @@ -14,7 +14,7 @@ import { IEditorGroup, IEditorReplacement } from 'vs/workbench/services/group/co import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable } from 'vs/base/common/lifecycle'; -export const INextEditorService = createDecorator('nextEditorService'); +export const IEditorService = createDecorator('editorService'); export type IResourceEditor = IResourceInput | IUntitledResourceInput | IResourceDiffInput | IResourceSideBySideInput; @@ -42,20 +42,20 @@ export interface IOpenEditorOverride { override?: TPromise; } -export interface INextEditorService { +export interface IEditorService { _serviceBrand: ServiceIdentifier; /** * Emitted when the currently active editor changes. * - * @see `INextEditorService.activeEditor` + * @see `IEditorService.activeEditor` */ readonly onDidActiveEditorChange: Event; /** * Emitted when any of the current visible editors changes. * - * @see `INextEditorService.visibleEditors` + * @see `IEditorService.visibleEditors` */ readonly onDidVisibleEditorsChange: Event; @@ -80,7 +80,7 @@ export interface INextEditorService { * The currently active editor control or `undefined` if none. The editor control is * the workbench container for editors of any kind. * - * @see `INextEditorService.activeEditor` + * @see `IEditorService.activeEditor` */ readonly activeControl: IEditor; @@ -88,7 +88,7 @@ export interface INextEditorService { * The currently active text editor widget or `undefined` if there is currently no active * editor or the active editor widget is neither a text nor a diff editor. * - * @see `INextEditorService.activeEditor` + * @see `IEditorService.activeEditor` */ readonly activeTextEditorWidget: ICodeEditor; diff --git a/src/vs/workbench/services/editor/test/browser/nextEditorService.test.ts b/src/vs/workbench/services/editor/test/browser/nextEditorService.test.ts index 0a318cc270a..44a7161d45e 100644 --- a/src/vs/workbench/services/editor/test/browser/nextEditorService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/nextEditorService.test.ts @@ -15,12 +15,12 @@ import { EditorInput, EditorOptions, IFileEditorInput, IEditorInput } from 'vs/w import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices'; import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput'; import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; -import { NextEditorService, DelegatingWorkbenchEditorService } from 'vs/workbench/services/editor/browser/editorService'; -import { IEditorGroup, INextEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; +import { EditorService, DelegatingWorkbenchEditorService } from 'vs/workbench/services/editor/browser/editorService'; +import { IEditorGroup, IEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService'; import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart'; import { Dimension } from 'vs/base/browser/dom'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; -import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils'; import { IEditorRegistry, EditorDescriptor, Extensions } from 'vs/workbench/browser/editor'; @@ -32,9 +32,9 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput'; export class TestEditorControl extends BaseEditor { - constructor(@ITelemetryService telemetryService: ITelemetryService) { super('MyTestEditorForNextEditorService', NullTelemetryService, new TestThemeService()); } + constructor(@ITelemetryService telemetryService: ITelemetryService) { super('MyTestEditorForEditorService', NullTelemetryService, new TestThemeService()); } - getId(): string { return 'myTestEditorForNextEditorService'; } + getId(): string { return 'myTestEditorForEditorService'; } layout(): void { } createEditor(): any { } } @@ -43,7 +43,7 @@ export class TestEditorInput extends EditorInput implements IFileEditorInput { public gotDisposed: boolean; constructor(private resource: URI) { super(); } - getTypeId() { return 'testEditorInputForNextEditorService'; } + getTypeId() { return 'testEditorInputForEditorService'; } resolve(): TPromise { return null; } matches(other: TestEditorInput): boolean { return other && other.resource && this.resource.toString() === other.resource.toString() && other instanceof TestEditorInput; } setEncoding(encoding: string) { } @@ -60,7 +60,7 @@ export class TestEditorInput extends EditorInput implements IFileEditorInput { suite('Editor service', () => { function registerTestEditorInput(): void { - Registry.as(Extensions.Editors).registerEditor(new EditorDescriptor(TestEditorControl, 'MyTestEditorForNextEditorService', 'My Test Editor For Next Editor Service'), new SyncDescriptor(TestEditorInput)); + Registry.as(Extensions.Editors).registerEditor(new EditorDescriptor(TestEditorControl, 'MyTestEditorForEditorService', 'My Test Editor For Next Editor Service'), new SyncDescriptor(TestEditorInput)); } registerTestEditorInput(); @@ -72,9 +72,9 @@ suite('Editor service', () => { part.create(document.createElement('div')); part.layout(new Dimension(400, 300)); - const testInstantiationService = partInstantiator.createChild(new ServiceCollection([INextEditorGroupsService, part])); + const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part])); - const service: INextEditorService = testInstantiationService.createInstance(NextEditorService); + const service: IEditorService = testInstantiationService.createInstance(EditorService); const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource')); const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2')); @@ -140,9 +140,9 @@ suite('Editor service', () => { part.create(document.createElement('div')); part.layout(new Dimension(400, 300)); - const testInstantiationService = partInstantiator.createChild(new ServiceCollection([INextEditorGroupsService, part])); + const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part])); - const service: INextEditorService = testInstantiationService.createInstance(NextEditorService); + const service: IEditorService = testInstantiationService.createInstance(EditorService); const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource')); const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2')); @@ -161,7 +161,7 @@ suite('Editor service', () => { test('caching', function () { const instantiationService = workbenchInstantiationService(); - const service: NextEditorService = instantiationService.createInstance(NextEditorService); + const service: EditorService = instantiationService.createInstance(EditorService); // Cached Input (Files) const fileResource1 = toFileResource(this, '/foo/bar/cache1.js'); @@ -210,7 +210,7 @@ suite('Editor service', () => { test('createInput', function () { const instantiationService = workbenchInstantiationService(); - const service: NextEditorService = instantiationService.createInstance(NextEditorService); + const service: EditorService = instantiationService.createInstance(EditorService); // Untyped Input (file) let input = service.createInput({ resource: toFileResource(this, '/index.html'), options: { selection: { startLineNumber: 1, startColumn: 1 } } }); @@ -278,9 +278,9 @@ suite('Editor service', () => { part.create(document.createElement('div')); part.layout(new Dimension(400, 300)); - const testInstantiationService = partInstantiator.createChild(new ServiceCollection([INextEditorGroupsService, part])); + const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part])); - const service: INextEditorService = testInstantiationService.createInstance(NextEditorService); + const service: IEditorService = testInstantiationService.createInstance(EditorService); const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource')); @@ -314,9 +314,9 @@ suite('Editor service', () => { part.create(document.createElement('div')); part.layout(new Dimension(400, 300)); - const testInstantiationService = partInstantiator.createChild(new ServiceCollection([INextEditorGroupsService, part])); + const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part])); - const service: INextEditorService = testInstantiationService.createInstance(NextEditorService); + const service: IEditorService = testInstantiationService.createInstance(EditorService); const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource')); const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2')); @@ -352,9 +352,9 @@ suite('Editor service', () => { part.create(document.createElement('div')); part.layout(new Dimension(400, 300)); - const testInstantiationService = partInstantiator.createChild(new ServiceCollection([INextEditorGroupsService, part])); + const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part])); - const service: INextEditorService = testInstantiationService.createInstance(NextEditorService); + const service: IEditorService = testInstantiationService.createInstance(EditorService); const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource')); const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2')); @@ -379,9 +379,9 @@ suite('Editor service', () => { part.create(document.createElement('div')); part.layout(new Dimension(400, 300)); - const testInstantiationService = partInstantiator.createChild(new ServiceCollection([INextEditorGroupsService, part])); + const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part])); - const service: INextEditorService = testInstantiationService.createInstance(NextEditorService); + const service: IEditorService = testInstantiationService.createInstance(EditorService); const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource')); const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2')); @@ -408,9 +408,9 @@ suite('Editor service', () => { part.create(document.createElement('div')); part.layout(new Dimension(400, 300)); - const testInstantiationService = partInstantiator.createChild(new ServiceCollection([INextEditorGroupsService, part])); + const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part])); - const service: INextEditorService = testInstantiationService.createInstance(NextEditorService); + const service: IEditorService = testInstantiationService.createInstance(EditorService); const input1 = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource1')); const input2 = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2')); diff --git a/src/vs/workbench/services/group/common/editorGroupsService.ts b/src/vs/workbench/services/group/common/editorGroupsService.ts index c88a2d95e21..15fe6f6ea17 100644 --- a/src/vs/workbench/services/group/common/editorGroupsService.ts +++ b/src/vs/workbench/services/group/common/editorGroupsService.ts @@ -12,7 +12,7 @@ import { IEditorOptions, ITextEditorOptions } from 'vs/platform/editor/common/ed import { TPromise } from 'vs/base/common/winjs.base'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -export const INextEditorGroupsService = createDecorator('nextEditorGroupsService'); +export const IEditorGroupsService = createDecorator('editorGroupsService'); export enum GroupDirection { UP, @@ -128,7 +128,7 @@ export enum EditorsOrder { SEQUENTIAL } -export interface INextEditorGroupsService { +export interface IEditorGroupsService { _serviceBrand: ServiceIdentifier; diff --git a/src/vs/workbench/services/history/electron-browser/history.ts b/src/vs/workbench/services/history/electron-browser/history.ts index 70869b6c048..84f198482ce 100644 --- a/src/vs/workbench/services/history/electron-browser/history.ts +++ b/src/vs/workbench/services/history/electron-browser/history.ts @@ -11,7 +11,7 @@ import URI from 'vs/base/common/uri'; import { IEditor } from 'vs/editor/common/editorCommon'; import { ITextEditorOptions, IResourceInput, ITextEditorSelection } from 'vs/platform/editor/common/editor'; import { IEditorInput, IEditor as IBaseEditor, Extensions as EditorExtensions, EditorInput, IEditorCloseEvent, IEditorInputFactoryRegistry, toResource, Extensions as EditorInputExtensions, IFileInputFactory, IEditorIdentifier } from 'vs/workbench/common/editor'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IHistoryService } from 'vs/workbench/services/history/common/history'; import { FileChangesEvent, IFileService, FileChangeType, FILES_EXCLUDE_CONFIG } from 'vs/platform/files/common/files'; import { Selection } from 'vs/editor/common/core/selection'; @@ -22,7 +22,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { Registry } from 'vs/platform/registry/common/platform'; import { once, debounceEvent } from 'vs/base/common/event'; import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; -import { INextEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { IWindowsService } from 'vs/platform/windows/common/windows'; import { getCodeEditor } from 'vs/editor/browser/editorBrowser'; import { getExcludes, ISearchConfiguration } from 'vs/platform/search/common/search'; @@ -124,8 +124,8 @@ export class HistoryService implements IHistoryService { private fileInputFactory: IFileInputFactory; constructor( - @INextEditorService private editorService: INextEditorService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorService private editorService: IEditorService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IWorkspaceContextService private contextService: IWorkspaceContextService, @IStorageService private storageService: IStorageService, @IConfigurationService private configurationService: IConfigurationService, diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts index ace8376a651..2fe4c81b71f 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts +++ b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts @@ -17,8 +17,8 @@ import { KeyCode, SimpleKeybinding, ChordKeybinding } from 'vs/base/common/keyCo import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import * as extfs from 'vs/base/node/extfs'; import { TestTextFileService, TestLifecycleService, TestBackupFileService, TestContextService, TestTextResourceConfigurationService, TestHashService, TestEnvironmentService, TestStorageService, TestEditorGroupsService, TestEditorService } from 'vs/workbench/test/workbenchTestServices'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; import { IWorkspaceContextService, Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace'; import * as uuid from 'vs/base/common/uuid'; @@ -78,8 +78,8 @@ suite('Keybindings Editing', () => { instantiationService.stub(ILifecycleService, lifecycleService); instantiationService.stub(IContextKeyService, instantiationService.createInstance(MockContextKeyService)); instantiationService.stub(IHashService, new TestHashService()); - instantiationService.stub(INextEditorGroupsService, new TestEditorGroupsService()); - instantiationService.stub(INextEditorService, new TestEditorService()); + instantiationService.stub(IEditorGroupsService, new TestEditorGroupsService()); + instantiationService.stub(IEditorService, new TestEditorService()); instantiationService.stub(ITelemetryService, NullTelemetryService); instantiationService.stub(IModeService, ModeServiceImpl); instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl)); diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts index d4397438cfb..a99c550d0e7 100644 --- a/src/vs/workbench/services/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts @@ -35,8 +35,8 @@ import { parse } from 'vs/base/common/json'; import { ICodeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { assign } from 'vs/base/common/objects'; -import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -import { IEditorGroup, INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; const emptyEditableSettingsContent = '{\n}'; @@ -56,8 +56,8 @@ export class PreferencesService extends Disposable implements IPreferencesServic private _defaultFolderSettingsContentModel: DefaultSettings; constructor( - @INextEditorService private editorService: INextEditorService, - @INextEditorGroupsService private editorGroupService: INextEditorGroupsService, + @IEditorService private editorService: IEditorService, + @IEditorGroupsService private editorGroupService: IEditorGroupsService, @IFileService private fileService: IFileService, @IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService, @INotificationService private notificationService: INotificationService, diff --git a/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts b/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts index 830be7f475f..e395c7acabc 100644 --- a/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts +++ b/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts @@ -20,7 +20,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/ import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl'; import { CoreNavigationCommands } from 'vs/editor/browser/controller/coreCommands'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; suite('Editor - Range decorations', () => { @@ -33,15 +33,15 @@ suite('Editor - Range decorations', () => { setup(() => { instantiationService = workbenchInstantiationService(); - instantiationService.stub(INextEditorService, new TestEditorService()); + instantiationService.stub(IEditorService, new TestEditorService()); instantiationService.stub(IModeService, ModeServiceImpl); instantiationService.stub(IModelService, stubModelService(instantiationService)); text = 'LINE1' + '\n' + 'LINE2' + '\n' + 'LINE3' + '\n' + 'LINE4' + '\r\n' + 'LINE5'; model = aModel(URI.file('some_file')); codeEditor = createTestCodeEditor({ model: model }); - instantiationService.stub(INextEditorService, 'activeEditor', { getResource: () => { return codeEditor.getModel().uri; } }); - instantiationService.stub(INextEditorService, 'activeTextEditorWidget', codeEditor); + instantiationService.stub(IEditorService, 'activeEditor', { getResource: () => { return codeEditor.getModel().uri; } }); + instantiationService.stub(IEditorService, 'activeTextEditorWidget', codeEditor); testObject = instantiationService.createInstance(RangeHighlightDecorations); }); diff --git a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts index 9240120ed1b..567ed861dae 100644 --- a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts +++ b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts @@ -9,12 +9,12 @@ import 'vs/workbench/parts/search/electron-browser/search.contribution'; // load import * as assert from 'assert'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { createSyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { ISearchService } from 'vs/platform/search/common/search'; import { ITelemetryService, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry'; import { IExperimentService, IExperiments } from 'vs/platform/telemetry/common/experiments'; import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as minimist from 'minimist'; import * as path from 'path'; import { IQuickOpenRegistry, Extensions } from 'vs/workbench/browser/quickopen'; @@ -76,8 +76,8 @@ suite.skip('QuickOpen performance (integration)', () => { [IConfigurationService, configurationService], [IModelService, new ModelServiceImpl(null, configurationService)], [IWorkspaceContextService, new TestContextService(testWorkspace(URI.file(testWorkspacePath)))], - [INextEditorService, new TestEditorService()], - [INextEditorGroupsService, new TestEditorGroupsService()], + [IEditorService, new TestEditorService()], + [IEditorGroupsService, new TestEditorGroupsService()], [IEnvironmentService, TestEnvironmentService], [IUntitledEditorService, createSyncDescriptor(UntitledEditorService)], [ISearchService, createSyncDescriptor(SearchService)] diff --git a/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts index 6b1e7ae4539..558087443f5 100644 --- a/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts +++ b/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts @@ -10,11 +10,11 @@ import * as assert from 'assert'; import * as fs from 'fs'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { createSyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; -import { INextEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { ISearchService, IQueryOptions } from 'vs/platform/search/common/search'; import { ITelemetryService, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry'; import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; -import { INextEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as minimist from 'minimist'; import * as path from 'path'; import { SearchService } from 'vs/workbench/services/search/node/searchService'; @@ -64,8 +64,8 @@ suite.skip('TextSearch performance (integration)', () => { [IConfigurationService, configurationService], [IModelService, new ModelServiceImpl(null, configurationService)], [IWorkspaceContextService, new TestContextService(testWorkspace(URI.file(testWorkspacePath)))], - [INextEditorService, new TestEditorService()], - [INextEditorGroupsService, new TestEditorGroupsService()], + [IEditorService, new TestEditorService()], + [IEditorGroupsService, new TestEditorGroupsService()], [IEnvironmentService, TestEnvironmentService], [IUntitledEditorService, createSyncDescriptor(UntitledEditorService)], [ISearchService, createSyncDescriptor(SearchService)], diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index 1a44ca8223e..471d96ed063 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -66,8 +66,8 @@ import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensi import { IKeybindingService } from '../../platform/keybinding/common/keybinding'; import { IDecorationsService, IResourceDecorationChangeEvent, IDecoration, IDecorationData, IDecorationsProvider } from 'vs/workbench/services/decorations/browser/decorations'; import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -import { INextEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IAddGroupOptions, IMergeGroupOptions, IMoveEditorOptions, ICopyEditorOptions, IEditorReplacement, IGroupChangeEvent, EditorsOrder, IFindGroupScope } from 'vs/workbench/services/group/common/editorGroupsService'; -import { INextEditorService, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService'; +import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IAddGroupOptions, IMergeGroupOptions, IMoveEditorOptions, ICopyEditorOptions, IEditorReplacement, IGroupChangeEvent, EditorsOrder, IFindGroupScope } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IEditorService, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService'; import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser'; import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon'; @@ -272,9 +272,9 @@ export function workbenchInstantiationService(): IInstantiationService { instantiationService.stub(IEnvironmentService, TestEnvironmentService); instantiationService.stub(IThemeService, new TestThemeService()); instantiationService.stub(IHashService, new TestHashService()); - instantiationService.stub(INextEditorGroupsService, new TestEditorGroupsService([new TestEditorGroup(0)])); + instantiationService.stub(IEditorGroupsService, new TestEditorGroupsService([new TestEditorGroup(0)])); const editorService = new TestEditorService(); - instantiationService.stub(INextEditorService, editorService); + instantiationService.stub(IEditorService, editorService); instantiationService.stub(ICodeEditorService, new TestCodeEditorService()); return instantiationService; @@ -492,7 +492,7 @@ export class TestStorageService implements IStorageService { } } -export class TestEditorGroupsService implements INextEditorGroupsService { +export class TestEditorGroupsService implements IEditorGroupsService { _serviceBrand: ServiceIdentifier; constructor(public groups: TestEditorGroup[] = []) { } @@ -649,7 +649,7 @@ export class TestEditorGroup implements IEditorGroup { } } -export class TestEditorService implements INextEditorService { +export class TestEditorService implements IEditorService { _serviceBrand: ServiceIdentifier;