@codingame/monaco-vscode-view-common-service-override 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -2,9 +2,8 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/progressService.css.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { Disposable, toDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ProgressLocation, Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { timeout, DeferredPromise, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { ProgressBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
@@ -13,19 +12,16 @@ import { NotificationPriority, NotificationsFilter, isNotificationSource } from
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
 import { Dialog } from 'vscode/vscode/vs/base/browser/ui/dialog/dialog';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { EventHelper } from 'vscode/vscode/vs/base/browser/dom';
 import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
-import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
 import { IUserActivityService } from 'vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
@@ -72,7 +68,7 @@ let ProgressService = class ProgressService extends Disposable {
             return handleStringLocation(location);
         }
         switch (location) {
-            case ProgressLocation.Notification: {
+            case 15 : {
                 let priority = options.priority;
                 if (priority !== NotificationPriority.URGENT) {
                     if (this.notificationService.getFilter() === NotificationsFilter.ERROR) {
@@ -84,20 +80,20 @@ let ProgressService = class ProgressService extends Disposable {
                 }
                 return this.withNotificationProgress({ ...options, location, priority }, task, onDidCancel);
             }
-            case ProgressLocation.Window: {
+            case 10 : {
                 const type = options.type;
                 if (options.command) {
                     return this.withWindowProgress({ ...options, location, type }, task);
                 }
-                return this.withNotificationProgress({ delay: 150 , ...options, priority: NotificationPriority.SILENT, location: ProgressLocation.Notification, type }, task, onDidCancel);
+                return this.withNotificationProgress({ delay: 150 , ...options, priority: NotificationPriority.SILENT, location: 15 , type }, task, onDidCancel);
             }
-            case ProgressLocation.Explorer:
-                return this.withPaneCompositeProgress('workbench.view.explorer', ViewContainerLocation.Sidebar, task, { ...options, location });
-            case ProgressLocation.Scm:
+            case 1 :
+                return this.withPaneCompositeProgress('workbench.view.explorer', 0 , task, { ...options, location });
+            case 3 :
                 return handleStringLocation('workbench.scm');
-            case ProgressLocation.Extensions:
-                return this.withPaneCompositeProgress('workbench.view.extensions', ViewContainerLocation.Sidebar, task, { ...options, location });
-            case ProgressLocation.Dialog:
+            case 5 :
+                return this.withPaneCompositeProgress('workbench.view.extensions', 0 , task, { ...options, location });
+            case 20 :
                 return this.withDialogProgress(options, task, onDidCancel);
             default:
                 throw ( (new Error(`Bad progress location: ${location}`)));
@@ -131,23 +127,23 @@ let ProgressService = class ProgressService extends Disposable {
             let title;
             const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
             if (progressTitle && progressMessage) {
-                text = ( localize(4101, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(4102, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(4210, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(4211, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             }
             else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(4103, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(4212, "[{0}]: {1}", source, progressTitle)) : text;
             }
             else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(4103, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(4212, "[{0}]: {1}", source, progressMessage)) : text;
             }
             else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(4104, "Progress Message")),
+                name: ( localize(4213, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -158,7 +154,7 @@ let ProgressService = class ProgressService extends Disposable {
                 this.windowProgressStatusEntry.update(statusEntryProperties);
             }
             else {
-                this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', StatusbarAlignment.LEFT);
+                this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', 0 );
             }
         }
         else {
@@ -200,7 +196,7 @@ let ProgressService = class ProgressService extends Disposable {
         const createWindowProgress = () => {
             const promise = ( (new DeferredPromise()));
             this.withWindowProgress({
-                location: ProgressLocation.Window,
+                location: 10 ,
                 title: options.title ? ( (parseLinkedText(options.title).toString())) : undefined,
                 command: 'notifications.showList',
                 type: options.type
@@ -243,7 +239,7 @@ let ProgressService = class ProgressService extends Disposable {
             if (options.cancellable) {
                 const cancelAction = new (class extends Action {
                     constructor() {
-                        super('progress.cancel', ( localize(4105, "Cancel")), undefined, true);
+                        super('progress.cancel', ( localize(4214, "Cancel")), undefined, true);
                     }
                     async run() {
                         progressStateModel.cancel();
@@ -334,7 +330,7 @@ let ProgressService = class ProgressService extends Disposable {
     withPaneCompositeProgress(paneCompositeId, viewContainerLocation, task, options) {
         const progressIndicator = this.paneCompositeService.getProgressIndicator(paneCompositeId, viewContainerLocation);
         const promise = progressIndicator ? this.withCompositeProgress(progressIndicator, task, options) : task({ report: () => { } });
-        if (viewContainerLocation === ViewContainerLocation.Sidebar) {
+        if (viewContainerLocation === 0 ) {
             this.showOnActivityBar(paneCompositeId, options, promise);
         }
         return promise;
@@ -343,7 +339,7 @@ let ProgressService = class ProgressService extends Disposable {
         const progressIndicator = this.viewsService.getViewProgressIndicator(viewId);
         const promise = progressIndicator ? this.withCompositeProgress(progressIndicator, task, options) : task({ report: () => { } });
         const location = this.viewDescriptorService.getViewLocationById(viewId);
-        if (location !== ViewContainerLocation.Sidebar) {
+        if (location !== 0 ) {
             return promise;
         }
         const viewletId = this.viewDescriptorService.getViewContainerByViewId(viewId)?.id;
@@ -428,7 +424,7 @@ let ProgressService = class ProgressService extends Disposable {
         const createDialog = (message) => {
             const buttons = options.buttons || [];
             if (!options.sticky) {
-                buttons.push(options.cancellable ? ( localize(4105, "Cancel")) : ( localize(4106, "Dismiss")));
+                buttons.push(options.cancellable ? ( localize(4214, "Cancel")) : ( localize(4215, "Dismiss")));
             }
             dialog = ( (new Dialog(this.layoutService.activeContainer, message, buttons, {
                 type: 'pending',
@@ -438,7 +434,7 @@ let ProgressService = class ProgressService extends Disposable {
                 disableDefaultAction: options.sticky,
                 keyEventProcessor: (event) => {
                     const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
-                    if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
+                    if (resolved.kind === 2  && resolved.commandId) {
                         if (!allowableCommands.includes(resolved.commandId)) {
                             EventHelper.stop(event, true);
                         }

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js

@@ -7,7 +7,6 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 var UntitledTextEditorService_1;
 let UntitledTextEditorService = class UntitledTextEditorService extends Disposable {

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

@@ -1,16 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, ViewContainerLocation, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from 'vscode/vscode/vs/workbench/common/views';
+import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, 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';
@@ -70,15 +68,15 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             this.onDidDeregisterViewContainer(viewContainer);
             this._onDidChangeViewContainers.fire({ removed: [{ container: viewContainer, location: viewContainerLocation }], added: [] });
         }));
-        this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, this._register(( (new DisposableStore()))))(() => this.onDidStorageChange()));
+        this._register(this.storageService.onDidChangeValue(0 , 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, StorageScope.PROFILE)) {
+        if (this.storageService.get(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, 0 )) {
             return;
         }
-        const viewContainerLocationsValue = this.storageService.get('views.cachedViewContainerLocations', StorageScope.PROFILE);
-        const viewDescriptorLocationsValue = this.storageService.get('views.cachedViewPositions', StorageScope.PROFILE);
+        const viewContainerLocationsValue = this.storageService.get('views.cachedViewContainerLocations', 0 );
+        const viewDescriptorLocationsValue = this.storageService.get('views.cachedViewPositions', 0 );
         if (!viewContainerLocationsValue && !viewDescriptorLocationsValue) {
             return;
         }
@@ -89,9 +87,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), StorageScope.PROFILE, StorageTarget.USER);
-        this.storageService.remove('views.cachedViewContainerLocations', StorageScope.PROFILE);
-        this.storageService.remove('views.cachedViewPositions', StorageScope.PROFILE);
+        this.storageService.store(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, JSON.stringify(viewsCustomizations), 0 , 0 );
+        this.storageService.remove('views.cachedViewContainerLocations', 0 );
+        this.storageService.remove('views.cachedViewPositions', 0 );
     }
     registerGroupedViews(groupedViews) {
         for (const [containerId, views] of groupedViews.entries()) {
@@ -287,8 +285,8 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         const viewCount = views.length;
         const fromContainer = containerToString(from);
         const toContainer = containerToString(to);
-        const fromLocation = oldLocation === ViewContainerLocation.Panel ? 'panel' : 'sidebar';
-        const toLocation = newLocation === ViewContainerLocation.Panel ? 'panel' : 'sidebar';
+        const fromLocation = oldLocation === 1  ? 'panel' : 'sidebar';
+        const toLocation = newLocation === 1  ? 'panel' : 'sidebar';
         this.telemetryService.publicLog2('viewDescriptorService.moveViews', { viewCount, fromContainer, toContainer, fromLocation, toLocation });
     }
     moveViewsWithoutSaving(views, from, to, visibilityState = ViewVisibilityState.Expand) {
@@ -336,7 +334,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         }
         this.viewContainersCustomLocations.delete(viewContainerId);
         this.viewContainerBadgeEnablementStates.delete(viewContainerId);
-        this.storageService.remove(getViewsStateStorageId(viewContainer?.storageId || getViewContainerStorageId(viewContainerId)), StorageScope.PROFILE);
+        this.storageService.remove(getViewsStateStorageId(viewContainer?.storageId || getViewContainerStorageId(viewContainerId)), 0 );
     }
     registerGeneratedViewContainer(location, existingId) {
         const id = existingId || this.generateContainerId(location);
@@ -344,7 +342,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             id,
             ctorDescriptor: ( (new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }]))),
             title: { value: id, original: id },
-            icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
+            icon: location === 0  ? defaultViewIcon : undefined,
             storageId: getViewContainerStorageId(id),
             hideIfEmpty: true
         }, location, { doNotRegisterOpenCommand: true });
@@ -462,10 +460,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         }
     }
     getStoredViewCustomizationsValue() {
-        return this.storageService.get(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, StorageScope.PROFILE, '{}');
+        return this.storageService.get(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, 0 , '{}');
     }
     setStoredViewCustomizationsValue(value) {
-        this.storageService.store(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, value, StorageScope.PROFILE, StorageTarget.USER);
+        this.storageService.store(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, value, 0 , 0 );
     }
     getViewsByContainer(viewContainer) {
         const result = this.viewsRegistry.getViews(viewContainer).filter(viewDescriptor => {
@@ -585,7 +583,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(4040, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(4149, "Hide '{0}'", viewDescriptor.name.value)),
                             precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( (ContextKeyExpr.false())),
                             menu: [{
                                     id: MenuId.ViewTitleContext,
@@ -612,7 +610,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(4041, "Reset Location")),
+                    title: ( localize2(4150, "Reset Location")),
                     menu: [{
                             id: MenuId.ViewContainerTitleContext,
                             when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(

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

@@ -1,7 +1,6 @@
 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';
@@ -24,7 +23,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: '_workbench.output.showViewsLog',
-            title: ( localize2(9531, "Show Views Log")),
+            title: ( localize2(9613, "Show Views Log")),
             category: Categories.Developer,
             f1: true
         });
@@ -49,7 +48,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         )));
         this.globalViewsStateStorageId = getViewsStateStorageId(viewContainerStorageId);
         this.workspaceViewsStateStorageId = viewContainerStorageId;
-        this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, 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) {
@@ -76,10 +75,10 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
             }
         }
         if (( (Object.keys(storedViewsStates))).length > 0) {
-            this.storageService.store(this.workspaceViewsStateStorageId, JSON.stringify(storedViewsStates), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this.storageService.store(this.workspaceViewsStateStorageId, JSON.stringify(storedViewsStates), 1 , 1 );
         }
         else {
-            this.storageService.remove(this.workspaceViewsStateStorageId, StorageScope.WORKSPACE);
+            this.storageService.remove(this.workspaceViewsStateStorageId, 1 );
         }
     }
     updateGlobalState(viewDescriptors) {
@@ -147,7 +146,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
                 size: workspaceViewState.size,
             });
         }
-        const value = this.storageService.get(this.globalViewsStateStorageId, StorageScope.WORKSPACE, '[]');
+        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()))) {
@@ -166,7 +165,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
                     });
                 }
             }
-            this.storageService.remove(this.globalViewsStateStorageId, StorageScope.WORKSPACE);
+            this.storageService.remove(this.globalViewsStateStorageId, 1 );
         }
         const { state, hasDuplicates } = this.parseStoredGlobalState(this.globalViewsStatesValue);
         if (hasDuplicates) {
@@ -193,7 +192,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         return viewStates;
     }
     getStoredWorkspaceState() {
-        return JSON.parse(this.storageService.get(this.workspaceViewsStateStorageId, StorageScope.WORKSPACE, '{}'));
+        return JSON.parse(this.storageService.get(this.workspaceViewsStateStorageId, 1 , '{}'));
     }
     getStoredGlobalState() {
         return this.parseStoredGlobalState(this.globalViewsStatesValue).state;
@@ -230,10 +229,10 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
         }
     }
     getStoredGlobalViewsStatesValue() {
-        return this.storageService.get(this.globalViewsStateStorageId, StorageScope.PROFILE, '[]');
+        return this.storageService.get(this.globalViewsStateStorageId, 0 , '[]');
     }
     setStoredGlobalViewsStatesValue(value) {
-        this.storageService.store(this.globalViewsStateStorageId, value, StorageScope.PROFILE, StorageTarget.USER);
+        this.storageService.store(this.globalViewsStateStorageId, value, 0 , 0 );
     }
 };
 ViewDescriptorsState = ( (__decorate([