@codingame/monaco-vscode-view-common-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js

@@ -1,22 +1,26 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from 'vscode/vscode/vs/workbench/common/views';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, ViewContainerLocation, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from 'vscode/vscode/vs/workbench/common/views';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ContextKeyExpr, RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Disposable, DisposableMap, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ViewPaneContainer, ViewPaneContainerAction, ViewsSubMenu } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer, ViewPaneContainerAction, ViewsSubMenu } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { getViewsStateStorageId, ViewContainerModel } from '../common/viewContainerModel.js';
 import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { localize2, localize } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 var ViewDescriptorService_1;
 function getViewContainerStorageId(viewContainerId) { return `${viewContainerId}.state`; }
@@ -32,30 +36,30 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         this.storageService = storageService;
         this.extensionService = extensionService;
         this.telemetryService = telemetryService;
-        this._onDidChangeContainer = this._register(( (new Emitter())));
+        this._onDidChangeContainer = this._register(( new Emitter()));
         this.onDidChangeContainer = this._onDidChangeContainer.event;
-        this._onDidChangeLocation = this._register(( (new Emitter())));
+        this._onDidChangeLocation = this._register(( new Emitter()));
         this.onDidChangeLocation = this._onDidChangeLocation.event;
-        this._onDidChangeContainerLocation = this._register(( (new Emitter())));
+        this._onDidChangeContainerLocation = this._register(( new Emitter()));
         this.onDidChangeContainerLocation = this._onDidChangeContainerLocation.event;
-        this.viewContainerModels = this._register(( (new DisposableMap())));
-        this.viewsVisibilityActionDisposables = this._register(( (new DisposableMap())));
+        this.viewContainerModels = this._register(( new DisposableMap()));
+        this.viewsVisibilityActionDisposables = this._register(( new DisposableMap()));
         this.canRegisterViewsVisibilityActions = false;
-        this._onDidChangeViewContainers = this._register(( (new Emitter())));
+        this._onDidChangeViewContainers = this._register(( new Emitter()));
         this.onDidChangeViewContainers = this._onDidChangeViewContainers.event;
-        this.logger = ( (new Lazy(
+        this.logger = ( new Lazy(
             () => loggerService.createLogger(VIEWS_LOG_ID, { name: VIEWS_LOG_NAME, hidden: true })
-        )));
-        this.activeViewContextKeys = ( (new Map()));
-        this.movableViewContextKeys = ( (new Map()));
-        this.defaultViewLocationContextKeys = ( (new Map()));
-        this.defaultViewContainerLocationContextKeys = ( (new Map()));
-        this.viewContainersRegistry = ( (Registry.as(Extensions.ViewContainersRegistry)));
-        this.viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
+        ));
+        this.activeViewContextKeys = ( new Map());
+        this.movableViewContextKeys = ( new Map());
+        this.defaultViewLocationContextKeys = ( new Map());
+        this.defaultViewContainerLocationContextKeys = ( new Map());
+        this.viewContainersRegistry = ( Registry.as(Extensions.ViewContainersRegistry));
+        this.viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
         this.migrateToViewsCustomizationsStorage();
-        this.viewContainersCustomLocations = ( (new Map(Object.entries(this.viewCustomizations.viewContainerLocations))));
-        this.viewDescriptorsCustomLocations = ( (new Map(Object.entries(this.viewCustomizations.viewLocations))));
-        this.viewContainerBadgeEnablementStates = ( (new Map(Object.entries(this.viewCustomizations.viewContainerBadgeEnablementStates))));
+        this.viewContainersCustomLocations = ( new Map(Object.entries(this.viewCustomizations.viewContainerLocations)));
+        this.viewDescriptorsCustomLocations = ( new Map(Object.entries(this.viewCustomizations.viewLocations)));
+        this.viewContainerBadgeEnablementStates = ( new Map(Object.entries(this.viewCustomizations.viewContainerBadgeEnablementStates)));
         this.viewContainers.forEach(viewContainer => this.onDidRegisterViewContainer(viewContainer));
         this._register(this.viewsRegistry.onViewsRegistered(views => this.onDidRegisterViews(views)));
         this._register(this.viewsRegistry.onViewsDeregistered(({ views, viewContainer }) => this.onDidDeregisterViews(views, viewContainer)));
