@codingame/monaco-vscode-view-common-service-override 4.5.0 → 4.5.2

package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js

@@ -18,15 +18,12 @@ import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/commo
 import { CounterSet } from 'vscode/vscode/vs/base/common/map';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 
+const _moduleId = "vs/workbench/services/views/common/viewContainerModel";
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: '_workbench.output.showViewsLog',
-            title: ( localize2WithPath(
-                'vs/workbench/services/views/common/viewContainerModel',
-                'showViewsLog',
-                "Show Views Log"
-            )),
+            title: ( localize2WithPath(_moduleId, 0, "Show Views Log")),
             category: Categories.Developer,
             f1: true
         });
@@ -44,12 +41,12 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         super();
         this.viewContainerName = viewContainerName;
         this.storageService = storageService;
-        this._onDidChangeStoredState = this._register(( new Emitter()));
+        this._onDidChangeStoredState = this._register(( (new Emitter())));
         this.onDidChangeStoredState = this._onDidChangeStoredState.event;
         this.logger = loggerService.createLogger(VIEWS_LOG_ID, { name: VIEWS_LOG_NAME, hidden: true });
         this.globalViewsStateStorageId = getViewsStateStorageId(viewContainerStorageId);
         this.workspaceViewsStateStorageId = viewContainerStorageId;
-        this._register(this.storageService.onDidChangeValue(0 , this.globalViewsStateStorageId, this._register(( new DisposableStore())))(() => this.onDidStorageChange()));
+        this._register(this.storageService.onDidChangeValue(0 , this.globalViewsStateStorageId, this._register(( (new DisposableStore()))))(() => this.onDidStorageChange()));
         this.state = this.initialize();
     }
     set(id, state) {
@@ -75,7 +72,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
                 };
             }
         }
