From 470820229b4c23ea7ac78d6f80b8f7a4c2fc40eb Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 12 Dec 2016 11:02:42 +0100 Subject: [PATCH] move quick open service, #15558 --- .../contrib/suggest/electron-browser/snippetCompletion.ts | 2 +- .../quickOpen/common/quickOpen.ts} | 0 src/vs/test/utils/servicesTestUtils.ts | 4 ++-- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- src/vs/workbench/api/node/mainThreadQuickOpen.ts | 2 +- src/vs/workbench/browser/parts/editor/editorActions.ts | 2 +- src/vs/workbench/browser/parts/editor/editorStatus.ts | 4 ++-- src/vs/workbench/browser/parts/editor/tabsTitleControl.ts | 4 ++-- src/vs/workbench/browser/parts/editor/titleControl.ts | 2 +- .../workbench/browser/parts/quickopen/quickOpenController.ts | 4 ++-- .../browser/parts/quickopen/quickopen.contribution.ts | 4 ++-- src/vs/workbench/browser/quickopen.ts | 4 ++-- src/vs/workbench/electron-browser/actions.ts | 2 +- src/vs/workbench/electron-browser/workbench.ts | 4 ++-- .../workbench/parts/debug/node/debugConfigurationManager.ts | 2 +- .../parts/emmet/browser/actions/showEmmetCommands.ts | 2 +- src/vs/workbench/parts/emmet/node/actions/base64.ts | 2 +- src/vs/workbench/parts/emmet/node/actions/updateTag.ts | 2 +- .../parts/emmet/node/actions/wrapWithAbbreviation.ts | 2 +- src/vs/workbench/parts/files/browser/fileActions.ts | 4 ++-- src/vs/workbench/parts/git/browser/gitActions.ts | 2 +- src/vs/workbench/parts/git/browser/gitQuickOpen.ts | 2 +- src/vs/workbench/parts/git/browser/gitWidgets.ts | 4 ++-- src/vs/workbench/parts/git/electron-browser/gitActions.ts | 2 +- src/vs/workbench/parts/indentation/common/indentation.ts | 2 +- src/vs/workbench/parts/quickopen/browser/commandsHandler.ts | 2 +- src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts | 4 ++-- src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts | 4 ++-- src/vs/workbench/parts/quickopen/browser/helpHandler.ts | 4 ++-- src/vs/workbench/parts/search/browser/search.contribution.ts | 4 ++-- .../parts/snippets/electron-browser/snippets.contribution.ts | 2 +- src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts | 4 ++-- src/vs/workbench/parts/tasks/common/taskTemplates.ts | 4 ++-- .../parts/tasks/electron-browser/task.contribution.ts | 2 +- .../parts/themes/electron-browser/themes.contribution.ts | 2 +- .../workbench/parts/viewpicker/browser/viewPickerHandler.ts | 4 ++-- 36 files changed, 51 insertions(+), 51 deletions(-) rename src/vs/{workbench/services/quickopen/common/quickOpenService.ts => platform/quickOpen/common/quickOpen.ts} (100%) diff --git a/src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts b/src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts index 247f143457e..2d2e67b7a4f 100644 --- a/src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts +++ b/src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts @@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { ICommonCodeEditor, EditorContextKeys } from 'vs/editor/common/editorCommon'; import { editorAction, ServicesAccessor, EditorAction } from 'vs/editor/common/editorCommonExtensions'; import { SnippetController } from 'vs/editor/contrib/snippet/common/snippetController'; -import { IQuickOpenService, IPickOpenEntry } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen'; import { ISnippetsRegistry, Extensions, ISnippet } from 'vs/editor/common/modes/snippetsRegistry'; interface ISnippetPick extends IPickOpenEntry { diff --git a/src/vs/workbench/services/quickopen/common/quickOpenService.ts b/src/vs/platform/quickOpen/common/quickOpen.ts similarity index 100% rename from src/vs/workbench/services/quickopen/common/quickOpenService.ts rename to src/vs/platform/quickOpen/common/quickOpen.ts diff --git a/src/vs/test/utils/servicesTestUtils.ts b/src/vs/test/utils/servicesTestUtils.ts index 9e58d5fc206..635f1df4aa9 100644 --- a/src/vs/test/utils/servicesTestUtils.ts +++ b/src/vs/test/utils/servicesTestUtils.ts @@ -21,7 +21,7 @@ import Severity from 'vs/base/common/severity'; import { IBackupModelService, IBackupFileService, IBackupResult } from 'vs/workbench/services/backup/common/backup'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService'; import { ITextModelResolverService } from 'vs/editor/common/services/resolverService'; @@ -734,4 +734,4 @@ export function onError(error: Error, done: () => void): void { export function toResource(path) { return URI.file(paths.join('C:\\', new Buffer(this.test.fullTitle()).toString('base64'), path)); -} \ No newline at end of file +} diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index c22d192f2ee..4fd0df5a734 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -31,7 +31,7 @@ import { IResourceEdit } from 'vs/editor/common/services/bulkEdit'; import { ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing'; import { IWorkspaceConfigurationValues } from 'vs/workbench/services/configuration/common/configuration'; -import { IPickOpenEntry, IPickOptions } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen'; import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles'; import { IWorkspaceSymbol } from 'vs/workbench/parts/search/common/search'; import { IApplyEditsOptions, TextEditorRevealType, ITextEditorConfigurationUpdate, IResolvedTextEditorConfiguration, ISelectionChangeEvent } from './mainThreadEditorsTracker'; diff --git a/src/vs/workbench/api/node/mainThreadQuickOpen.ts b/src/vs/workbench/api/node/mainThreadQuickOpen.ts index 801cfc9649a..8207bf31ab7 100644 --- a/src/vs/workbench/api/node/mainThreadQuickOpen.ts +++ b/src/vs/workbench/api/node/mainThreadQuickOpen.ts @@ -7,7 +7,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { asWinJsPromise } from 'vs/base/common/async'; import { IThreadService } from 'vs/workbench/services/thread/common/threadService'; -import { IQuickOpenService, IPickOptions, IInputOptions } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IPickOptions, IInputOptions } from 'vs/platform/quickOpen/common/quickOpen'; import { InputBoxOptions } from 'vscode'; import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems } from './extHost.protocol'; diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index dbd55bb1081..cdf02f2d412 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -13,7 +13,7 @@ import { EditorInput, getUntitledOrFileResource, TextEditorOptions, EditorOption import { QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { EditorQuickOpenEntry, EditorQuickOpenEntryGroup, IEditorQuickOpenEntry, QuickOpenAction } from 'vs/workbench/browser/quickopen'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { Position, IEditor, Direction, IResourceInput, IEditorInput } from 'vs/platform/editor/common/editor'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 3369d39e7b9..cd564410ea7 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -32,7 +32,7 @@ import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/bina import { BinaryResourceDiffEditor } from 'vs/workbench/browser/parts/editor/binaryDiffEditor'; import { IEditor as IBaseEditor } from 'vs/platform/editor/common/editor'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IQuickOpenService, IPickOpenEntry, IFilePickOpenEntry } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IPickOpenEntry, IFilePickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { IFilesConfiguration, SUPPORTED_ENCODINGS } from 'vs/platform/files/common/files'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -1095,4 +1095,4 @@ export class ChangeEncodingAction extends Action { }); }); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 3f1a898404f..9997234119d 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -30,7 +30,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IMenuService } from 'vs/platform/actions/common/actions'; import { IWindowService } from 'vs/platform/windows/common/windows'; import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; @@ -609,4 +609,4 @@ export class TabsTitleControl extends TitleControl { return !isCopy || source.id === target.id; } -} \ No newline at end of file +} diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts index e06058ec951..bd99c74ca3b 100644 --- a/src/vs/workbench/browser/parts/editor/titleControl.ts +++ b/src/vs/workbench/browser/parts/editor/titleControl.ts @@ -29,7 +29,7 @@ import { IMessageService, Severity } from 'vs/platform/message/common/message'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { Keybinding } from 'vs/base/common/keyCodes'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 5f79da38305..33f6a59e041 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -39,7 +39,7 @@ import { KeyMod } from 'vs/base/common/keyCodes'; import { QuickOpenHandler, QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions, EditorQuickOpenEntry } from 'vs/workbench/browser/quickopen'; import errors = require('vs/base/common/errors'); import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IPickOpenEntry, IFilePickOpenEntry, IInputOptions, IQuickOpenService, IPickOptions, IShowOptions } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IPickOpenEntry, IFilePickOpenEntry, IInputOptions, IQuickOpenService, IPickOptions, IShowOptions } from 'vs/platform/quickOpen/common/quickOpen'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; @@ -1191,4 +1191,4 @@ export class RemoveFromEditorHistoryAction extends Action { } }); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts index f632e3efc78..bf94a5630f5 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts @@ -8,7 +8,7 @@ import { Registry } from 'vs/platform/platform'; import { TPromise } from 'vs/base/common/winjs.base'; import nls = require('vs/nls'); import { Action } from 'vs/base/common/actions'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IKeybindingService, IKeybindings } from 'vs/platform/keybinding/common/keybinding'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; @@ -154,4 +154,4 @@ const registry = Registry.as(ActionExtensions.Workbenc registry.registerWorkbenchAction(new SyncActionDescriptor(GlobalQuickOpenAction, GlobalQuickOpenAction.ID, GlobalQuickOpenAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_P, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_E], mac: { primary: KeyMod.CtrlCmd | KeyCode.KEY_P, secondary: null } }), 'Go to File...'); registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenNavigateNextAction, QuickOpenNavigateNextAction.ID, QuickOpenNavigateNextAction.LABEL, navigateKeybinding(false), condition, KeybindingsRegistry.WEIGHT.workbenchContrib(50)), 'Navigate Next in Quick Open'); registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenNavigatePreviousAction, QuickOpenNavigatePreviousAction.ID, QuickOpenNavigatePreviousAction.LABEL, navigateKeybinding(true), condition, KeybindingsRegistry.WEIGHT.workbenchContrib(50)), 'Navigate Previous in Quick Open'); -registry.registerWorkbenchAction(new SyncActionDescriptor(RemoveFromEditorHistoryAction, RemoveFromEditorHistoryAction.ID, RemoveFromEditorHistoryAction.LABEL), 'Remove From History'); \ No newline at end of file +registry.registerWorkbenchAction(new SyncActionDescriptor(RemoveFromEditorHistoryAction, RemoveFromEditorHistoryAction.ID, RemoveFromEditorHistoryAction.LABEL), 'Remove From History'); diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts index 9bc3f88cd3e..1281c2e600b 100644 --- a/src/vs/workbench/browser/quickopen.ts +++ b/src/vs/workbench/browser/quickopen.ts @@ -20,7 +20,7 @@ import { QuickOpenEntry, IHighlight, QuickOpenEntryGroup, QuickOpenModel } from import { EditorOptions, EditorInput } from 'vs/workbench/common/editor'; import { IResourceInput, IEditorInput, IEditorOptions } from 'vs/platform/editor/common/editor'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { AsyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; export class QuickOpenHandler { @@ -435,4 +435,4 @@ export class QuickOpenAction extends Action { return TPromise.as(null); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index a104f8394bb..c6cf5e12e93 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -26,7 +26,7 @@ import { IWorkspaceConfigurationService } from 'vs/workbench/services/configurat import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import paths = require('vs/base/common/paths'); import { isMacintosh, isLinux } from 'vs/base/common/platform'; -import { IQuickOpenService, IFilePickOpenEntry, ISeparator } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IFilePickOpenEntry, ISeparator } from 'vs/platform/quickOpen/common/quickOpen'; import { KeyMod } from 'vs/base/common/keyCodes'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import * as browser from 'vs/base/browser/browser'; diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 8f9dbdbc8b3..43b83b22489 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -67,7 +67,7 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { ITitleService } from 'vs/workbench/services/title/common/titleService'; import { WorkbenchMessageService } from 'vs/workbench/services/message/browser/messageService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { IHistoryService } from 'vs/workbench/services/history/common/history'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -1094,4 +1094,4 @@ export class Workbench implements IPartService { return restore; } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts index 9911311f821..fa146ff5113 100644 --- a/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts @@ -25,7 +25,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import * as debug from 'vs/workbench/parts/debug/common/debug'; import { Adapter } from 'vs/workbench/parts/debug/node/debugAdapter'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver'; // debuggers extension point diff --git a/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts b/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts index 4fb85b9aa66..ba0bb893893 100644 --- a/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts +++ b/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts @@ -12,7 +12,7 @@ import { Registry } from 'vs/platform/platform'; import { QuickOpenAction } from 'vs/workbench/browser/quickopen'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actionRegistry'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; const EMMET_COMMANDS_PREFIX = '>Emmet: '; diff --git a/src/vs/workbench/parts/emmet/node/actions/base64.ts b/src/vs/workbench/parts/emmet/node/actions/base64.ts index 25ba1f56690..da12037477e 100644 --- a/src/vs/workbench/parts/emmet/node/actions/base64.ts +++ b/src/vs/workbench/parts/emmet/node/actions/base64.ts @@ -17,7 +17,7 @@ import { Action } from 'vs/base/common/actions'; import { ServicesAccessor, editorAction } from 'vs/editor/common/editorCommonExtensions'; import { EditorContextKeys } from 'vs/editor/common/editorCommon'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; -import { IQuickOpenService, IInputOptions } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IInputOptions } from 'vs/platform/quickOpen/common/quickOpen'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; @editorAction diff --git a/src/vs/workbench/parts/emmet/node/actions/updateTag.ts b/src/vs/workbench/parts/emmet/node/actions/updateTag.ts index dc5574dc471..088d3cb2fff 100644 --- a/src/vs/workbench/parts/emmet/node/actions/updateTag.ts +++ b/src/vs/workbench/parts/emmet/node/actions/updateTag.ts @@ -10,7 +10,7 @@ import { EmmetEditorAction, EmmetActionContext } from 'vs/workbench/parts/emmet/ import { ServicesAccessor, editorAction } from 'vs/editor/common/editorCommonExtensions'; import { EditorContextKeys } from 'vs/editor/common/editorCommon'; -import { IQuickOpenService, IInputOptions } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IInputOptions } from 'vs/platform/quickOpen/common/quickOpen'; @editorAction class UpdateTagAction extends EmmetEditorAction { diff --git a/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.ts b/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.ts index d5de3b91f73..1588944abc3 100644 --- a/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.ts +++ b/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.ts @@ -10,7 +10,7 @@ import { EmmetEditorAction, EmmetActionContext } from 'vs/workbench/parts/emmet/ import { ServicesAccessor, editorAction } from 'vs/editor/common/editorCommonExtensions'; import { EditorContextKeys } from 'vs/editor/common/editorCommon'; -import { IQuickOpenService, IInputOptions } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IInputOptions } from 'vs/platform/quickOpen/common/quickOpen'; @editorAction class WrapWithAbbreviationAction extends EmmetEditorAction { diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index 4428cc1b8ff..bf2c58ea514 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -38,7 +38,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi import { CollapseAction } from 'vs/workbench/browser/viewlet'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; -import { IQuickOpenService, IFilePickOpenEntry } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IFilePickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen'; import { IHistoryService } from 'vs/workbench/services/history/common/history'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { Position, IResourceInput, IEditorInput } from 'vs/platform/editor/common/editor'; @@ -1950,4 +1950,4 @@ if (!diag) { diag = diagnostics.register('FileActionsDiagnostics', function (...args: any[]) { console.log(args[1] + ' - ' + args[0] + ' (time: ' + args[2].getTime() + ' [' + args[2].toUTCString() + '])'); }); -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/git/browser/gitActions.ts b/src/vs/workbench/parts/git/browser/gitActions.ts index ac0490f7f13..df35804473b 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.ts @@ -26,7 +26,7 @@ import { IMessageService, IConfirmation, IChoiceService } from 'vs/platform/mess import Severity from 'vs/base/common/severity'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IGitService, IFileStatus, Status, StatusType, ServiceState, IModel, IBranch, GitErrorCodes, IGitConfiguration } from 'vs/workbench/parts/git/common/git'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import paths = require('vs/base/common/paths'); import URI from 'vs/base/common/uri'; import { IConfigurationEditingService, ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing'; diff --git a/src/vs/workbench/parts/git/browser/gitQuickOpen.ts b/src/vs/workbench/parts/git/browser/gitQuickOpen.ts index 9f994f935a4..5be7b525ebf 100644 --- a/src/vs/workbench/parts/git/browser/gitQuickOpen.ts +++ b/src/vs/workbench/parts/git/browser/gitQuickOpen.ts @@ -12,7 +12,7 @@ import { IGitService, RefType, IRef } from 'vs/workbench/parts/git/common/git'; import { ICommand, CommandQuickOpenHandler } from 'vs/workbench/browser/quickopen'; import { Mode } from 'vs/base/parts/quickopen/common/quickOpen'; import { QuickOpenEntry, IHighlight, IContext, QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IMessageService } from 'vs/platform/message/common/message'; class AbstractRefEntry extends QuickOpenEntry { diff --git a/src/vs/workbench/parts/git/browser/gitWidgets.ts b/src/vs/workbench/parts/git/browser/gitWidgets.ts index e26cb98cf47..1c2c904e725 100644 --- a/src/vs/workbench/parts/git/browser/gitWidgets.ts +++ b/src/vs/workbench/parts/git/browser/gitWidgets.ts @@ -11,7 +11,7 @@ import { IAction } from 'vs/base/common/actions'; import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle'; import { IGitService, ServiceState, IBranch, ServiceOperations, IRemote } from 'vs/workbench/parts/git/common/git'; import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { SyncAction, PublishAction } from './gitActions'; @@ -206,4 +206,4 @@ export class GitStatusbarItem implements IStatusbarItem { action.run() .done(null, err => this.messageService.show(Severity.Error, err)); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/git/electron-browser/gitActions.ts b/src/vs/workbench/parts/git/electron-browser/gitActions.ts index 379c3b0bf8e..d7e73af18db 100644 --- a/src/vs/workbench/parts/git/electron-browser/gitActions.ts +++ b/src/vs/workbench/parts/git/electron-browser/gitActions.ts @@ -13,7 +13,7 @@ import { IWindowsService } from 'vs/platform/windows/common/windows'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import Severity from 'vs/base/common/severity'; import { IGitService } from 'vs/workbench/parts/git/common/git'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import * as url from 'url'; import { remote } from 'electron'; diff --git a/src/vs/workbench/parts/indentation/common/indentation.ts b/src/vs/workbench/parts/indentation/common/indentation.ts index 91b6bb9dee5..91781683e14 100644 --- a/src/vs/workbench/parts/indentation/common/indentation.ts +++ b/src/vs/workbench/parts/indentation/common/indentation.ts @@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { ICommonCodeEditor, EditorContextKeys } from 'vs/editor/common/editorCommon'; import { editorAction, ServicesAccessor, IActionOptions, EditorAction } from 'vs/editor/common/editorCommonExtensions'; import { IndentationToSpacesCommand, IndentationToTabsCommand } from 'vs/workbench/parts/indentation/common/indentationCommands'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IModelService } from 'vs/editor/common/services/modelService'; @editorAction diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 70ce732ac4a..6235236e1ff 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -26,7 +26,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IMessageService, Severity, IMessageWithAction } from 'vs/platform/message/common/message'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; export const ALL_COMMANDS_PREFIX = '>'; export const EDITOR_COMMANDS_PREFIX = '$'; diff --git a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts index 8c421c897e9..e8e214ed37b 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts @@ -15,7 +15,7 @@ import { QuickOpenHandler, EditorQuickOpenEntry, QuickOpenAction } from 'vs/work import { IEditor, IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDeltaDecoration, IRange, IEditorViewState, ITextModel, IDiffEditorModel } from 'vs/editor/common/editorCommon'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Position, IEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; export const GOTO_LINE_PREFIX = ':'; @@ -278,4 +278,4 @@ export class GotoLineHandler extends QuickOpenHandler { autoFocusFirstEntry: searchValue.trim().length > 0 }; } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index 3be447ebe8b..2fd0a3099d7 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -18,7 +18,7 @@ import filters = require('vs/base/common/filters'); import { KeyMod } from 'vs/base/common/keyCodes'; import { IEditor, IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDeltaDecoration, IRange, IModel, ITokenizedModel, IDiffEditorModel, IEditorViewState } from 'vs/editor/common/editorCommon'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { Position, IEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor'; import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/common/quickOpen'; import { DocumentSymbolProviderRegistry, SymbolInformation, SymbolKind } from 'vs/editor/common/modes'; @@ -584,4 +584,4 @@ export class GotoSymbolHandler extends QuickOpenHandler { this.lastKnownEditorViewState = null; this.activeOutlineRequest = null; } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts index 58d1dc4e674..539f5cf8c26 100644 --- a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts @@ -13,7 +13,7 @@ import { Mode, IEntryRunContext, IAutoFocus } from 'vs/base/parts/quickopen/comm import { QuickOpenEntryItem, QuickOpenModel } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { ITree, IElementCallback } from 'vs/base/parts/tree/browser/tree'; import { IQuickOpenRegistry, Extensions, QuickOpenHandler } from 'vs/workbench/browser/quickopen'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; export const HELP_PREFIX = '?'; @@ -186,4 +186,4 @@ export class HelpHandler extends QuickOpenHandler { autoFocusPrefixMatch: searchValue }; } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/search/browser/search.contribution.ts b/src/vs/workbench/parts/search/browser/search.contribution.ts index 5d3c3b8253c..488916d9fea 100644 --- a/src/vs/workbench/parts/search/browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/browser/search.contribution.ts @@ -21,7 +21,7 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { AsyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import * as searchActions from 'vs/workbench/parts/search/browser/searchActions'; @@ -209,4 +209,4 @@ configurationRegistry.registerConfiguration({ 'default': false } } -}); \ No newline at end of file +}); diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts b/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts index 695e9b98f9a..ef9c163a4ae 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts @@ -15,7 +15,7 @@ import workbenchContributions = require('vs/workbench/common/contributions'); import snippetsTracker = require('./snippetsTracker'); import * as pfs from 'vs/base/node/pfs'; import errors = require('vs/base/common/errors'); -import { IQuickOpenService, IPickOpenEntry } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; diff --git a/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts b/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts index e735f7ba4b1..ca97dbfc3bf 100644 --- a/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts +++ b/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts @@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import Quickopen = require('vs/workbench/browser/quickopen'); import QuickOpen = require('vs/base/parts/quickopen/common/quickOpen'); import Model = require('vs/base/parts/quickopen/browser/quickOpenModel'); -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { ITaskService, TaskDescription } from 'vs/workbench/parts/tasks/common/taskService'; @@ -98,4 +98,4 @@ export class QuickOpenHandler extends Quickopen.QuickOpenHandler { } return nls.localize('noTasksFound', "No tasks found"); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/tasks/common/taskTemplates.ts b/src/vs/workbench/parts/tasks/common/taskTemplates.ts index 863bc4296b6..ff4f97f6bad 100644 --- a/src/vs/workbench/parts/tasks/common/taskTemplates.ts +++ b/src/vs/workbench/parts/tasks/common/taskTemplates.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; -import { IPickOpenEntry } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen'; export interface TaskEntry extends IPickOpenEntry { sort?: string; @@ -228,4 +228,4 @@ const maven: TaskEntry = { export let templates: TaskEntry[] = [gulp, grunt, tscConfig, tscWatch, dotnetBuild, msbuild, npm, maven].sort((a, b) => { return (a.sort || a.label).localeCompare(b.sort || b.label); }); -templates.push(command); \ No newline at end of file +templates.push(command); 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 40900fc4c27..f899d43672e 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -49,7 +49,7 @@ import { IWorkbenchActionRegistry, Extensions as WorkbenchActionExtensions } fro import { IStatusbarItem, IStatusbarRegistry, Extensions as StatusbarExtensions, StatusbarItemDescriptor, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import Constants from 'vs/workbench/parts/markers/common/constants'; import { IPartService } from 'vs/workbench/services/part/common/partService'; 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 e6847feba57..86fa7164ff7 100644 --- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts +++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts @@ -14,7 +14,7 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; import { Registry } from 'vs/platform/platform'; import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actionRegistry'; -import { IQuickOpenService, IPickOpenEntry } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen'; import { IThemeService } from 'vs/workbench/services/themes/common/themeService'; import { VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions'; import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement'; diff --git a/src/vs/workbench/parts/viewpicker/browser/viewPickerHandler.ts b/src/vs/workbench/parts/viewpicker/browser/viewPickerHandler.ts index a6dbddd351f..aec5fcdff03 100644 --- a/src/vs/workbench/parts/viewpicker/browser/viewPickerHandler.ts +++ b/src/vs/workbench/parts/viewpicker/browser/viewPickerHandler.ts @@ -18,7 +18,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IOutputService, Extensions as OutputExtensions, IOutputChannelRegistry, OUTPUT_PANEL_ID } from 'vs/workbench/parts/output/common/output'; import { ITerminalService, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; -import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; +import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { Action } from 'vs/base/common/actions'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; @@ -209,4 +209,4 @@ export class QuickOpenViewPickerAction extends Action { return TPromise.as(true); } -} \ No newline at end of file +}