@@ -68,15 +72,15 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             this.onDidDeregisterViewContainer(viewContainer);
             this._onDidChangeViewContainers.fire({ removed: [{ container: viewContainer, location: viewContainerLocation }], added: [] });
         }));
-        this._register(this.storageService.onDidChangeValue(0 , ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, this._register(( (new DisposableStore()))))(() => this.onDidStorageChange()));
+        this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, this._store)(() => this.onDidStorageChange()));
         this.extensionService.whenInstalledExtensionsRegistered().then(() => this.whenExtensionsRegistered());
     }
     migrateToViewsCustomizationsStorage() {
-        if (this.storageService.get(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, 0 )) {
+        if (this.storageService.get(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, StorageScope.PROFILE)) {
             return;
         }
-        const viewContainerLocationsValue = this.storageService.get('views.cachedViewContainerLocations', 0 );
-        const viewDescriptorLocationsValue = this.storageService.get('views.cachedViewPositions', 0 );
+        const viewContainerLocationsValue = this.storageService.get('views.cachedViewContainerLocations', StorageScope.PROFILE);
+        const viewDescriptorLocationsValue = this.storageService.get('views.cachedViewPositions', StorageScope.PROFILE);
         if (!viewContainerLocationsValue && !viewDescriptorLocationsValue) {
             return;
         }
@@ -87,14 +91,14 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             viewLocations: viewDescriptorLocations.reduce((result, [id, { containerId }]) => { result[id] = containerId; return result; }, {}),
             viewContainerBadgeEnablementStates: {}
         };
-        this.storageService.store(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, JSON.stringify(viewsCustomizations), 0 , 0 );
-        this.storageService.remove('views.cachedViewContainerLocations', 0 );
-        this.storageService.remove('views.cachedViewPositions', 0 );
+        this.storageService.store(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, JSON.stringify(viewsCustomizations), StorageScope.PROFILE, StorageTarget.USER);
+        this.storageService.remove('views.cachedViewContainerLocations', StorageScope.PROFILE);
+        this.storageService.remove('views.cachedViewPositions', StorageScope.PROFILE);
     }
     registerGroupedViews(groupedViews) {
         for (const [containerId, views] of groupedViews.entries()) {
             const viewContainer = this.viewContainersRegistry.get(containerId);
-            if (!viewContainer || !( (this.viewContainerModels.has(viewContainer)))) {
+            if (!viewContainer || !( this.viewContainerModels.has(viewContainer))) {
                 if (this.isGeneratedContainerId(containerId)) {
                     const viewContainerLocation = this.viewContainersCustomLocations.get(containerId);
                     if (viewContainerLocation !== undefined) {
@@ -110,7 +114,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     deregisterGroupedViews(groupedViews) {
         for (const [viewContainerId, views] of groupedViews.entries()) {
             const viewContainer = this.viewContainersRegistry.get(viewContainerId);
-            if (!viewContainer || !( (this.viewContainerModels.has(viewContainer)))) {
+            if (!viewContainer || !( this.viewContainerModels.has(viewContainer))) {
                 continue;
             }
             this.removeViews(viewContainer, views);
@@ -130,7 +134,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     }
     whenExtensionsRegistered() {
         this.moveOrphanViewsToDefaultLocation();
-        for (const viewContainerId of [...( (this.viewContainersCustomLocations.keys()))]) {
+        for (const viewContainerId of [...( this.viewContainersCustomLocations.keys())]) {
             this.cleanUpGeneratedViewContainer(viewContainerId);
         }
         this.saveViewCustomizations();
@@ -159,7 +163,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         });
     }
     regroupViews(containerId, views) {
-        const viewsByContainer = ( (new Map()));
+        const viewsByContainer = ( new Map());
         for (const viewDescriptor of views) {
             const correctContainerId = this.viewDescriptorsCustomLocations.get(viewDescriptor.id) ?? containerId;
             let containerViews = viewsByContainer.get(correctContainerId);
@@ -228,7 +232,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         if (!views.length) {
             return;
         }
-        this.logger.value.info(`moveViewsToContainer: views:${( (views.map(view => view.id))).join(',')} viewContainer:${viewContainer.id} reason:${reason}`);
+        this.logger.value.info(`moveViewsToContainer: views:${( views.map(view => view.id)).join(',')} viewContainer:${viewContainer.id} reason:${reason}`);
         const from = this.getViewContainerByViewId(views[0].id);
         const to = viewContainer;
         if (from && to && from !== to) {
@@ -260,10 +264,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         this.saveViewCustomizations();
     }
     isViewContainerRemovedPermanently(viewContainerId) {
-        return this.isGeneratedContainerId(viewContainerId) && !( (this.viewContainersCustomLocations.has(viewContainerId)));
+        return this.isGeneratedContainerId(viewContainerId) && !( this.viewContainersCustomLocations.has(viewContainerId));
     }
     onDidChangeDefaultContainer(views, from, to) {
-        const viewsToMove = views.filter(view => !( (this.viewDescriptorsCustomLocations.has(view.id)))
+        const viewsToMove = views.filter(view => !( this.viewDescriptorsCustomLocations.has(view.id))
             || (!this.viewContainers.includes(from) && this.viewDescriptorsCustomLocations.get(view.id) === from.id)
         );
         if (viewsToMove.length) {
@@ -285,8 +289,8 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         const viewCount = views.length;
         const fromContainer = containerToString(from);
         const toContainer = containerToString(to);
-        const fromLocation = oldLocation === 1  ? 'panel' : 'sidebar';
-        const toLocation = newLocation === 1  ? 'panel' : 'sidebar';
+        const fromLocation = oldLocation === ViewContainerLocation.Panel ? 'panel' : 'sidebar';
+        const toLocation = newLocation === ViewContainerLocation.Panel ? 'panel' : 'sidebar';
         this.telemetryService.publicLog2('viewDescriptorService.moveViews', { viewCount, fromContainer, toContainer, fromLocation, toLocation });
     }
     moveViewsWithoutSaving(views, from, to, visibilityState = ViewVisibilityState.Expand) {
@@ -326,7 +330,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         if (viewContainer && this.getViewContainerModel(viewContainer)?.allViewDescriptors.length) {
             return;
         }
-        if ([...( (this.viewDescriptorsCustomLocations.values()))].includes(viewContainerId)) {
+        if ([...( this.viewDescriptorsCustomLocations.values())].includes(viewContainerId)) {
             return;
         }
         if (viewContainer) {
@@ -334,15 +338,15 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         }
         this.viewContainersCustomLocations.delete(viewContainerId);
         this.viewContainerBadgeEnablementStates.delete(viewContainerId);
-        this.storageService.remove(getViewsStateStorageId(viewContainer?.storageId || getViewContainerStorageId(viewContainerId)), 0 );
+        this.storageService.remove(getViewsStateStorageId(viewContainer?.storageId || getViewContainerStorageId(viewContainerId)), StorageScope.PROFILE);
     }
     registerGeneratedViewContainer(location, existingId) {
         const id = existingId || this.generateContainerId(location);
         const container = this.viewContainersRegistry.registerViewContainer({
             id,
-            ctorDescriptor: ( (new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }]))),
-            title: { value: id, original: id },
-            icon: location === 0  ? defaultViewIcon : undefined,
+            ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }])),
+            title: { value: ( localize(12067, "User View Container")), original: 'User View Container' },
+            icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
             storageId: getViewContainerStorageId(id),
             hideIfEmpty: true
         }, location, { doNotRegisterOpenCommand: true });
@@ -359,8 +363,8 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     }
     onDidViewCustomizationsStorageChange() {
         this._viewCustomizations = undefined;
-        const newViewContainerCustomizations = ( (new Map(Object.entries(this.viewCustomizations.viewContainerLocations))));
-        const newViewDescriptorCustomizations = ( (new Map(Object.entries(this.viewCustomizations.viewLocations))));
+        const newViewContainerCustomizations = ( new Map(Object.entries(this.viewCustomizations.viewContainerLocations)));
+        const newViewDescriptorCustomizations = ( new Map(Object.entries(this.viewCustomizations.viewLocations)));
         const viewContainersToMove = [];
         const viewsToMove = [];
         for (const [containerId, location] of newViewContainerCustomizations.entries()) {
@@ -375,7 +379,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             }
         }
         for (const viewContainer of this.viewContainers) {
-            if (!( (newViewContainerCustomizations.has(viewContainer.id)))) {
+            if (!( newViewContainerCustomizations.has(viewContainer.id))) {
                 const currentLocation = this.getViewContainerLocation(viewContainer);
                 const defaultLocation = this.getDefaultViewContainerLocation(viewContainer);
                 if (currentLocation !== defaultLocation) {
@@ -396,7 +400,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         for (const viewContainer of this.viewContainers) {
             const viewContainerModel = this.getViewContainerModel(viewContainer);
             for (const viewDescriptor of viewContainerModel.allViewDescriptors) {
-                if (!( (newViewDescriptorCustomizations.has(viewDescriptor.id)))) {
+                if (!( newViewDescriptorCustomizations.has(viewDescriptor.id))) {
                     const currentContainer = this.getViewContainerByViewId(viewDescriptor.id);
                     const defaultContainer = this.getDefaultContainerById(viewDescriptor.id);
                     if (currentContainer && defaultContainer && currentContainer !== defaultContainer) {
@@ -460,10 +464,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         }
     }
     getStoredViewCustomizationsValue() {
-        return this.storageService.get(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, 0 , '{}');
+        return this.storageService.get(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, StorageScope.PROFILE, '{}');
     }
     setStoredViewCustomizationsValue(value) {
-        this.storageService.store(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, value, 0 , 0 );
+        this.storageService.store(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, value, StorageScope.PROFILE, StorageTarget.USER);
     }
     getViewsByContainer(viewContainer) {
         const result = this.viewsRegistry.getViews(viewContainer).filter(viewDescriptor => {
@@ -492,13 +496,13 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     getOrRegisterViewContainerModel(viewContainer) {
         let viewContainerModel = this.viewContainerModels.get(viewContainer)?.viewContainerModel;
         if (!viewContainerModel) {
-            const disposables = ( (new DisposableStore()));
+            const disposables = ( new DisposableStore());
             viewContainerModel = disposables.add(this.instantiationService.createInstance(ViewContainerModel, viewContainer));
             this.onDidChangeActiveViews({ added: viewContainerModel.activeViewDescriptors, removed: [] });
             viewContainerModel.onDidChangeActiveViewDescriptors(changed => this.onDidChangeActiveViews(changed), this, disposables);
             this.onDidChangeVisibleViews({ added: [...viewContainerModel.visibleViewDescriptors], removed: [] });
-            viewContainerModel.onDidAddVisibleViewDescriptors(added => this.onDidChangeVisibleViews({ added: ( (added.map(({ viewDescriptor }) => viewDescriptor))), removed: [] }), this, disposables);
-            viewContainerModel.onDidRemoveVisibleViewDescriptors(removed => this.onDidChangeVisibleViews({ added: [], removed: ( (removed.map(({ viewDescriptor }) => viewDescriptor))) }), this, disposables);
+            viewContainerModel.onDidAddVisibleViewDescriptors(added => this.onDidChangeVisibleViews({ added: ( added.map(({ viewDescriptor }) => viewDescriptor)), removed: [] }), this, disposables);
+            viewContainerModel.onDidRemoveVisibleViewDescriptors(removed => this.onDidChangeVisibleViews({ added: [], removed: ( removed.map(({ viewDescriptor }) => viewDescriptor)) }), this, disposables);
             disposables.add(toDisposable(() => this.viewsVisibilityActionDisposables.deleteAndDispose(viewContainer)));
             disposables.add(this.registerResetViewContainerAction(viewContainer));
             const value = { viewContainerModel: viewContainerModel, disposables, dispose: () => disposables.dispose() };
@@ -542,7 +546,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         }));
     }
     registerViewsVisibilityActionsForContainer(viewContainerModel) {
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         viewContainerModel.activeViewDescriptors.forEach((viewDescriptor, index) => {
             if (!viewDescriptor.remoteAuthority) {
                 disposables.add(registerAction2(class extends ViewPaneContainerAction {
@@ -550,32 +554,28 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.toggleVisibility`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( (ContextKeyExpr.false())),
-                            toggled: ( (ContextKeyExpr.has(`${viewDescriptor.id}.visible`))),
+                            precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( ContextKeyExpr.false()),
+                            toggled: ( ContextKeyExpr.has(`${viewDescriptor.id}.visible`)),
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    4147,
+                                    12068,
                                     'Toggles the visibility of the {0} view if the view container it is located in is visible',
                                     viewDescriptor.name.value
                                 ))
                             },
                             menu: [{
                                     id: ViewsSubMenu,
-                                    when: ( (ContextKeyExpr.equals('viewContainer', viewContainerModel.viewContainer.id))),
+                                    when: ( ContextKeyExpr.equals('viewContainer', viewContainerModel.viewContainer.id)),
                                     order: index,
                                 }, {
                                     id: MenuId.ViewContainerTitleContext,
-                                    when: ( (ContextKeyExpr.and(
-                                         (ContextKeyExpr.equals('viewContainer', viewContainerModel.viewContainer.id))
-                                    ))),
+                                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', viewContainerModel.viewContainer.id)))),
                                     order: index,
                                     group: '1_toggleVisibility'
                                 }, {
                                     id: MenuId.ViewTitleContext,
-                                    when: ( (ContextKeyExpr.and( (ContextKeyExpr.or(
-                                        ...( (viewContainerModel.visibleViewDescriptors.map(v => ( (ContextKeyExpr.equals('view', v.id))))))
-                                    ))))),
+                                    when: ( ContextKeyExpr.and(( ContextKeyExpr.or(...( viewContainerModel.visibleViewDescriptors.map(v => ( ContextKeyExpr.equals('view', v.id)))))))),
                                     order: index,
                                     group: '2_toggleVisibility'
                                 }]
@@ -590,21 +590,18 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(4148, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(12069, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    4149,
+                                    12070,
                                     'Hides the {0} view if it is visible and the view container it is located in is visible',
                                     viewDescriptor.name.value
                                 ))
                             },
-                            precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( (ContextKeyExpr.false())),
+                            precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( ContextKeyExpr.false()),
                             menu: [{
                                     id: MenuId.ViewTitleContext,
-                                    when: ( (ContextKeyExpr.and(
-                                         (ContextKeyExpr.equals('view', viewDescriptor.id)),
-                                         (ContextKeyExpr.has(`${viewDescriptor.id}.visible`))
-                                    ))),
+                                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', viewDescriptor.id)), ( ContextKeyExpr.has(`${viewDescriptor.id}.visible`)))),
                                     group: '1_hide',
                                     order: 1
                                 }]
@@ -626,18 +623,17 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(4150, "Reset Location")),
+                    title: ( localize2(12071, "Reset Location")),
                     menu: [{
                             id: MenuId.ViewContainerTitleContext,
-                            when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
-                                 (ContextKeyExpr.equals('viewContainer', viewContainer.id)),
-                                 (ContextKeyExpr.equals(`${viewContainer.id}.defaultViewContainerLocation`, false))
-                            )))))
+                            group: '1_viewActions',
+                            when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', viewContainer.id)), ( ContextKeyExpr.equals(`${viewContainer.id}.defaultViewContainerLocation`, false))))))
                         }],
                 });
             }
-            run() {
+            run(accessor) {
                 that.moveViewContainerToLocation(viewContainer, that.getDefaultViewContainerLocation(viewContainer), undefined, this.desc.id);
+                accessor.get(IViewsService).openViewContainer(viewContainer.id, true);
             }
         });
     }
@@ -654,13 +650,13 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 }
             });
         });
-        this.getViewContainerModel(container).add(( (views.map(view => {
+        this.getViewContainerModel(container).add(( views.map(view => {
             return {
                 viewDescriptor: view,
                 collapsed: visibilityState === ViewVisibilityState.Default ? undefined : false,
                 visible: visibilityState === ViewVisibilityState.Default ? undefined : true
             };
-        }))));
+        })));
     }
     removeViews(container, views) {
         this.contextKeyService.bufferChangeEvents(() => {
@@ -677,7 +673,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         const activeContextKeyId = `${viewDescriptor.id}.active`;
         let contextKey = this.activeViewContextKeys.get(activeContextKeyId);
         if (!contextKey) {
-            contextKey = ( (new RawContextKey(activeContextKeyId, false))).bindTo(this.contextKeyService);
+            contextKey = ( new RawContextKey(activeContextKeyId, false)).bindTo(this.contextKeyService);
             this.activeViewContextKeys.set(activeContextKeyId, contextKey);
         }
         return contextKey;
@@ -686,7 +682,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         const activeContextKeyId = `${viewDescriptor.id}.visible`;
         let contextKey = this.activeViewContextKeys.get(activeContextKeyId);
         if (!contextKey) {
-            contextKey = ( (new RawContextKey(activeContextKeyId, false))).bindTo(this.contextKeyService);
+            contextKey = ( new RawContextKey(activeContextKeyId, false)).bindTo(this.contextKeyService);
             this.activeViewContextKeys.set(activeContextKeyId, contextKey);
         }
         return contextKey;
@@ -695,7 +691,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         const movableViewContextKeyId = `${viewDescriptor.id}.canMove`;
         let contextKey = this.movableViewContextKeys.get(movableViewContextKeyId);
         if (!contextKey) {
-            contextKey = ( (new RawContextKey(movableViewContextKeyId, false))).bindTo(this.contextKeyService);
+            contextKey = ( new RawContextKey(movableViewContextKeyId, false)).bindTo(this.contextKeyService);
             this.movableViewContextKeys.set(movableViewContextKeyId, contextKey);
         }
         return contextKey;
@@ -704,7 +700,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         const defaultViewLocationContextKeyId = `${viewDescriptor.id}.defaultViewLocation`;
         let contextKey = this.defaultViewLocationContextKeys.get(defaultViewLocationContextKeyId);
         if (!contextKey) {
-            contextKey = ( (new RawContextKey(defaultViewLocationContextKeyId, false))).bindTo(this.contextKeyService);
+            contextKey = ( new RawContextKey(defaultViewLocationContextKeyId, false)).bindTo(this.contextKeyService);
             this.defaultViewLocationContextKeys.set(defaultViewLocationContextKeyId, contextKey);
         }
         return contextKey;
@@ -713,19 +709,19 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         const defaultViewContainerLocationContextKeyId = `${viewContainer.id}.defaultViewContainerLocation`;
         let contextKey = this.defaultViewContainerLocationContextKeys.get(defaultViewContainerLocationContextKeyId);
         if (!contextKey) {
-            contextKey = ( (new RawContextKey(defaultViewContainerLocationContextKeyId, false))).bindTo(this.contextKeyService);
+            contextKey = ( new RawContextKey(defaultViewContainerLocationContextKeyId, false)).bindTo(this.contextKeyService);
             this.defaultViewContainerLocationContextKeys.set(defaultViewContainerLocationContextKeyId, contextKey);
         }
         return contextKey;
     }
 };
-ViewDescriptorService = ViewDescriptorService_1 = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IStorageService))),
-    ( (__param(3, IExtensionService))),
-    ( (__param(4, ITelemetryService))),
-    ( (__param(5, ILoggerService)))
-], ViewDescriptorService)));
+ViewDescriptorService = ViewDescriptorService_1 = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IContextKeyService)),
+    ( __param(2, IStorageService)),
+    ( __param(3, IExtensionService)),
+    ( __param(4, ITelemetryService)),
+    ( __param(5, ILoggerService))
+], ViewDescriptorService));
 
 export { ViewDescriptorService };

package/vscode/src/vs/workbench/services/views/common/viewContainerModel.d.ts

@@ -0,0 +1,80 @@
+import { ViewContainer, IViewDescriptor, IViewContainerModel, IAddedViewDescriptorRef, IViewDescriptorRef, IAddedViewDescriptorState } from "vscode/vscode/vs/workbench/common/views";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ThemeIcon } from "vscode/vscode/vs/base/common/themables";
+import { ILoggerService } from "vscode/vscode/vs/platform/log/common/log.service";
+export declare function getViewsStateStorageId(viewContainerStorageId: string): string;
+export declare class ViewContainerModel extends Disposable implements IViewContainerModel {
+    readonly viewContainer: ViewContainer;
+    private readonly contextKeyService;
+    private readonly contextKeys;
+    private viewDescriptorItems;
+    private viewDescriptorsState;
+    private _title;
+    get title(): string;
+    private _icon;
+    get icon(): URI | ThemeIcon | undefined;
+    private _keybindingId;
+    get keybindingId(): string | undefined;
+    private _onDidChangeContainerInfo;
+    readonly onDidChangeContainerInfo: Event<{
+        title?: boolean;
+        icon?: boolean;
+        keybindingId?: boolean;
+    }>;
+    get allViewDescriptors(): ReadonlyArray<IViewDescriptor>;
+    private _onDidChangeAllViewDescriptors;
+    readonly onDidChangeAllViewDescriptors: Event<{
+        added: ReadonlyArray<IViewDescriptor>;
+        removed: ReadonlyArray<IViewDescriptor>;
+    }>;
+    get activeViewDescriptors(): ReadonlyArray<IViewDescriptor>;
+    private _onDidChangeActiveViewDescriptors;
+    readonly onDidChangeActiveViewDescriptors: Event<{
+        added: ReadonlyArray<IViewDescriptor>;
+        removed: ReadonlyArray<IViewDescriptor>;
+    }>;
+    get visibleViewDescriptors(): ReadonlyArray<IViewDescriptor>;
+    private _onDidAddVisibleViewDescriptors;
+    readonly onDidAddVisibleViewDescriptors: Event<IAddedViewDescriptorRef[]>;
+    private _onDidRemoveVisibleViewDescriptors;
+    readonly onDidRemoveVisibleViewDescriptors: Event<IViewDescriptorRef[]>;
+    private _onDidMoveVisibleViewDescriptors;
+    readonly onDidMoveVisibleViewDescriptors: Event<{
+        from: IViewDescriptorRef;
+        to: IViewDescriptorRef;
+    }>;
+    private readonly logger;
+    constructor(viewContainer: ViewContainer, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, loggerService: ILoggerService);
+    private updateContainerInfo;
+    private isEqualIcon;
+    isVisible(id: string): boolean;
+    setVisible(id: string, visible: boolean): void;
+    private updateVisibility;
+    private updateViewDescriptorItemVisibility;
+    isCollapsed(id: string): boolean;
+    setCollapsed(id: string, collapsed: boolean): void;
+    getSize(id: string): number | undefined;
+    setSizes(newSizes: readonly {
+        id: string;
+        size: number;
+    }[]): void;
+    move(from: string, to: string): void;
+    add(addedViewDescriptorStates: IAddedViewDescriptorState[]): void;
+    remove(viewDescriptors: IViewDescriptor[]): void;
+    private onDidChangeContext;
+    private broadCastAddedVisibleViewDescriptors;
+    private broadCastRemovedVisibleViewDescriptors;
+    private broadCastMovedViewDescriptors;
+    private updateState;
+    private isViewDescriptorVisible;
+    private isViewDescriptorVisibleWhenActive;
+    private find;
+    private findAndIgnoreIfNotFound;
+    private compareViewDescriptors;
+    private getViewOrder;
+    private getGroupOrderResult;
+}