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

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

@@ -1,6 +1,5 @@
 import { localize } from 'vscode/vscode/vs/nls';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -8,7 +7,7 @@ import { SashSettingsController } from './sash.js';
 import { isIOS } from 'vscode/vscode/vs/base/common/platform';
 
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SashSettingsController, LifecyclePhase.Restored);
+    .registerWorkbenchContribution(SashSettingsController, 3 );
 ( (Registry.as(Extensions$1.Configuration)))
     .registerConfiguration({
     ...workbenchConfigurationNodeBase,
@@ -19,7 +18,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                4343,
+                4452,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -29,7 +28,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                4344,
+                4453,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

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

@@ -3,9 +3,8 @@ import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellati
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerEditorContribution, EditorContributionInstantiation, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { PeekContext } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
@@ -14,24 +13,22 @@ import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/commo
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
-import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(4129, 'Whether a type hierarchy provider is available')))));
-const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(4130, 'Whether type hierarchy peek is currently showing')))));
+const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(4238, 'Whether a type hierarchy provider is available')))));
+const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(4239, 'Whether type hierarchy peek is currently showing')))));
 const _ctxTypeHierarchyDirection = ( (new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(4131, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(4240, 'whether type hierarchy shows super types or subtypes')) }
 )));
 function sanitizedDirection(candidate) {
-    return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
+    return candidate === "subtypes"  || candidate === "supertypes"
         ? candidate
-        : TypeHierarchyDirection.Subtypes;
+        : "subtypes" ;
 }
 let TypeHierarchyController = class TypeHierarchyController {
     static { TypeHierarchyController_1 = this; }
@@ -71,7 +68,7 @@ let TypeHierarchyController = class TypeHierarchyController {
         }
         const cts = ( (new CancellationTokenSource()));
         const model = TypeHierarchyModel.create(document, position, cts.token);
-        const direction = sanitizedDirection(this._storageService.get(TypeHierarchyController_1._storageDirectionKey, StorageScope.PROFILE, TypeHierarchyDirection.Subtypes));
+        const direction = sanitizedDirection(this._storageService.get(TypeHierarchyController_1._storageDirectionKey, 0 , "subtypes" ));
         this._showTypeHierarchyWidget(position, direction, model, cts);
     }
     _showTypeHierarchyWidget(position, direction, model, cts) {
@@ -82,7 +79,7 @@ let TypeHierarchyController = class TypeHierarchyController {
         this._widget.showLoading();
         this._sessionDisposables.add(this._widget.onDidClose(() => {
             this.endTypeHierarchy();
-            this._storageService.store(TypeHierarchyController_1._storageDirectionKey, this._widget.direction, StorageScope.PROFILE, StorageTarget.USER);
+            this._storageService.store(TypeHierarchyController_1._storageDirectionKey, this._widget.direction, 0 , 0 );
         }));
         this._sessionDisposables.add({ dispose() { cts.dispose(true); } });
         this._sessionDisposables.add(this._widget);
@@ -95,14 +92,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(4132, "No results")));
+                this._widget.showMessage(( localize(4241, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4133, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(4242, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -123,12 +120,12 @@ let TypeHierarchyController = class TypeHierarchyController {
         TypeHierarchyController_1.get(newEditor)?._showTypeHierarchyWidget(Range.lift(newModel.root.selectionRange).getStartPosition(), this._widget.direction, Promise.resolve(newModel), ( (new CancellationTokenSource())));
     }
     showSupertypes() {
-        this._widget?.updateDirection(TypeHierarchyDirection.Supertypes);
-        this._ctxDirection.set(TypeHierarchyDirection.Supertypes);
+        this._widget?.updateDirection("supertypes" );
+        this._ctxDirection.set("supertypes" );
     }
     showSubtypes() {
-        this._widget?.updateDirection(TypeHierarchyDirection.Subtypes);
-        this._ctxDirection.set(TypeHierarchyDirection.Subtypes);
+        this._widget?.updateDirection("subtypes" );
+        this._ctxDirection.set("subtypes" );
     }
     endTypeHierarchy() {
         this._sessionDisposables.clear();
@@ -142,12 +139,12 @@ TypeHierarchyController = TypeHierarchyController_1 = ( (__decorate([
     ( (__param(3, ICodeEditorService))),
     ( (__param(4, IInstantiationService)))
 ], TypeHierarchyController)));
-registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, EditorContributionInstantiation.Eager);
+registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, 0 );
 registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(4134, 'Peek Type Hierarchy')),
+            title: ( localize2(4243, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -166,19 +163,19 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(4135, 'Show Supertypes')),
+            title: ( localize2(4244, 'Show Supertypes')),
             icon: Codicon.typeHierarchySuper,
             precondition: ( (ContextKeyExpr.and(
                 _ctxTypeHierarchyVisible,
-                 (_ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes))
+                 (_ctxTypeHierarchyDirection.isEqualTo("subtypes" ))
             ))),
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
+                weight: 200 ,
+                primary: 1024  + 512  + 38 ,
             },
             menu: {
                 id: TypeHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes))),
