diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index a0c90b7e0ca0ebde89395583cb89fd139fcfbe98..494566ecb4a42a4ea8fb915d385316eb93b3b1b8 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -10,7 +10,7 @@ import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickO import { Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation } from 'vs/base/browser/ui/sash/sash'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IPartService, Position, ILayoutOptions, Parts } from 'vs/workbench/services/part/common/partService'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IEventService } from 'vs/platform/event/common/event'; diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index 3593e3edd614cab06c568077057ef3c25533ad53..b6bfd38b3236ce8bb9cc07072c351f037a910af3 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -16,7 +16,7 @@ import { IComposite } from 'vs/workbench/common/composite'; import { ViewletDescriptor } from 'vs/workbench/browser/viewlet'; import { Part } from 'vs/workbench/browser/part'; import { ActivityAction, ActivityActionItem } from 'vs/workbench/browser/parts/activitybar/activityAction'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IActivityService, IBadge } from 'vs/workbench/services/activity/common/activityService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; 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 ed4cef92d8b3ac4dca85953c42ae32dbc1c68c4f..5afe660386d9f1ac9b776d1ec594349f0d0554d0 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -46,7 +46,7 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer import { TabFocus } from 'vs/editor/common/config/commonEditorConfig'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions'; function getCodeEditor(editorWidget: IEditor): ICommonCodeEditor { diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index 2efc51e4ee24ca46168afc2b304093ccd0fb753d..9747ef46c13345ec74675ebe104f9f937ca70f39 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -12,7 +12,7 @@ import { CompositePart } from 'vs/workbench/browser/parts/compositePart'; import { Viewlet, ViewletRegistry, Extensions as ViewletExtensions } from 'vs/workbench/browser/viewlet'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actionRegistry'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { IViewlet } from 'vs/workbench/common/viewlet'; import { Scope } from 'vs/workbench/browser/actionBarRegistry'; diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index 9d5f083266e94f455fea565f93a33f4cf13f73ce..7558f79bea9f7ebb1b465d00b3bd43a51073744d 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -17,7 +17,7 @@ import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar'; import { DelayedDragHandler } from 'vs/base/browser/dnd'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { CollapsibleView, CollapsibleState, FixedCollapsibleView, IView } from 'vs/base/browser/ui/splitview/splitview'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IViewlet } from 'vs/workbench/common/viewlet'; import { Composite, CompositeDescriptor, CompositeRegistry } from 'vs/workbench/browser/composite'; diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 1a44448eb5ab8a02ad0dc1d0f37bdea66665cfd6..375b7e693f12194515ebc89189a48ea0709e38ef 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -55,7 +55,8 @@ import { IWorkspace } from 'vs/platform/workspace/common/workspace'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ContextKeyExpr, RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IActivityService } from 'vs/workbench/services/activity/common/activityService'; -import { IViewletService, ViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; +import { ViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; import { IFileService } from 'vs/platform/files/common/files'; import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver'; diff --git a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts index 6b94ec829fa12247231acd92c989cd327ae7024f..4196b78b1703d0debd658e760d5cc24f2e9c73e4 100644 --- a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts +++ b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts @@ -15,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID } from 'vs/workbench/parts/debug/common/debug'; import { BreakpointWidget } from 'vs/workbench/parts/debug/browser/breakpointWidget'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; @editorAction class ToggleBreakpointAction extends EditorAction { 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 7431a96f23d3c144aed78e7e14279e3169e65bd7..465f707c1d86fbbc280c0cfb61764fc6fc283110 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts @@ -35,7 +35,7 @@ import service = require('vs/workbench/parts/debug/electron-browser/debugService import { DebugErrorEditorInput } from 'vs/workbench/parts/debug/browser/debugEditorInputs'; import { DebugErrorEditor } from 'vs/workbench/parts/debug/browser/debugErrorEditor'; import 'vs/workbench/parts/debug/electron-browser/debugEditorContribution'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 9a998c2d0f401a3dee8f2468e674b82216c9eead..1659718dc1ca357bd17395019f60246da7f2ae39 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -45,7 +45,7 @@ import { Source } from 'vs/workbench/parts/debug/common/debugSource'; import { ITaskService, TaskEvent, TaskType, TaskServiceEvents, ITaskSummary } from 'vs/workbench/parts/tasks/common/taskService'; import { TaskError, TaskErrors } from 'vs/workbench/parts/tasks/common/taskSystem'; import { VIEWLET_ID as EXPLORER_VIEWLET_ID } from 'vs/workbench/parts/files/common/files'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; diff --git a/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.ts b/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.ts index dd794bb7304956ea62466a47104356bea935148e..7bc3b59aedc19073220da382656552e49f56eb69 100644 --- a/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.ts +++ b/src/vs/workbench/parts/explorers/browser/treeExplorerActions.contribution.ts @@ -12,7 +12,7 @@ import { ViewletRegistry, Extensions as ViewletExtensions } from 'vs/workbench/b import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { Action } from 'vs/base/common/actions'; import { IQuickOpenService, IPickOpenEntry } from 'vs/workbench/services/quickopen/common/quickOpenService'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { toCustomExplorerViewletActionId } from 'vs/workbench/parts/explorers/common/treeExplorer'; const registry = Registry.as(ActionExtensions.WorkbenchActions); diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts index cb8a2637c34a65c30de833bc81db0cfb3190f55d..24f85a5f3f1c831a55e0a81dda2ad7f87e8e6040 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts @@ -21,7 +21,7 @@ import { Builder } from 'vs/base/browser/builder'; import { domEvent } from 'vs/base/browser/event'; import { append, $, addClass, removeClass, finalHandler, join } from 'vs/base/browser/dom'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IExtensionGalleryService, IExtensionManifest, IKeyBinding } from 'vs/platform/extensionManagement/common/extensionManagement'; diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts index d52d4bc3ccdf16a607c1b05a4ae285770bd9855d..43178cb117a736047c777a743edab62cbf9a1200 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts @@ -21,7 +21,7 @@ import { LocalExtensionType, IExtensionEnablementService } from 'vs/platform/ext import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IMessageService } from 'vs/platform/message/common/message'; import { ToggleViewletAction } from 'vs/workbench/browser/viewlet'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Query } from 'vs/workbench/parts/extensions/common/extensionQuery'; import { IFileService } from 'vs/platform/files/common/files'; diff --git a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts index 1e5f89ff73146c13ab1268add7ff035e7a2d324d..db0612bd1f855c46e7ba979c224acffc11dfad8d 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts @@ -9,7 +9,7 @@ import { IAutoFocus, Mode, IModel } from 'vs/base/parts/quickopen/common/quickOp import { QuickOpenEntry, QuickOpenModel } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { QuickOpenHandler } from 'vs/workbench/browser/quickopen'; import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; class SimpleEntry extends QuickOpenEntry { diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts index 2b8c2b03789775f6ccff346a301c51f807418012..a6840d64add96385a59720b5c617c54719c3b4f0 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts @@ -22,7 +22,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; import { Viewlet } from 'vs/workbench/browser/viewlet'; import { IViewlet } from 'vs/workbench/common/viewlet'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { append, $, addStandardDisposableListener, EventType, addClass, removeClass, toggleClass } from 'vs/base/browser/dom'; import { PagedModel, IPagedModel } from 'vs/base/common/paging'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts index 0f07530cf7e2cf49641f6496afe99f406220e053..3e9fbdf5a4adbc66cb02c31a097eaa2655d7379b 100644 --- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts +++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts @@ -21,7 +21,7 @@ import { EditorOptions, TextEditorOptions } from 'vs/workbench/common/editor'; import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel'; import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput'; import { ExplorerViewlet } from 'vs/workbench/parts/files/browser/explorerViewlet'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IFileOperationResult, FileOperationResult, FileChangesEvent, EventType, IFileService } from 'vs/platform/files/common/files'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index 884f92a6d8ff675052e0a7010e966c031f625fc7..c654aba4d432eb680ad8390f68111befc5553378 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -41,7 +41,7 @@ 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 { IHistoryService } from 'vs/workbench/services/history/common/history'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { Position, IResourceInput, IEditorInput } from 'vs/platform/editor/common/editor'; import { IEventService } from 'vs/platform/event/common/event'; import { IInstantiationService, IConstructorSignature2 } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/workbench/parts/files/browser/files.contribution.ts b/src/vs/workbench/parts/files/browser/files.contribution.ts index 8e81dec1b7f4c4c3ce3a3d023bcca964619ba680..8a3ba6c027e54c6d8a360178ade90948c0105818 100644 --- a/src/vs/workbench/parts/files/browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/browser/files.contribution.ts @@ -27,7 +27,7 @@ import { BinaryFileEditor } from 'vs/workbench/parts/files/browser/editors/binar import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { SyncDescriptor, AsyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { IKeybindings } from 'vs/platform/keybinding/common/keybinding'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import * as platform from 'vs/base/common/platform'; diff --git a/src/vs/workbench/parts/files/browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/browser/views/openEditorsView.ts index 81b871830cc5622aa704d58ac03cf5732342c391..da4f9b5e8d49defd715cb22b51f59870c74b1eea 100644 --- a/src/vs/workbench/parts/files/browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/browser/views/openEditorsView.ts @@ -21,7 +21,7 @@ import { SaveAllAction } from 'vs/workbench/parts/files/browser/fileActions'; import { AdaptiveCollapsibleViewletView } from 'vs/workbench/browser/viewlet'; import { IFilesConfiguration, VIEWLET_ID } from 'vs/workbench/parts/files/common/files'; import { ITextFileService, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { Renderer, DataSource, Controller, AccessibilityProvider, ActionProvider, OpenEditor, DragAndDrop } from 'vs/workbench/parts/files/browser/views/openEditorsViewer'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { CloseAllEditorsAction } from 'vs/workbench/browser/parts/editor/editorActions'; diff --git a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts index 8aa693b2f926ce0551bf01b52a01ca314841385b..3a39da30bffae5c1e8c447010ad70315ea462850 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts @@ -21,7 +21,7 @@ import { IGitService, Status, IFileStatus, StatusType } from 'vs/workbench/parts import gitei = require('vs/workbench/parts/git/browser/gitEditorInputs'); import { getSelectedChanges, applyChangesToModel } from 'vs/workbench/parts/git/common/stageRanges'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IPartService, Parts } from 'vs/workbench/services/part/common/partService'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IFileService } from 'vs/platform/files/common/files'; diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts index 9eca29e8d293a4ec478d18215262f01973816561..32d184db3d6188168c9bbcf2a5e86e5560eaf15b 100644 --- a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts +++ b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts @@ -33,7 +33,7 @@ import { IEventService } from 'vs/platform/event/common/event'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IMessageService } from 'vs/platform/message/common/message'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { IModelService } from 'vs/editor/common/services/modelService'; diff --git a/src/vs/workbench/parts/search/browser/search.contribution.ts b/src/vs/workbench/parts/search/browser/search.contribution.ts index b563e0c3e44d43682f2ac971721fb19cbcd47bf4..5d3c3b8253cd07333115bb16154d3a9aa5cb54ae 100644 --- a/src/vs/workbench/parts/search/browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/browser/search.contribution.ts @@ -22,7 +22,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti 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 { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +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'; import * as Constants from 'vs/workbench/parts/search/common/constants'; diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts index 8376ad1c4351adebd82d33807559bdba8437c293..32f9548241f0e9f7bac34ecaff83a99e30124cd5 100644 --- a/src/vs/workbench/parts/search/browser/searchActions.ts +++ b/src/vs/workbench/parts/search/browser/searchActions.ts @@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; import { Action } from 'vs/base/common/actions'; import { ToggleViewletAction } from 'vs/workbench/browser/viewlet'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { INavigator } from 'vs/base/common/iterator'; import { SearchViewlet } from 'vs/workbench/parts/search/browser/searchViewlet'; diff --git a/src/vs/workbench/parts/search/browser/searchWidget.ts b/src/vs/workbench/parts/search/browser/searchWidget.ts index 1c6b300586601b7988a765f17f42a9550fc79446..8a9c4a9ef76f2cb1f8f049cbba82ef18c2222a62 100644 --- a/src/vs/workbench/parts/search/browser/searchWidget.ts +++ b/src/vs/workbench/parts/search/browser/searchWidget.ts @@ -22,7 +22,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import Event, { Emitter } from 'vs/base/common/event'; import { Builder } from 'vs/base/browser/builder'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { isSearchViewletFocussed, appendKeyBindingLabel } from 'vs/workbench/parts/search/browser/searchActions'; import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from 'vs/editor/contrib/find/common/findController'; import { HistoryNavigator } from 'vs/base/common/history'; 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 965d3b7210b74fb737d1306d3aa1790bbf276c7c..1d156148eb0f178da35d3ddbc654bcaca36ec0ec 100644 --- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts +++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts @@ -17,7 +17,7 @@ import { IQuickOpenService, IPickOpenEntry } from 'vs/workbench/services/quickop 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'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { Delayer } from 'vs/base/common/async'; class SelectColorThemeAction extends Action { diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts index 99a534cf5c5568a9c6f1c6193202bfd764a91909..aebb56b7a0c6a70042dacef8f712fc642de225ae 100644 --- a/src/vs/workbench/services/progress/browser/progressService.ts +++ b/src/vs/workbench/services/progress/browser/progressService.ts @@ -7,7 +7,7 @@ import lifecycle = require('vs/base/common/lifecycle'); import { TPromise } from 'vs/base/common/winjs.base'; import types = require('vs/base/common/types'); import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { IProgressService, IProgressRunner } from 'vs/platform/progress/common/progress'; diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts new file mode 100644 index 0000000000000000000000000000000000000000..6f67092961af9948524752d9ad22857b694f2d04 --- /dev/null +++ b/src/vs/workbench/services/viewlet/browser/viewlet.ts @@ -0,0 +1,60 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import { TPromise } from 'vs/base/common/winjs.base'; +import { IViewlet } from 'vs/workbench/common/viewlet'; +import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation'; +import Event from 'vs/base/common/event'; +import { ViewletDescriptor } from 'vs/workbench/browser/viewlet'; + +export const IViewletService = createDecorator('viewletService'); + +export interface IViewletService { + _serviceBrand: ServiceIdentifier; + + onDidViewletOpen: Event; + onDidViewletClose: Event; + onDidExtViewletsLoad: Event; + onDidViewletToggle: Event; + + /** + * Opens a viewlet with the given identifier and pass keyboard focus to it if specified. + */ + openViewlet(id: string, focus?: boolean): TPromise; + + /** + * Restores a viewlet during startup. + * If the viewlet to restore is external, delay restoration until extensions finish loading. + */ + restoreViewlet(id: string): TPromise; + + /** + * Toggles a viewlet with the given identifier. + */ + toggleViewlet(id: string): TPromise; + + /** + * Returns the current active viewlet or null if none. + */ + getActiveViewlet(): IViewlet; + + /** + * Returns all registered viewlets + */ + getAllViewlets(): ViewletDescriptor[]; + + /** + * Returns all viewlets that should be displayed, ordered by: + * - Stock Viewlets: order attribute + * - External Viewlets: enabling sequence + */ + getAllViewletsToDisplay(): ViewletDescriptor[]; + + /** + * Checks if an extension is enabled + */ + isViewletEnabled(id: string): boolean; +} \ No newline at end of file diff --git a/src/vs/workbench/services/viewlet/browser/viewletService.ts b/src/vs/workbench/services/viewlet/browser/viewletService.ts index 17458a23f1119ea86cd3b5d94d41962d68e80375..6bac7506a6b5daf987451d4734341fc23c41b2ca 100644 --- a/src/vs/workbench/services/viewlet/browser/viewletService.ts +++ b/src/vs/workbench/services/viewlet/browser/viewletService.ts @@ -6,7 +6,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IViewlet } from 'vs/workbench/common/viewlet'; -import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import Event, { Emitter } from 'vs/base/common/event'; import { ISidebar } from 'vs/workbench/browser/parts/sidebar/sidebarPart'; import { Registry } from 'vs/platform/platform'; @@ -14,56 +14,6 @@ import { ViewletDescriptor, ViewletRegistry, Extensions as ViewletExtensions } f import { IStorageService } from 'vs/platform/storage/common/storage'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; -export const IViewletService = createDecorator('viewletService'); - -export interface IViewletService { - _serviceBrand: ServiceIdentifier; - - onDidViewletOpen: Event; - onDidViewletClose: Event; - onDidExtViewletsLoad: Event; - onDidViewletToggle: Event; - - /** - * Opens a viewlet with the given identifier and pass keyboard focus to it if specified. - */ - openViewlet(id: string, focus?: boolean): TPromise; - - /** - * Restores a viewlet during startup. - * If the viewlet to restore is external, delay restoration until extensions finish loading. - */ - restoreViewlet(id: string): TPromise; - - /** - * Toggles a viewlet with the given identifier. - */ - toggleViewlet(id: string): TPromise; - - /** - * Returns the current active viewlet or null if none. - */ - getActiveViewlet(): IViewlet; - - /** - * Returns all registered viewlets - */ - getAllViewlets(): ViewletDescriptor[]; - - /** - * Returns all viewlets that should be displayed, ordered by: - * - Stock Viewlets: order attribute - * - External Viewlets: enabling sequence - */ - getAllViewletsToDisplay(): ViewletDescriptor[]; - - /** - * Checks if an extension is enabled - */ - isViewletEnabled(id: string): boolean; -} - - export class ViewletService implements IViewletService { public static readonly ENABLED_EXT_VIEWLETS = 'workbench.viewlet.enabledExtViewlets'; diff --git a/src/vs/workbench/test/browser/services.test.ts b/src/vs/workbench/test/browser/services.test.ts index 3140c156dcf844a5bec25aff0285f6bc7b434f5e..7a03f81c330457999698ef88c0b94d2f7036a8f0 100644 --- a/src/vs/workbench/test/browser/services.test.ts +++ b/src/vs/workbench/test/browser/services.test.ts @@ -21,7 +21,7 @@ import { Viewlet } from 'vs/workbench/browser/viewlet'; import { IPanel } from 'vs/workbench/common/panel'; import { WorkbenchProgressService, ScopedService } from 'vs/workbench/services/progress/browser/progressService'; import { DelegatingWorkbenchEditorService, WorkbenchEditorService, IEditorPart } from 'vs/workbench/services/editor/browser/editorService'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewletService'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { IViewlet } from 'vs/workbench/common/viewlet'; import { Position, Direction, IEditor } from 'vs/platform/editor/common/editor';