@@ -8,7 +8,7 @@ import { forEach } from 'vs/base/common/collections';
88import { IJSONSchema } from 'vs/base/common/jsonSchema' ;
99import * as resources from 'vs/base/common/resources' ;
1010import { 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 } from 'vs/workbench/common/views' ;
11+ import { ViewContainer , IViewsRegistry , ITreeViewDescriptor , IViewContainersRegistry , Extensions as ViewContainerExtensions , TEST_VIEW_CONTAINER_ID , IViewDescriptor , ViewContainerLocation } from 'vs/workbench/common/views' ;
1212import { CustomTreeViewPane , CustomTreeView } from 'vs/workbench/browser/parts/views/customView' ;
1313import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey' ;
1414import { coalesce , } from 'vs/base/common/arrays' ;
@@ -23,14 +23,7 @@ import { VIEWLET_ID as REMOTE } from 'vs/workbench/contrib/remote/common/remote.
2323import { ExtensionIdentifier , IExtensionDescription } from 'vs/platform/extensions/common/extensions' ;
2424import { URI } from 'vs/base/common/uri' ;
2525import { ViewletRegistry , Extensions as ViewletExtensions , ShowViewletAction } from 'vs/workbench/browser/viewlet' ;
26- import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions' ;
27- import { IConfigurationService } from 'vs/platform/configuration/common/configuration' ;
2826import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService' ;
29- import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' ;
30- import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace' ;
31- import { IStorageService } from 'vs/platform/storage/common/storage' ;
32- import { IThemeService } from 'vs/platform/theme/common/themeService' ;
33- import { IContextMenuService } from 'vs/platform/contextview/browser/contextView' ;
3427import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet' ;
3528import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService' ;
3629import { IWorkbenchActionRegistry , Extensions as ActionExtensions } from 'vs/workbench/common/actions' ;
@@ -313,28 +306,13 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
313306
314307 if ( ! viewContainer ) {
315308
316-
317- class CustomViewPaneContainer extends ViewPaneContainer {
318- constructor (
319- @IWorkbenchLayoutService layoutService : IWorkbenchLayoutService ,
320- @ITelemetryService telemetryService : ITelemetryService ,
321- @IWorkspaceContextService protected contextService : IWorkspaceContextService ,
322- @IStorageService protected storageService : IStorageService ,
323- @IConfigurationService configurationService : IConfigurationService ,
324- @IInstantiationService protected instantiationService : IInstantiationService ,
325- @IThemeService themeService : IThemeService ,
326- @IContextMenuService contextMenuService : IContextMenuService ,
327- @IExtensionService extensionService : IExtensionService ,
328- @IViewDescriptorService viewDescriptorService : IViewDescriptorService
329- ) {
330- super ( id , `${ id } .state` , { mergeViewWithContainerWhenSingleView : true } , instantiationService , configurationService , layoutService , contextMenuService , telemetryService , extensionService , themeService , storageService , contextService , viewDescriptorService ) ;
331- }
332- }
333-
334309 viewContainer = this . viewContainersRegistry . registerViewContainer ( {
335310 id,
336311 name : title , extensionId,
337- ctorDescriptor : new SyncDescriptor ( CustomViewPaneContainer ) ,
312+ ctorDescriptor : new SyncDescriptor (
313+ ViewPaneContainer ,
314+ [ id , `${ id } .state` , { mergeViewWithContainerWhenSingleView : true } ]
315+ ) ,
338316 hideIfEmpty : true ,
339317 icon,
340318 } , ViewContainerLocation . Sidebar ) ;
0 commit comments