Skip to content

Commit 34d739f

Browse files
sandy081sandy081
committed
💄
1 parent 14dd693 commit 34d739f

9 files changed

Lines changed: 25 additions & 40 deletions

File tree

‎src/vs/workbench/api/browser/viewsExtensionPoint.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { forEach } from 'vs/base/common/collections';
88
import { IJSONSchema } from 'vs/base/common/jsonSchema';
99
import * as resources from 'vs/base/common/resources';
1010
import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
11-
import { ViewContainer, IViewsRegistry, ITreeViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, TEST_VIEW_CONTAINER_ID, IViewDescriptor, ViewContainerLocation, IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
11+
import { ViewContainer, IViewsRegistry, ITreeViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, TEST_VIEW_CONTAINER_ID, IViewDescriptor, ViewContainerLocation, IViewDescriptorService } from 'vs/workbench/common/views';
1212
import { CustomTreeViewPane, CustomTreeView } from 'vs/workbench/browser/parts/views/customView';
1313
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
1414
import { coalesce, } from 'vs/base/common/arrays';
@@ -325,10 +325,9 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
325325
@IThemeService themeService: IThemeService,
326326
@IContextMenuService contextMenuService: IContextMenuService,
327327
@IExtensionService extensionService: IExtensionService,
328-
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
329-
@IViewsService viewsService: IViewsService
328+
@IViewDescriptorService viewDescriptorService: IViewDescriptorService
330329
) {
331-
super(id, `${id}.state`, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, viewsService);
330+
super(id, `${id}.state`, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
332331
}
333332
}
334333

‎src/vs/workbench/browser/parts/views/viewPaneContainer.ts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { PaneView, IPaneViewOptions, IPaneOptions, Pane, DefaultPaneDndControlle
2525
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
2626
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
2727
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
28-
import { Extensions as ViewContainerExtensions, IView, FocusedViewContext, IViewContainersRegistry, IViewDescriptor, ViewContainer, IViewDescriptorService, ViewContainerLocation, IViewsService } from 'vs/workbench/common/views';
28+
import { Extensions as ViewContainerExtensions, IView, FocusedViewContext, IViewContainersRegistry, IViewDescriptor, ViewContainer, IViewDescriptorService } from 'vs/workbench/common/views';
2929
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
3030
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
3131
import { assertIsDefined } from 'vs/base/common/types';
@@ -311,8 +311,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
311311
@IThemeService protected themeService: IThemeService,
312312
@IStorageService protected storageService: IStorageService,
313313
@IWorkspaceContextService protected contextService: IWorkspaceContextService,
314-
@IViewDescriptorService protected viewDescriptorService: IViewDescriptorService,
315-
@IViewsService protected viewsService: IViewsService
314+
@IViewDescriptorService protected viewDescriptorService: IViewDescriptorService
316315
) {
317316

318317
super(id, themeService, storageService);
@@ -668,11 +667,6 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
668667
this.viewsModel.setVisible(viewId, visible);
669668
}
670669

