From 6881a5bb4cb3a2e81482c51c2677b48f3ce95136 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 11 Nov 2016 11:24:51 +0100 Subject: [PATCH] fix viewletservice properly --- src/vs/workbench/browser/layout.ts | 2 +- .../parts/activitybar/activitybarPart.ts | 2 +- .../browser/parts/editor/editorStatus.ts | 2 +- .../browser/parts/sidebar/sidebarPart.ts | 2 +- src/vs/workbench/browser/viewlet.ts | 2 +- .../workbench/electron-browser/workbench.ts | 3 +- .../parts/debug/browser/debugEditorActions.ts | 2 +- .../electron-browser/debug.contribution.ts | 2 +- .../debug/electron-browser/debugService.ts | 2 +- .../treeExplorerActions.contribution.ts | 2 +- .../extensions/browser/extensionEditor.ts | 2 +- .../extensions/browser/extensionsActions.ts | 2 +- .../extensions/browser/extensionsQuickOpen.ts | 2 +- .../electron-browser/extensionsViewlet.ts | 2 +- .../files/browser/editors/textFileEditor.ts | 2 +- .../parts/files/browser/fileActions.ts | 2 +- .../parts/files/browser/files.contribution.ts | 2 +- .../files/browser/views/openEditorsView.ts | 2 +- .../git/browser/gitActions.contribution.ts | 2 +- .../git/browser/gitWorkbenchContributions.ts | 2 +- .../search/browser/search.contribution.ts | 2 +- .../parts/search/browser/searchActions.ts | 2 +- .../parts/search/browser/searchWidget.ts | 2 +- .../electron-browser/themes.contribution.ts | 2 +- .../progress/browser/progressService.ts | 2 +- .../services/viewlet/browser/viewlet.ts | 60 +++++++++++++++++++ .../viewlet/browser/viewletService.ts | 52 +--------------- .../workbench/test/browser/services.test.ts | 2 +- 28 files changed, 88 insertions(+), 77 deletions(-) create mode 100644 src/vs/workbench/services/viewlet/browser/viewlet.ts diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index a0c90b7e0ca..494566ecb4a 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 3593e3edd61..b6bfd38b323 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 ed4cef92d8b..5afe660386d 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 2efc51e4ee2..9747ef46c13 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 9d5f083266e..7558f79bea9 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 1a44448eb5a..375b7e693f1 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 6b94ec829fa..4196b78b170 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 7431a96f23d..465f707c1d8 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 9a998c2d0f4..1659718dc1c 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 dd794bb7304..7bc3b59aedc 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 cb8a2637c34..24f85a5f3f1 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 d52d4bc3ccd..43178cb117a 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 1e5f89ff731..db0612bd1f8 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 2b8c2b03789..a6840d64add 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 0f07530cf7e..3e9fbdf5a4a 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 884f92a6d8f..c654aba4d43 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 8e81dec1b7f..8a3ba6c027e 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 81b871830cc..da4f9b5e8d4 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 8aa693b2f92..3a39da30bff 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 9eca29e8d29..32d184db3d6 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 b563e0c3e44..5d3c3b8253c 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 8376ad1c435..32f9548241f 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 1c6b3005866..8a9c4a9ef76 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 965d3b7210b..1d156148eb0 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 99a534cf5c5..aebb56b7a0c 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 00000000000..6f67092961a --- /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 17458a23f11..6bac7506a6b 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 3140c156dcf..7a03f81c330 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'; -- GitLab