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

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js

@@ -1,7 +1,9 @@
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.service';
@@ -26,8 +28,8 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED
                 ))),
-                primary: 2048  | 36 ,
-                weight: 100
+                primary: KeyMod.CtrlCmd | KeyCode.KeyF,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -47,8 +49,8 @@ class HideWebViewEditorFindCommand extends Action2 {
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE
                 ))),
-                primary: 9 ,
-                weight: 100
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -68,8 +70,8 @@ class WebViewEditorFindNextCommand extends Action2 {
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
                 ))),
-                primary: 3 ,
-                weight: 100
+                primary: KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -89,8 +91,8 @@ class WebViewEditorFindPreviousCommand extends Action2 {
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
                 ))),
-                primary: 1024  | 3 ,
-                weight: 100
+                primary: KeyMod.Shift | KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js

@@ -3,9 +3,10 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ShowWebViewEditorFindWidgetAction, HideWebViewEditorFindCommand, WebViewEditorFindNextCommand, WebViewEditorFindPreviousCommand, ReloadWebviewAction } from './webviewCommands.js';
@@ -55,7 +56,7 @@ WebviewPanelContribution = ( (__decorate([
     ( (__param(0, IEditorService))),
     ( (__param(1, IEditorGroupsService)))
 ], WebviewPanelContribution)));
-registerWorkbenchContribution2(WebviewPanelContribution.ID, WebviewPanelContribution, 1 );
+registerWorkbenchContribution2(WebviewPanelContribution.ID, WebviewPanelContribution, WorkbenchPhase.BlockStartup);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(WebviewEditorInputSerializer.ID, WebviewEditorInputSerializer);
 registerAction2(ShowWebViewEditorFindWidgetAction);
 registerAction2(HideWebViewEditorFindCommand);

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.js

@@ -11,6 +11,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
@@ -18,7 +19,7 @@ import { ViewPane, ViewPaneShowActions } from 'vscode/vscode/vs/workbench/browse
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { ExtensionKeyedWebviewOriginStore } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
+import { ExtensionKeyedWebviewOriginStore, WebviewContentPurpose } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { WebviewWindowDragMonitor } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
 import { IWebviewViewService } from 'vscode/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService.service';
@@ -57,7 +58,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         this.extensionId = options.fromExtensionId;
         this.defaultTitle = this.title;
         this.memento = ( new Memento(`webviewView.${this.id}`, storageService));
