@codingame/monaco-vscode-view-common-service-override 5.2.0 → 6.0.0

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

@@ -1,14 +1,16 @@
 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 { 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 { 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';
@@ -16,6 +18,7 @@ import { getViewsStateStorageId, ViewContainerModel } from '../common/viewContai
 import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { localizeWithPath, localize2WithPath } 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';
 
 var ViewDescriptorService_1;
 const _moduleId = "vs/workbench/services/views/browser/viewDescriptorService";
@@ -43,7 +46,9 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         this.canRegisterViewsVisibilityActions = false;
         this._onDidChangeViewContainers = this._register(( (new Emitter())));
         this.onDidChangeViewContainers = this._onDidChangeViewContainers.event;
-        this.logger = loggerService.createLogger(VIEWS_LOG_ID, { name: VIEWS_LOG_NAME, hidden: true });
+        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()));
@@ -66,15 +71,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._register(( (new DisposableStore()))))(() => 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;
         }
@@ -85,9 +90,9 @@ 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()) {
@@ -206,7 +211,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         return this.viewContainersRegistry.getDefaultViewContainer(location);
     }
     moveViewContainerToLocation(viewContainer, location, requestedIndex, reason) {
-        this.logger.info(`moveViewContainerToLocation: viewContainer:${viewContainer.id} location:${location} reason:${reason}`);
+        this.logger.value.info(`moveViewContainerToLocation: viewContainer:${viewContainer.id} location:${location} reason:${reason}`);
         this.moveViewContainerToLocationWithoutSaving(viewContainer, location, requestedIndex);
         this.saveViewCustomizations();
     }
@@ -218,7 +223,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         this.saveViewCustomizations();
     }
     moveViewToLocation(view, location, reason) {
-        this.logger.info(`moveViewToLocation: view:${view.id} location:${location} reason:${reason}`);
+        this.logger.value.info(`moveViewToLocation: view:${view.id} location:${location} reason:${reason}`);
         const container = this.registerGeneratedViewContainer(location);
         this.moveViewsToContainer([view], container);
     }
@@ -226,7 +231,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         if (!views.length) {
             return;
         }
-        this.logger.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) {
@@ -283,8 +288,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) {
@@ -332,7 +337,7 @@ 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);
@@ -340,7 +345,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             id,
             ctorDescriptor: ( (new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }]))),
             title: { value: id, original: id },
-            icon: location === 0  ? defaultViewIcon : undefined,
+            icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
             storageId: getViewContainerStorageId(id),
             hideIfEmpty: true
         }, location, { doNotRegisterOpenCommand: true });
@@ -458,10 +463,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 => {

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, defaultViewIcon } from 'vscode/vscode/vs/workbench/common/views';
 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 { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -17,6 +18,7 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output.service';
 import { CounterSet } from 'vscode/vscode/vs/base/common/map';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
 
 const _moduleId = "vs/workbench/services/views/common/viewContainerModel";
 registerAction2(class extends Action2 {
@@ -43,10 +45,12 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         this.storageService = storageService;
         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.logger = ( (new Lazy(
+            () => 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(StorageScope.PROFILE, this.globalViewsStateStorageId, this._register(( (new DisposableStore()))))(() => this.onDidStorageChange()));
         this.state = this.initialize();
     }
     set(id, state) {
@@ -73,10 +77,10 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
             }
         }
         if (( (Object.keys(storedViewsStates))).length > 0) {
-            this.storageService.store(this.workspaceViewsStateStorageId, JSON.stringify(storedViewsStates), 1 , 1 );
+            this.storageService.store(this.workspaceViewsStateStorageId, JSON.stringify(storedViewsStates), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(this.workspaceViewsStateStorageId, 1 );
+            this.storageService.remove(this.workspaceViewsStateStorageId, StorageScope.WORKSPACE);
         }
     }
     updateGlobalState(viewDescriptors) {
@@ -102,7 +106,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
                 if (state) {
                     if (state.visibleGlobal !== !storedState.isHidden) {
                         if (!storedState.isHidden) {
-                            this.logger.info(`View visibility state changed: ${id} is now visible`, this.viewContainerName);
+                            this.logger.value.info(`View visibility state changed: ${id} is now visible`, this.viewContainerName);
                         }
                         changedStates.push({ id, visible: !storedState.isHidden });
                     }
@@ -144,7 +148,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
                 size: workspaceViewState.size,
             });
         }
-        const value = this.storageService.get(this.globalViewsStateStorageId, 1 , '[]');
+        const value = this.storageService.get(this.globalViewsStateStorageId, StorageScope.WORKSPACE, '[]');
         const { state: workspaceVisibilityStates } = this.parseStoredGlobalState(value);
         if (workspaceVisibilityStates.size > 0) {
             for (const { id, isHidden } of ( (workspaceVisibilityStates.values()))) {
@@ -163,7 +167,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
                     });
                 }
             }