+                when: ( (_ctxTypeHierarchyDirection.isEqualTo("subtypes" ))),
                 order: 1,
             }
         });
@@ -191,19 +188,19 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: ( localize2(4136, 'Show Subtypes')),
+            title: ( localize2(4245, 'Show Subtypes')),
             icon: Codicon.typeHierarchySub,
             precondition: ( (ContextKeyExpr.and(
                 _ctxTypeHierarchyVisible,
-                 (_ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes))
+                 (_ctxTypeHierarchyDirection.isEqualTo("supertypes" ))
             ))),
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
+                weight: 200 ,
+                primary: 1024  + 512  + 38 ,
             },
             menu: {
                 id: TypeHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes))),
+                when: ( (_ctxTypeHierarchyDirection.isEqualTo("supertypes" ))),
                 order: 1,
             }
         });
@@ -216,11 +213,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: ( localize2(4137, 'Refocus Type Hierarchy')),
+            title: ( localize2(4246, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.Shift + KeyCode.Enter
+                weight: 200 ,
+                primary: 1024  + 3
             }
         });
     }
@@ -232,12 +229,12 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(4138, 'Close')),
+            title: ( localize(4247, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib + 10,
-                primary: KeyCode.Escape,
+                weight: 200  + 10,
+                primary: 9 ,
                 when: ContextKeyExpr.not('config.editor.stablePeek')
             },
             menu: {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -8,8 +8,7 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
-import { TrackedRangeStickiness, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
 import { localize } from 'vscode/vscode/vs/nls';
@@ -19,28 +18,19 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { Sorter, AccessibilityProvider, IdentityProvider, VirtualDelegate, TypeRenderer, DataSource } from './typeHierarchyTree.js';
-import { TypeHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
 var TypeHierarchyTreePeekWidget_1;
-var State;
-( ((function(State) {
-    State["Loading"] = "loading";
-    State["Message"] = "message";
-    State["Data"] = "data";
-})(State || (State = {}))));
 class LayoutInfo {
     static store(info, storageService) {
-        storageService.store('typeHierarchyPeekLayout', JSON.stringify(info), StorageScope.PROFILE, StorageTarget.MACHINE);
+        storageService.store('typeHierarchyPeekLayout', JSON.stringify(info), 0 , 1 );
     }
     static retrieve(storageService) {
-        const value = storageService.get('typeHierarchyPeekLayout', StorageScope.PROFILE, '{}');
+        const value = storageService.get('typeHierarchyPeekLayout', 0 , '{}');
         const defaultInfo = { ratio: 0.7, height: 17 };
         try {
             return { ...defaultInfo, ...JSON.parse(value) };
@@ -124,7 +114,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const container = document.createElement('div');
         container.classList.add('results');
         parent.appendChild(container);
-        this._splitView = ( (new SplitView(container, { orientation: Orientation.HORIZONTAL })));
+        this._splitView = ( (new SplitView(container, { orientation: 1  })));
         const editorContainer = document.createElement('div');
         editorContainer.classList.add('editor');
         container.appendChild(editorContainer);
@@ -232,7 +222,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         this._previewDisposable.clear();
         const options = {
             description: 'type-hierarchy-decoration',
-            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+            stickiness: 1 ,
             className: 'type-decoration',
             overviewRuler: {
                 color: themeColorFromId(peekViewEditorMatchHighlight),
@@ -240,7 +230,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             },
         };
         let previewUri;
-        if (this._direction === TypeHierarchyDirection.Supertypes) {
+        if (this._direction === "supertypes" ) {
             previewUri = element.parent ? element.parent.item.uri : element.model.root.uri;
         }
         else {
@@ -256,23 +246,23 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             fullRange = !fullRange ? loc.range : Range.plusRange(loc.range, fullRange);
         }
         if (fullRange) {
-            this._editor.revealRangeInCenter(fullRange, ScrollType.Immediate);
+            this._editor.revealRangeInCenter(fullRange, 1 );
             const decorationsCollection = this._editor.createDecorationsCollection(decorations);
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === TypeHierarchyDirection.Supertypes
-            ? ( localize(9550, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(9551, "Subtypes of '{0}'", element.model.root.name));
+        const title = this._direction === "supertypes"
+            ? ( localize(9632, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(9633, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
-        this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(9552, "Loading...")));
+        this._parent.dataset['state'] = "loading" ;
+        this.setTitle(( localize(9634, "Loading...")));
         this._show();
     }
     showMessage(message) {
-        this._parent.dataset['state'] = State.Message;
+        this._parent.dataset['state'] = "message" ;
         this.setTitle('');
         this.setMetaTitle('');
         this._message.innerText = message;
@@ -286,12 +276,12 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
-                ? ( localize(9553, "No supertypes of '{0}'", model.root.name))
-                : ( localize(9554, "No subtypes of '{0}'", model.root.name)));
+            this.showMessage(this._direction === "supertypes"
+                ? ( localize(9635, "No supertypes of '{0}'", model.root.name))
+                : ( localize(9636, "No subtypes of '{0}'", model.root.name)));
         }
         else {
-            this._parent.dataset['state'] = State.Data;
+            this._parent.dataset['state'] = "data" ;
             if (!viewState || this._tree.getFocus().length === 0) {
                 this._tree.setFocus([root.children[0].element]);
             }
@@ -315,7 +305,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
     }
     _show() {
         if (!this._isShowing) {
-            this.editor.revealLineInCenterIfOutsideViewport(this._where.lineNumber, ScrollType.Smooth);
+            this.editor.revealLineInCenterIfOutsideViewport(this._where.lineNumber, 0 );
             super.show(Range.fromPositions(this._where), this._layoutInfo.height);
         }
     }

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js

@@ -1,8 +1,8 @@
-import { TypeHierarchyModel, TypeHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
-import { SymbolTag, SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
+import { SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { localize } from 'vscode/vscode/vs/nls';
@@ -36,7 +36,7 @@ class DataSource {
             );
         }
         const { model, item } = element;
-        if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
+        if (this.getDirection() === "supertypes" ) {
             return (
                  ((await model.provideSupertypes(item, CancellationToken.None)).map(item => {
                     return (
@@ -95,7 +95,7 @@ class TypeRenderer {
     }
     renderElement(node, _index, template) {
         const { element, filterData } = node;
-        const deprecated = element.item.tags?.includes(SymbolTag.Deprecated);
+        const deprecated = element.item.tags?.includes(1 );
         template.icon.classList.add('inline', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.item.kind)));
         template.label.setLabel(element.item.name, element.item.detail, { labelEscapeNewLines: true, matches: createMatches(filterData), strikethrough: deprecated });
     }
@@ -116,14 +116,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11245, "Type Hierarchy"));
+        return ( localize(11356, "Type Hierarchy"));
     }
     getAriaLabel(element) {
-        if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return ( localize(11246, "supertypes of {0}", element.item.name));
+        if (this.getDirection() === "supertypes" ) {
+            return ( localize(11357, "supertypes of {0}", element.item.name));
         }
         else {
-            return ( localize(11247, "subtypes of {0}", element.item.name));
+            return ( localize(11358, "subtypes of {0}", element.item.name));
         }
     }
 }

package/vscode/src/vs/workbench/contrib/webview/browser/resourceLoading.js

@@ -2,7 +2,7 @@ import { isUNC } from 'vscode/vscode/vs/base/common/extpath';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { normalize, sep } from 'vscode/vscode/vs/base/common/path';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { FileOperationError, FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileOperationError } from 'vscode/vscode/vs/platform/files/common/files';
 import { getWebviewContentMimeType } from '../../../../platform/webview/common/mimeTypes.js';
 
 var WebviewResourceResponse;
@@ -50,7 +50,7 @@ async function loadLocalResource(requestUri, options, fileService, logService, t
     catch (err) {
         if (err instanceof FileOperationError) {
             const result = err.fileOperationResult;
-            if (result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
+            if (result === 2 ) {
                 return new WebviewResourceResponse.NotModified(mime, err.options?.mtime);
             }
         }

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -31,19 +31,18 @@ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/service
 
 var WebviewState;
 ( ((function(WebviewState) {
-    let Type;
     ( ((function(Type) {
         Type[Type["Initializing"] = 0] = "Initializing";
         Type[Type["Ready"] = 1] = "Ready";
-    })(Type = WebviewState.Type || (WebviewState.Type = {}))));
+    })(WebviewState.Type || (WebviewState.Type = {}))));
     class Initializing {
         constructor(pendingMessages) {
             this.pendingMessages = pendingMessages;
-            this.type = Type.Initializing;
+            this.type = 0 ;
         }
     }
     WebviewState.Initializing = Initializing;
-    WebviewState.Ready = { type: Type.Ready };
+    WebviewState.Ready = { type: 1  };
 })(WebviewState || (WebviewState = {}))));
 const webviewIdContext = 'webviewId';
 let WebviewElement = class WebviewElement extends Disposable {
@@ -158,7 +157,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(9537, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(9619, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {
@@ -239,7 +238,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         this.element?.remove();
         this._element = undefined;
         this._messagePort = undefined;
-        if (this._state.type === WebviewState.Type.Initializing) {
+        if (this._state.type === 0 ) {
             for (const message of this._state.pendingMessages) {
                 message.resolve(false);
             }
@@ -256,7 +255,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         return this._send('message', { message, transfer });
     }
     async _send(channel, data, _createElement = []) {
-        if (this._state.type === WebviewState.Type.Initializing) {
+        if (this._state.type === 0 ) {
             const { promise, resolve } = promiseWithResolvers();
             this._state.pendingMessages.push({ channel, data, transferable: _createElement, resolve });
             return promise;
@@ -358,7 +357,7 @@ let WebviewElement = class WebviewElement extends Disposable {
                     handlers?.forEach(handler => handler(e.data.data, e));
                 };
                 this.element?.classList.add('ready');
-                if (this._state.type === WebviewState.Type.Initializing) {
+                if (this._state.type === 0 ) {
                     this._state.pendingMessages.forEach(({ channel, data, resolve }) => resolve(this.doPostMessage(channel, data)));
                 }
                 this._state = WebviewState.Ready;

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

@@ -1,9 +1,7 @@
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { localize, localize2 } 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';
@@ -17,7 +15,7 @@ const webviewActiveContextKeyExpr = ( (ContextKeyExpr.and(
 )));
 class ShowWebViewEditorFindWidgetAction extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.showFind'; }
-    static { this.LABEL = ( localize(9763, "Show find")); }
+    static { this.LABEL = ( localize(9845, "Show find")); }
     constructor() {
         super({
             id: ShowWebViewEditorFindWidgetAction.ID,
@@ -27,8 +25,8 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED
                 ))),
-                primary: KeyMod.CtrlCmd | KeyCode.KeyF,
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 36 ,
+                weight: 100
             }
         });
     }
@@ -38,7 +36,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
 }
 class HideWebViewEditorFindCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.hideFind'; }
-    static { this.LABEL = ( localize(9764, "Stop find")); }
+    static { this.LABEL = ( localize(9846, "Stop find")); }
     constructor() {
         super({
             id: HideWebViewEditorFindCommand.ID,
@@ -48,8 +46,8 @@ class HideWebViewEditorFindCommand extends Action2 {
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE
                 ))),
-                primary: KeyCode.Escape,
-                weight: KeybindingWeight.EditorContrib
+                primary: 9 ,
+                weight: 100
             }
         });
     }
@@ -59,7 +57,7 @@ class HideWebViewEditorFindCommand extends Action2 {
 }
 class WebViewEditorFindNextCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findNext'; }
-    static { this.LABEL = ( localize(9765, 'Find next')); }
+    static { this.LABEL = ( localize(9847, 'Find next')); }
     constructor() {
         super({
             id: WebViewEditorFindNextCommand.ID,
@@ -69,8 +67,8 @@ class WebViewEditorFindNextCommand extends Action2 {
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
                 ))),
-                primary: KeyCode.Enter,
-                weight: KeybindingWeight.EditorContrib
+                primary: 3 ,
+                weight: 100
             }
         });
     }
@@ -80,7 +78,7 @@ class WebViewEditorFindNextCommand extends Action2 {
 }
 class WebViewEditorFindPreviousCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
-    static { this.LABEL = ( localize(9766, 'Find previous')); }
+    static { this.LABEL = ( localize(9848, 'Find previous')); }
     constructor() {
         super({
             id: WebViewEditorFindPreviousCommand.ID,
@@ -90,8 +88,8 @@ class WebViewEditorFindPreviousCommand extends Action2 {
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
                 ))),
-                primary: KeyMod.Shift | KeyCode.Enter,
-                weight: KeybindingWeight.EditorContrib
+                primary: 1024  | 3 ,
+                weight: 100
             }
         });
     }
@@ -101,7 +99,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
 }
 class ReloadWebviewAction extends Action2 {
     static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
-    static { this.LABEL = ( localize2(9767, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(9849, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

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

@@ -3,10 +3,9 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } 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, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } 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';
@@ -17,7 +16,7 @@ import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbench
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(4320, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
+(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(4429, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
     static { this.ID = 'workbench.contrib.webviewPanel'; }
     constructor(editorService, editorGroupService) {
@@ -55,7 +54,7 @@ WebviewPanelContribution = ( (__decorate([
     ( (__param(0, IEditorService))),
     ( (__param(1, IEditorGroupsService)))
 ], WebviewPanelContribution)));
-registerWorkbenchContribution2(WebviewPanelContribution.ID, WebviewPanelContribution, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(WebviewPanelContribution.ID, WebviewPanelContribution, 1 );
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(WebviewEditorInputSerializer.ID, WebviewEditorInputSerializer);
 registerAction2(ShowWebViewEditorFindWidgetAction);
 registerAction2(HideWebViewEditorFindCommand);

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

@@ -11,7 +11,6 @@ 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';
@@ -19,7 +18,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, WebviewContentPurpose } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
+import { ExtensionKeyedWebviewOriginStore } 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';
@@ -58,7 +57,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(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.viewState = this.memento.getMemento(1 , 1 );
         this._register(this.onDidChangeBodyVisibility(() => this.updateTreeVisibility()));
         this._register(this.webviewViewService.onNewResolverRegistered(e => {
             if (e.viewType === this.id) {
@@ -122,7 +121,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
             origin,
             providedViewType: this.id,
             title: this.title,
-            options: { purpose: WebviewContentPurpose.WebviewView },
+            options: { purpose: "webviewView"  },
             contentOptions: {},
             extension: this.extensionId ? { id: this.extensionId } : undefined
         });