-        if (( Object.keys(storedViewsStates)).length > 0) {
+        if (( (Object.keys(storedViewsStates))).length > 0) {
             this.storageService.store(this.workspaceViewsStateStorageId, JSON.stringify(storedViewsStates), 1 , 1 );
         }
         else {
@@ -134,9 +131,9 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         }
     }
     initialize() {
-        const viewStates = ( new Map());
+        const viewStates = ( (new Map()));
         const workspaceViewsStates = this.getStoredWorkspaceState();
-        for (const id of ( Object.keys(workspaceViewsStates))) {
+        for (const id of ( (Object.keys(workspaceViewsStates)))) {
             const workspaceViewState = workspaceViewsStates[id];
             viewStates.set(id, {
                 active: false,
@@ -150,7 +147,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         const value = this.storageService.get(this.globalViewsStateStorageId, 1 , '[]');
         const { state: workspaceVisibilityStates } = this.parseStoredGlobalState(value);
         if (workspaceVisibilityStates.size > 0) {
-            for (const { id, isHidden } of ( workspaceVisibilityStates.values())) {
+            for (const { id, isHidden } of ( (workspaceVisibilityStates.values()))) {
                 const viewState = viewStates.get(id);
                 if (viewState) {
                     if (isUndefined(viewState.visibleWorkspace)) {
@@ -172,7 +169,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         if (hasDuplicates) {
             this.setStoredGlobalState(state);
         }
-        for (const { id, isHidden, order } of ( state.values())) {
+        for (const { id, isHidden, order } of ( (state.values()))) {
             const viewState = viewStates.get(id);
             if (viewState) {
                 viewState.visibleGlobal = !isHidden;
@@ -199,22 +196,22 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         return this.parseStoredGlobalState(this.globalViewsStatesValue).state;
     }
     setStoredGlobalState(storedGlobalState) {
-        this.globalViewsStatesValue = JSON.stringify([...( storedGlobalState.values())]);
+        this.globalViewsStatesValue = JSON.stringify([...( (storedGlobalState.values()))]);
     }
     parseStoredGlobalState(value) {
         const storedValue = JSON.parse(value);
         let hasDuplicates = false;
         const state = storedValue.reduce((result, storedState) => {
             if (typeof storedState === 'string' ) {
-                hasDuplicates = hasDuplicates || ( result.has(storedState));
+                hasDuplicates = hasDuplicates || ( (result.has(storedState)));
                 result.set(storedState, { id: storedState, isHidden: true });
             }
             else {
-                hasDuplicates = hasDuplicates || ( result.has(storedState.id));
+                hasDuplicates = hasDuplicates || ( (result.has(storedState.id)));
                 result.set(storedState.id, storedState);
             }
             return result;
-        }, ( new Map()));
+        }, ( (new Map())));
         return { state, hasDuplicates };
     }
     get globalViewsStatesValue() {
@@ -236,34 +233,40 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         this.storageService.store(this.globalViewsStateStorageId, value, 0 , 0 );
     }
 };
-ViewDescriptorsState = ( __decorate([
-    ( __param(2, IStorageService)),
-    ( __param(3, ILoggerService))
-], ViewDescriptorsState));
+ViewDescriptorsState = ( (__decorate([
+    ( (__param(2, IStorageService))),
+    ( (__param(3, ILoggerService)))
+], ViewDescriptorsState)));
 let ViewContainerModel = class ViewContainerModel extends Disposable {
     get title() { return this._title; }
     get icon() { return this._icon; }
     get keybindingId() { return this._keybindingId; }
-    get allViewDescriptors() { return ( this.viewDescriptorItems.map(item => item.viewDescriptor)); }
-    get activeViewDescriptors() { return ( this.viewDescriptorItems.filter(item => item.state.active).map(item => item.viewDescriptor)); }
-    get visibleViewDescriptors() { return ( this.viewDescriptorItems.filter(item => this.isViewDescriptorVisible(item)).map(item => item.viewDescriptor)); }
+    get allViewDescriptors() { return (
+         (this.viewDescriptorItems.map(item => item.viewDescriptor))
+    ); }
+    get activeViewDescriptors() { return (
+         (this.viewDescriptorItems.filter(item => item.state.active).map(item => item.viewDescriptor))
+    ); }
+    get visibleViewDescriptors() { return (
+         (this.viewDescriptorItems.filter(item => this.isViewDescriptorVisible(item)).map(item => item.viewDescriptor))
+    ); }
     constructor(viewContainer, instantiationService, contextKeyService, loggerService) {
         super();
         this.viewContainer = viewContainer;
         this.contextKeyService = contextKeyService;
-        this.contextKeys = ( new CounterSet());
+        this.contextKeys = ( (new CounterSet()));
         this.viewDescriptorItems = [];
-        this._onDidChangeContainerInfo = this._register(( new Emitter()));
+        this._onDidChangeContainerInfo = this._register(( (new Emitter())));
         this.onDidChangeContainerInfo = this._onDidChangeContainerInfo.event;
-        this._onDidChangeAllViewDescriptors = this._register(( new Emitter()));
+        this._onDidChangeAllViewDescriptors = this._register(( (new Emitter())));
         this.onDidChangeAllViewDescriptors = this._onDidChangeAllViewDescriptors.event;
-        this._onDidChangeActiveViewDescriptors = this._register(( new Emitter()));
+        this._onDidChangeActiveViewDescriptors = this._register(( (new Emitter())));
         this.onDidChangeActiveViewDescriptors = this._onDidChangeActiveViewDescriptors.event;
-        this._onDidAddVisibleViewDescriptors = this._register(( new Emitter()));
+        this._onDidAddVisibleViewDescriptors = this._register(( (new Emitter())));
         this.onDidAddVisibleViewDescriptors = this._onDidAddVisibleViewDescriptors.event;
-        this._onDidRemoveVisibleViewDescriptors = this._register(( new Emitter()));
+        this._onDidRemoveVisibleViewDescriptors = this._register(( (new Emitter())));
         this.onDidRemoveVisibleViewDescriptors = this._onDidRemoveVisibleViewDescriptors.event;
-        this._onDidMoveVisibleViewDescriptors = this._register(( new Emitter()));
+        this._onDidMoveVisibleViewDescriptors = this._register(( (new Emitter())));
         this.onDidMoveVisibleViewDescriptors = this._onDidMoveVisibleViewDescriptors.event;
         this.logger = loggerService.createLogger(VIEWS_LOG_ID, { name: VIEWS_LOG_NAME, hidden: true });
         this._register(Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(this.contextKeys))(() => this.onDidChangeContext()));
@@ -272,7 +275,9 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         this.updateContainerInfo();
     }
     updateContainerInfo() {
-        const useDefaultContainerInfo = this.viewContainer.alwaysUseContainerInfo || this.visibleViewDescriptors.length === 0 || ( this.visibleViewDescriptors.some(v => ( Registry.as(Extensions.ViewsRegistry)).getViewContainer(v.id) === this.viewContainer));
+        const useDefaultContainerInfo = this.viewContainer.alwaysUseContainerInfo || this.visibleViewDescriptors.length === 0 || ( (this.visibleViewDescriptors.some(
+            v => ( (Registry.as(Extensions.ViewsRegistry))).getViewContainer(v.id) === this.viewContainer
+        )));
         const title = useDefaultContainerInfo ? (typeof this.viewContainer.title === 'string' ? this.viewContainer.title : this.viewContainer.title.value) : this.visibleViewDescriptors[0]?.containerTitle || this.visibleViewDescriptors[0]?.name?.value || '';
         let titleChanged = false;
         if (this._title !== title) {
@@ -307,7 +312,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
     isVisible(id) {
         const viewDescriptorItem = this.viewDescriptorItems.find(v => v.viewDescriptor.id === id);
         if (!viewDescriptorItem) {
-            throw new Error(`Unknown view ${id}`);
+            throw ( (new Error(`Unknown view ${id}`)));
         }
         return this.isViewDescriptorVisible(viewDescriptorItem);
     }
@@ -315,8 +320,8 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         this.updateVisibility([{ id, visible }]);
     }
     updateVisibility(viewDescriptors) {
-        const viewDescriptorItemsToHide = coalesce(( viewDescriptors.filter(({ visible }) => !visible)
-            .map(({ id }) => this.findAndIgnoreIfNotFound(id))));
+        const viewDescriptorItemsToHide = coalesce(( (viewDescriptors.filter(({ visible }) => !visible)
+            .map(({ id }) => this.findAndIgnoreIfNotFound(id)))));
         const removed = [];
         for (const { viewDescriptorItem, visibleIndex } of viewDescriptorItemsToHide) {
             if (this.updateViewDescriptorItemVisibility(viewDescriptorItem, false)) {
@@ -400,7 +405,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         for (const addedViewDescriptorState of addedViewDescriptorStates) {
             const viewDescriptor = addedViewDescriptorState.viewDescriptor;
             if (viewDescriptor.when) {
-                for (const key of ( viewDescriptor.when.keys())) {
+                for (const key of ( (viewDescriptor.when.keys()))) {
                     this.contextKeys.add(key);
                 }
             }
@@ -432,7 +437,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         }
         this.viewDescriptorItems.push(...addedItems);
         this.viewDescriptorItems.sort(this.compareViewDescriptors.bind(this));
-        this._onDidChangeAllViewDescriptors.fire({ added: ( addedItems.map(({ viewDescriptor }) => viewDescriptor)), removed: [] });
+        this._onDidChangeAllViewDescriptors.fire({ added: ( (addedItems.map(({ viewDescriptor }) => viewDescriptor))), removed: [] });
         const addedActiveItems = [];
         for (const viewDescriptorItem of addedItems) {
             if (viewDescriptorItem.state.active) {
@@ -440,7 +445,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
             }
         }
         if (addedActiveItems.length) {
-            this._onDidChangeActiveViewDescriptors.fire(({ added: ( addedActiveItems.map(({ viewDescriptorItem }) => viewDescriptorItem.viewDescriptor)), removed: [] }));
+            this._onDidChangeActiveViewDescriptors.fire(({ added: ( (addedActiveItems.map(({ viewDescriptorItem }) => viewDescriptorItem.viewDescriptor))), removed: [] }));
         }
         const addedVisibleDescriptors = [];
         for (const { viewDescriptorItem, visible } of addedActiveItems) {
@@ -458,7 +463,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         const removedVisibleDescriptors = [];
         for (const viewDescriptor of viewDescriptors) {
             if (viewDescriptor.when) {
-                for (const key of ( viewDescriptor.when.keys())) {
+                for (const key of ( (viewDescriptor.when.keys()))) {
                     this.contextKeys.delete(key);
                 }
             }
@@ -511,7 +516,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         addedActiveItems.forEach(({ item }) => item.state.active = true);
         this.broadCastRemovedVisibleViewDescriptors(removedVisibleDescriptors);
         if (addedActiveItems.length || removedActiveItems.length) {
-            this._onDidChangeActiveViewDescriptors.fire(({ added: ( addedActiveItems.map(({ item }) => item.viewDescriptor)), removed: ( removedActiveItems.map(item => item.viewDescriptor)) }));
+            this._onDidChangeActiveViewDescriptors.fire(({ added: ( (addedActiveItems.map(({ item }) => item.viewDescriptor))), removed: ( (removedActiveItems.map(item => item.viewDescriptor))) }));
         }
         const addedVisibleDescriptors = [];
         for (const { item, visibleWhenActive } of addedActiveItems) {
@@ -525,13 +530,13 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
     broadCastAddedVisibleViewDescriptors(added) {
         if (added.length) {
             this._onDidAddVisibleViewDescriptors.fire(added.sort((a, b) => a.index - b.index));
-            this.updateState(`Added views:${( added.map(v => v.viewDescriptor.id)).join(',')} in ${this.viewContainer.id}`);
+            this.updateState(`Added views:${( (added.map(v => v.viewDescriptor.id))).join(',')} in ${this.viewContainer.id}`);
         }
     }
     broadCastRemovedVisibleViewDescriptors(removed) {
         if (removed.length) {
             this._onDidRemoveVisibleViewDescriptors.fire(removed.sort((a, b) => b.index - a.index));
-            this.updateState(`Removed views:${( removed.map(v => v.viewDescriptor.id)).join(',')} from ${this.viewContainer.id}`);
+            this.updateState(`Removed views:${( (removed.map(v => v.viewDescriptor.id))).join(',')} from ${this.viewContainer.id}`);
         }
     }
     broadCastMovedViewDescriptors(from, to) {
@@ -560,7 +565,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         if (result) {
             return result;
         }
-        throw new Error(`view descriptor ${id} not found`);
+        throw ( (new Error(`view descriptor ${id} not found`)));
     }
     findAndIgnoreIfNotFound(id) {
         for (let i = 0, visibleIndex = 0; i < this.viewDescriptorItems.length; i++) {
@@ -594,10 +599,10 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         return a.group < b.group ? -1 : 1;
     }
 };
-ViewContainerModel = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, ILoggerService))
-], ViewContainerModel));
+ViewContainerModel = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, ILoggerService)))
+], ViewContainerModel)));
 
 export { ViewContainerModel, getViewsStateStorageId };

package/viewCommon.d.ts

@@ -1,5 +0,0 @@
-import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
-
-declare function getServiceOverride(_webviewIframeAlternateDomains?: string): IEditorOverrideServices;
-
-export { getServiceOverride as default };