-        this.viewState = this.memento.getMemento(1 , 1 );
+        this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         this._register(this.onDidChangeBodyVisibility(() => this.updateTreeVisibility()));
         this._register(this.webviewViewService.onNewResolverRegistered(e => {
             if (e.viewType === this.id) {
@@ -121,7 +122,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
             origin,
             providedViewType: this.id,
             title: this.title,
-            options: { purpose: "webviewView"  },
+            options: { purpose: WebviewContentPurpose.WebviewView },
             contentOptions: {},
             extension: this.extensionId ? { id: this.extensionId } : undefined
         });

package/vscode/src/vs/workbench/services/activity/browser/activityService.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from 'vscode/vscode/vs/workbench/common/activity';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';

package/vscode/src/vs/workbench/services/editor/browser/editorPaneService.js

@@ -1,5 +1,6 @@
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 class EditorPaneService {
     constructor() {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isRelativePattern } from 'vscode/vscode/vs/base/common/glob';
-import { insert, flatten, distinct, firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
+import { insert, distinct, firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isEqual, extname, basename } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -9,13 +9,15 @@ import { EditorResolution, EditorActivation } from 'vscode/vscode/vs/platform/ed
 import { isResourceSideBySideEditorInput, EditorResourceAccessor, SideBySideEditor, isEditorInputWithOptions, DEFAULT_EDITOR_ASSOCIATION, isResourceDiffEditorInput, isEditorInputWithOptionsAndGroup, isResourceMergeEditorInput, isResourceMultiDiffEditorInput, isUntitledResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { globMatchesResource, editorsAssociationsSettingId, RegisteredEditorPriority, priorityToRank } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
+import { ResolvedStatus, globMatchesResource, editorsAssociationsSettingId, RegisteredEditorPriority, priorityToRank } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+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 { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -48,9 +50,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         this._flattenedEditors = ( (new Map()));
         this._shouldReFlattenEditors = true;
         this.cache = ( (new Set(
-            JSON.parse(this.storageService.get(EditorResolverService_1.cacheStorageID, 0 , JSON.stringify([])))
+            JSON.parse(this.storageService.get(EditorResolverService_1.cacheStorageID, StorageScope.PROFILE, JSON.stringify([])))
         )));
-        this.storageService.remove(EditorResolverService_1.cacheStorageID, 0 );
+        this.storageService.remove(EditorResolverService_1.cacheStorageID, StorageScope.PROFILE);
         this._register(this.storageService.onWillSaveState(() => {
             this.cacheEditors();
         }));
@@ -83,7 +85,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             resolvedUntypedAndGroup = resolvedUntypedAndGroupResult;
         }
         if (!resolvedUntypedAndGroup) {
-            return 2 ;
+            return ResolvedStatus.NONE;
         }
         const [untypedEditor, group, activation] = resolvedUntypedAndGroup;
         if (activation) {
@@ -97,25 +99,25 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             resource = ( (URI.from({ scheme: Schemas.untitled })));
         }
         else if (resource.scheme === undefined || resource === null) {
-            return 2 ;
+            return ResolvedStatus.NONE;
         }
         if (untypedEditor.options?.override === EditorResolution.PICK) {
             const picked = await this.doPickEditor(untypedEditor);
             if (!picked) {
-                return 1 ;
+                return ResolvedStatus.ABORT;
             }
             untypedEditor.options = picked;
         }
         let { editor: selectedEditor, conflictingDefault } = this.getEditor(resource, untypedEditor.options?.override);
         if (!selectedEditor && (untypedEditor.options?.override || isEditorInputWithOptions(editor))) {
-            return 2 ;
+            return ResolvedStatus.NONE;
         }
         else if (!selectedEditor) {
             const resolvedEditor = this.getEditor(resource, DEFAULT_EDITOR_ASSOCIATION.id);
             selectedEditor = resolvedEditor?.editor;
             conflictingDefault = resolvedEditor?.conflictingDefault;
             if (!selectedEditor) {
-                return 2 ;
+                return ResolvedStatus.NONE;
             }
         }
         if (isResourceDiffEditorInput(untypedEditor) && untypedEditor.options?.override === undefined) {
@@ -130,12 +132,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 conflictingDefault = conflictingDefaultDiff;
             }
             if (!selectedEditor) {
-                return 2 ;
+                return ResolvedStatus.NONE;
             }
         }
         untypedEditor.options = { override: selectedEditor.editorInfo.id, ...untypedEditor.options };
         if (selectedEditor.editorFactoryObject.createDiffEditorInput === undefined && isResourceDiffEditorInput(untypedEditor)) {
-            return 2 ;
+            return ResolvedStatus.NONE;
         }
         const input = await this.doResolveEditor(untypedEditor, group, selectedEditor);
         if (conflictingDefault && input) {
@@ -148,16 +150,16 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
             return { ...input, group };
         }
-        return 1 ;
+        return ResolvedStatus.ABORT;
     }
     async doResolveSideBySideEditor(editor, preferredGroup) {
         const primaryResolvedEditor = await this.resolveEditor(editor.primary, preferredGroup);
         if (!isEditorInputWithOptionsAndGroup(primaryResolvedEditor)) {
-            return 2 ;
+            return ResolvedStatus.NONE;
         }
         const secondaryResolvedEditor = await this.resolveEditor(editor.secondary, primaryResolvedEditor.group ?? preferredGroup);
         if (!isEditorInputWithOptionsAndGroup(secondaryResolvedEditor)) {
-            return 2 ;
+            return ResolvedStatus.NONE;
         }
         return {
             group: primaryResolvedEditor.group ?? secondaryResolvedEditor.group,
@@ -261,7 +263,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         return editors;
     }
     get _registeredEditors() {
-        return flatten(Array.from(( (this._flattenedEditors.values()))));
+        return Array.from(( (this._flattenedEditors.values()))).flat();
     }
     updateUserAssociations(globPattern, editorID) {
         const newAssociation = { viewType: editorID, filenamePattern: globPattern };
@@ -439,12 +441,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     }
     async doHandleConflictingDefaults(resource, editorName, untypedInput, currentEditor, group) {
         const editors = this.findMatchingEditors(resource);
-        const storedChoices = JSON.parse(this.storageService.get(EditorResolverService_1.conflictingDefaultsStorageID, 0 , '{}'));
+        const storedChoices = JSON.parse(this.storageService.get(EditorResolverService_1.conflictingDefaultsStorageID, StorageScope.PROFILE, '{}'));
         const globForResource = `*${extname(resource)}`;
         const writeCurrentEditorsToStorage = () => {
             storedChoices[globForResource] = [];
             editors.forEach(editor => storedChoices[globForResource].push(editor.editorInfo.id));
-            this.storageService.store(EditorResolverService_1.conflictingDefaultsStorageID, JSON.stringify(storedChoices), 0 , 1 );
+            this.storageService.store(EditorResolverService_1.conflictingDefaultsStorageID, JSON.stringify(storedChoices), StorageScope.PROFILE, StorageTarget.MACHINE);
         };
         if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
             return;
@@ -462,7 +464,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                     }
                     untypedInput.options = picked;
                     const replacementEditor = await this.resolveEditor(untypedInput, group);
-                    if (replacementEditor === 1  || replacementEditor === 2 ) {
+                    if (replacementEditor === ResolvedStatus.ABORT || replacementEditor === ResolvedStatus.NONE) {
                         return;
                     }
                     group.replaceEditors([
@@ -624,7 +626,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 cacheStorage.add(association.filenamePattern);
             }
         }
-        this.storageService.store(EditorResolverService_1.cacheStorageID, JSON.stringify(Array.from(cacheStorage)), 0 , 1 );
+        this.storageService.store(EditorResolverService_1.cacheStorageID, JSON.stringify(Array.from(cacheStorage)), StorageScope.PROFILE, StorageTarget.MACHINE);
     }
     resourceMatchesCache(resource) {
         if (!this.cache) {