-            this.storageService.remove(this.globalViewsStateStorageId, 1 );
+            this.storageService.remove(this.globalViewsStateStorageId, StorageScope.WORKSPACE);
         }
         const { state, hasDuplicates } = this.parseStoredGlobalState(this.globalViewsStatesValue);
         if (hasDuplicates) {
@@ -190,7 +194,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         return viewStates;
     }
     getStoredWorkspaceState() {
-        return JSON.parse(this.storageService.get(this.workspaceViewsStateStorageId, 1 , '{}'));
+        return JSON.parse(this.storageService.get(this.workspaceViewsStateStorageId, StorageScope.WORKSPACE, '{}'));
     }
     getStoredGlobalState() {
         return this.parseStoredGlobalState(this.globalViewsStatesValue).state;
@@ -227,10 +231,10 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         }
     }
     getStoredGlobalViewsStatesValue() {
-        return this.storageService.get(this.globalViewsStateStorageId, 0 , '[]');
+        return this.storageService.get(this.globalViewsStateStorageId, StorageScope.PROFILE, '[]');
     }
     setStoredGlobalViewsStatesValue(value) {
-        this.storageService.store(this.globalViewsStateStorageId, value, 0 , 0 );
+        this.storageService.store(this.globalViewsStateStorageId, value, StorageScope.PROFILE, StorageTarget.USER);
     }
 };
 ViewDescriptorsState = ( (__decorate([
@@ -268,7 +272,9 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         this.onDidRemoveVisibleViewDescriptors = this._onDidRemoveVisibleViewDescriptors.event;
         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.logger = ( (new Lazy(
+            () => loggerService.createLogger(VIEWS_LOG_ID, { name: VIEWS_LOG_NAME, hidden: true })
+        )));
         this._register(Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(this.contextKeys))(() => this.onDidChangeContext()));
         this.viewDescriptorsState = this._register(instantiationService.createInstance(ViewDescriptorsState, viewContainer.storageId || `${viewContainer.id}.state`, typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.original));
         this._register(this.viewDescriptorsState.onDidChangeStoredState(items => this.updateVisibility(items)));
@@ -362,7 +368,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         else {
             viewDescriptorItem.state.visibleGlobal = visible;
             if (visible) {
-                this.logger.info(`Showing view ${viewDescriptorItem.viewDescriptor.id} in the container ${this.viewContainer.id}`);
+                this.logger.value.info(`Showing view ${viewDescriptorItem.viewDescriptor.id} in the container ${this.viewContainer.id}`);
             }
         }
         return this.isViewDescriptorVisible(viewDescriptorItem) === visible;
@@ -418,7 +424,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
                     const isVisible = state.visibleGlobal;
                     state.visibleGlobal = isUndefinedOrNull(addedViewDescriptorState.visible) ? (isUndefinedOrNull(state.visibleGlobal) ? !viewDescriptor.hideByDefault : state.visibleGlobal) : addedViewDescriptorState.visible;
                     if (state.visibleGlobal && !isVisible) {
-                        this.logger.info(`Added view ${viewDescriptor.id} in the container ${this.viewContainer.id} and showing it.`, `${isVisible}`, `${viewDescriptor.hideByDefault}`, `${addedViewDescriptorState.visible}`);
+                        this.logger.value.info(`Added view ${viewDescriptor.id} in the container ${this.viewContainer.id} and showing it.`, `${isVisible}`, `${viewDescriptor.hideByDefault}`, `${addedViewDescriptorState.visible}`);
                     }
                 }
                 state.collapsed = isUndefinedOrNull(addedViewDescriptorState.collapsed) ? (isUndefinedOrNull(state.collapsed) ? !!viewDescriptor.collapsed : state.collapsed) : addedViewDescriptorState.collapsed;
@@ -544,7 +550,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
         this.updateState(`Moved view ${from.viewDescriptor.id} to ${to.viewDescriptor.id} in ${this.viewContainer.id}`);
     }
     updateState(reason) {
-        this.logger.info(reason);
+        this.logger.value.info(reason);
         this.viewDescriptorsState.updateState(this.allViewDescriptors);
         this.updateContainerInfo();
     }

package/vscode/src/vs/base/browser/deviceAccess.js

@@ -1,61 +0,0 @@
-async function requestUsbDevice(options) {
-    const usb = navigator.usb;
-    if (!usb) {
-        return undefined;
-    }
-    const device = await usb.requestDevice({ filters: options?.filters ?? [] });
-    if (!device) {
-        return undefined;
-    }
-    return {
-        deviceClass: device.deviceClass,
-        deviceProtocol: device.deviceProtocol,
-        deviceSubclass: device.deviceSubclass,
-        deviceVersionMajor: device.deviceVersionMajor,
-        deviceVersionMinor: device.deviceVersionMinor,
-        deviceVersionSubminor: device.deviceVersionSubminor,
-        manufacturerName: device.manufacturerName,
-        productId: device.productId,
-        productName: device.productName,
-        serialNumber: device.serialNumber,
-        usbVersionMajor: device.usbVersionMajor,
-        usbVersionMinor: device.usbVersionMinor,
-        usbVersionSubminor: device.usbVersionSubminor,
-        vendorId: device.vendorId,
-    };
-}
-async function requestSerialPort(options) {
-    const serial = navigator.serial;
-    if (!serial) {
-        return undefined;
-    }
-    const port = await serial.requestPort({ filters: options?.filters ?? [] });
-    if (!port) {
-        return undefined;
-    }
-    const info = port.getInfo();
-    return {
-        usbVendorId: info.usbVendorId,
-        usbProductId: info.usbProductId
-    };
-}
-async function requestHidDevice(options) {
-    const hid = navigator.hid;
-    if (!hid) {
-        return undefined;
-    }
-    const devices = await hid.requestDevice({ filters: options?.filters ?? [] });
-    if (!devices.length) {
-        return undefined;
-    }
-    const device = devices[0];
-    return {
-        opened: device.opened,
-        vendorId: device.vendorId,
-        productId: device.productId,
-        productName: device.productName,
-        collections: device.collections
-    };
-}
-
-export { requestHidDevice, requestSerialPort, requestUsbDevice };

package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js

@@ -1,13 +0,0 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-
-const _moduleId = "vs/platform/languagePacks/common/localizedStrings";
-const open = ( localizeWithPath(_moduleId, 0, 'open'));
-const close = ( localizeWithPath(_moduleId, 1, 'close'));
-const find = ( localizeWithPath(_moduleId, 2, 'find'));
-var localizedStrings = {
-    open: open,
-    close: close,
-    find: find
-};
-
-export { localizedStrings as default };