671-
protected moveView(viewDescriptor: IViewDescriptor, location: ViewContainerLocation): void {
672-
this.viewDescriptorService.moveViewToLocation(viewDescriptor, location);
673-
this.viewsService.openView(viewDescriptor.id, true);
674-
}
675-
676670
private addPane(pane: ViewPane, size: number, index = this.paneItems.length - 1): void {
677671
const onDidFocus = pane.onDidFocus(() => this.lastFocusedPane = pane);
678672
const onDidChangeTitleArea = pane.onDidChangeTitleArea(() => {

‎src/vs/workbench/browser/parts/views/viewsViewlet.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IAction } from 'vs/base/common/actions';
88
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
99
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
1010
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
11-
import { IViewDescriptor, IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
11+
import { IViewDescriptor, IViewDescriptorService } from 'vs/workbench/common/views';
1212
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1313
import { IThemeService } from 'vs/platform/theme/common/themeService';
1414
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -44,11 +44,10 @@ export abstract class FilterViewPaneContainer extends ViewPaneContainer {
4444
@IContextMenuService contextMenuService: IContextMenuService,
4545
@IExtensionService extensionService: IExtensionService,
4646
@IWorkspaceContextService contextService: IWorkspaceContextService,
47-
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
48-
@IViewsService viewsService: IViewsService
47+
@IViewDescriptorService viewDescriptorService: IViewDescriptorService
4948
) {
5049

51-
super(viewletId, `${viewletId}.state`, { mergeViewWithContainerWhenSingleView: false }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, viewsService);
50+
super(viewletId, `${viewletId}.state`, { mergeViewWithContainerWhenSingleView: false }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
5251
this._register(onDidChangeFilterValue(newFilterValue => {
5352
this.filterValue = newFilterValue;
5453
this.onFilterChanged(newFilterValue);

‎src/vs/workbench/contrib/debug/browser/debugViewlet.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
3333
import { TogglePanelAction } from 'vs/workbench/browser/panel';
3434
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
3535
import { StartView } from 'vs/workbench/contrib/debug/browser/startView';
36-
import { IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
36+
import { IViewDescriptorService } from 'vs/workbench/common/views';
3737

3838
export class DebugViewPaneContainer extends ViewPaneContainer {
3939

@@ -61,10 +61,9 @@ export class DebugViewPaneContainer extends ViewPaneContainer {
6161
@IMenuService private readonly menuService: IMenuService,
6262
@IContextKeyService private readonly contextKeyService: IContextKeyService,
6363
@INotificationService private readonly notificationService: INotificationService,
64-
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
65-
@IViewsService viewsService: IViewsService
64+
@IViewDescriptorService viewDescriptorService: IViewDescriptorService
6665
) {
67-
super(VIEWLET_ID, `${VIEWLET_ID}.state`, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, viewsService);
66+
super(VIEWLET_ID, `${VIEWLET_ID}.state`, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
6867

6968
this._register(this.debugService.onDidChangeState(state => this.onDebugServiceStateChange(state)));
7069
this._register(this.debugService.onDidNewSession(() => this.updateToolBar()));

‎src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import Severity from 'vs/base/common/severity';
3535
import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
3636
import { IThemeService } from 'vs/platform/theme/common/themeService';
3737
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
38-
import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewContainersRegistry, IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
38+
import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewContainersRegistry, IViewDescriptorService } from 'vs/workbench/common/views';
3939
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
4040
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
4141
import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -356,11 +356,9 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
356356
@IContextKeyService contextKeyService: IContextKeyService,
357357
@IContextMenuService contextMenuService: IContextMenuService,
358358
@IExtensionService extensionService: IExtensionService,
359-
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
360-
@IViewsService viewsService: IViewsService
361-
359+
@IViewDescriptorService viewDescriptorService: IViewDescriptorService
362360
) {
363-
super(VIEWLET_ID, `${VIEWLET_ID}.state`, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, viewsService);
361+
super(VIEWLET_ID, `${VIEWLET_ID}.state`, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
364362

365363
this.searchDelayer = new Delayer(500);
366364
this.nonEmptyWorkspaceContextKey = NonEmptyWorkspaceContext.bindTo(contextKeyService);

‎src/vs/workbench/contrib/files/browser/explorerViewlet.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2020
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
2121
import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
2222
import { IThemeService } from 'vs/platform/theme/common/themeService';
23-
import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewContainersRegistry, ViewContainerLocation, IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
23+
import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewContainersRegistry, ViewContainerLocation, IViewDescriptorService } from 'vs/workbench/common/views';
2424
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
2525
import { Disposable } from 'vs/base/common/lifecycle';
2626
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
@@ -164,11 +164,10 @@ export class ExplorerViewPaneContainer extends ViewPaneContainer {
164164
@IThemeService themeService: IThemeService,
165165
@IContextMenuService contextMenuService: IContextMenuService,
166166
@IExtensionService extensionService: IExtensionService,
167-
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
168-
@IViewsService viewsService: IViewsService
167+
@IViewDescriptorService viewDescriptorService: IViewDescriptorService
169168
) {
170169

171-
super(VIEWLET_ID, ExplorerViewPaneContainer.EXPLORER_VIEWS_STATE, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, viewsService);
170+
super(VIEWLET_ID, ExplorerViewPaneContainer.EXPLORER_VIEWS_STATE, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
172171

173172
this.viewletVisibleContextKey = ExplorerViewletVisibleContext.bindTo(contextKeyService);
174173

‎src/vs/workbench/contrib/remote/browser/remote.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
1919
import { FilterViewPaneContainer } from 'vs/workbench/browser/parts/views/viewsViewlet';
2020
import { VIEWLET_ID } from 'vs/workbench/contrib/remote/common/remote.contribution';
2121
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
22-
import { IViewDescriptor, IViewsRegistry, Extensions, ViewContainerLocation, IViewContainersRegistry, IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
22+
import { IViewDescriptor, IViewsRegistry, Extensions, ViewContainerLocation, IViewContainersRegistry, IViewDescriptorService } from 'vs/workbench/common/views';
2323
import { Registry } from 'vs/platform/registry/common/platform';
2424
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
2525
import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -443,9 +443,8 @@ export class RemoteViewPaneContainer extends FilterViewPaneContainer implements
443443
@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
444444
@IContextKeyService private readonly contextKeyService: IContextKeyService,
445445
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
446-
@IViewsService viewsService: IViewsService
447446
) {
448-
super(VIEWLET_ID, remoteExplorerService.onDidChangeTargetType, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService, viewDescriptorService, viewsService);
447+
super(VIEWLET_ID, remoteExplorerService.onDidChangeTargetType, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService, viewDescriptorService);
449448
this.addConstantViewDescriptors([this.helpPanelDescriptor]);
450449
remoteHelpExtPoint.setHandler((extensions) => {
451450
let helpInformation: HelpInformation[] = [];

‎src/vs/workbench/contrib/scm/browser/scmViewlet.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
2525
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
2626
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
2727
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
28-
import { IViewsRegistry, Extensions, IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
28+
import { IViewsRegistry, Extensions, IViewDescriptorService } from 'vs/workbench/common/views';
2929
import { Registry } from 'vs/platform/registry/common/platform';
3030
import { nextTick } from 'vs/base/common/process';
3131
import { RepositoryPane, RepositoryViewDescriptor } from 'vs/workbench/contrib/scm/browser/repositoryPane';
@@ -98,10 +98,9 @@ export class SCMViewPaneContainer extends ViewPaneContainer implements IViewMode
9898
@IExtensionService extensionService: IExtensionService,
9999
@IWorkspaceContextService protected contextService: IWorkspaceContextService,
100100
@IContextKeyService contextKeyService: IContextKeyService,
101-
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
102-
@IViewsService viewsService: IViewsService
101+
@IViewDescriptorService viewDescriptorService: IViewDescriptorService
103102
) {
104-
super(VIEWLET_ID, SCMViewPaneContainer.STATE_KEY, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, viewsService);
103+
super(VIEWLET_ID, SCMViewPaneContainer.STATE_KEY, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
105104

106105
this.menus = instantiationService.createInstance(SCMMenus, undefined);
107106
this._register(this.menus.onDidChangeTitle(this.updateTitleArea, this));

‎src/vs/workbench/contrib/search/browser/searchViewlet.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
1515
import { VIEWLET_ID, VIEW_ID } from 'vs/workbench/services/search/common/search';
1616
import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
1717
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
18-
import { IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
18+
import { IViewDescriptorService } from 'vs/workbench/common/views';
1919

2020

2121
export class SearchViewPaneContainer extends ViewPaneContainer {
@@ -30,10 +30,9 @@ export class SearchViewPaneContainer extends ViewPaneContainer {
3030
@IThemeService themeService: IThemeService,
3131
@IContextMenuService contextMenuService: IContextMenuService,
3232
@IExtensionService extensionService: IExtensionService,
33-
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
34-
@IViewsService viewsService: IViewsService
33+
@IViewDescriptorService viewDescriptorService: IViewDescriptorService
3534
) {
36-
super(VIEWLET_ID, `${VIEWLET_ID}.state`, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, viewsService);
35+
super(VIEWLET_ID, `${VIEWLET_ID}.state`, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
3736
}
3837

3938
getSearchView(): SearchView | undefined {

0 commit comments

Comments
 (0)