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

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

@@ -1,19 +1,16 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
-import { CallHierarchyDirection, CallHierarchyProviderRegistry, CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
+import { CallHierarchyProviderRegistry, CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { CallHierarchyTreePeekWidget } from './callHierarchyPeek.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { registerEditorContribution, EditorContributionInstantiation, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { PeekContext } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
@@ -23,17 +20,17 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 
 var CallHierarchyController_1;
-const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4117, 'Whether a call hierarchy provider is available')))));
-const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localize(4118, 'Whether call hierarchy peek is currently showing')))));
+const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4226, 'Whether a call hierarchy provider is available')))));
+const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localize(4227, 'Whether call hierarchy peek is currently showing')))));
 const _ctxCallHierarchyDirection = ( (new RawContextKey(
     'callHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(4119, 'Whether call hierarchy shows incoming or outgoing calls')) }
+    { type: 'string', description: ( localize(4228, 'Whether call hierarchy shows incoming or outgoing calls')) }
 )));
 function sanitizedDirection(candidate) {
-    return candidate === CallHierarchyDirection.CallsFrom || candidate === CallHierarchyDirection.CallsTo
+    return candidate === "outgoingCalls"  || candidate === "incomingCalls"
         ? candidate
-        : CallHierarchyDirection.CallsTo;
+        : "incomingCalls" ;
 }
 let CallHierarchyController = class CallHierarchyController {
     static { CallHierarchyController_1 = this; }
@@ -75,7 +72,7 @@ let CallHierarchyController = class CallHierarchyController {
         }
         const cts = ( (new CancellationTokenSource()));
         const model = CallHierarchyModel.create(document, position, cts.token);
-        const direction = sanitizedDirection(this._storageService.get(CallHierarchyController_1._StorageDirection, StorageScope.PROFILE, CallHierarchyDirection.CallsTo));
+        const direction = sanitizedDirection(this._storageService.get(CallHierarchyController_1._StorageDirection, 0 , "incomingCalls" ));
         this._showCallHierarchyWidget(position, direction, model, cts);
     }
     async startCallHierarchyFromCallHierarchy() {
@@ -103,7 +100,7 @@ let CallHierarchyController = class CallHierarchyController {
         this._widget.showLoading();
         this._sessionDisposables.add(this._widget.onDidClose(() => {
             this.endCallHierarchy();
-            this._storageService.store(CallHierarchyController_1._StorageDirection, this._widget.direction, StorageScope.PROFILE, StorageTarget.USER);
+            this._storageService.store(CallHierarchyController_1._StorageDirection, this._widget.direction, 0 , 0 );
         }));
         this._sessionDisposables.add({ dispose() { cts.dispose(true); } });
         this._sessionDisposables.add(this._widget);
@@ -116,23 +113,23 @@ let CallHierarchyController = class CallHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(4120, "No results")));
+                this._widget.showMessage(( localize(4229, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4121, "Failed to show call hierarchy")));
+            this._widget.showMessage(( localize(4230, "Failed to show call hierarchy")));
         });
     }
     showOutgoingCalls() {
-        this._widget?.updateDirection(CallHierarchyDirection.CallsFrom);
-        this._ctxDirection.set(CallHierarchyDirection.CallsFrom);
+        this._widget?.updateDirection("outgoingCalls" );
+        this._ctxDirection.set("outgoingCalls" );
     }
     showIncomingCalls() {
-        this._widget?.updateDirection(CallHierarchyDirection.CallsTo);
-        this._ctxDirection.set(CallHierarchyDirection.CallsTo);
+        this._widget?.updateDirection("incomingCalls" );
+        this._ctxDirection.set("incomingCalls" );
     }
     endCallHierarchy() {
         this._sessionDisposables.clear();
@@ -146,12 +143,12 @@ CallHierarchyController = CallHierarchyController_1 = ( (__decorate([
     ( (__param(3, ICodeEditorService))),
     ( (__param(4, IInstantiationService)))
 ], CallHierarchyController)));
-registerEditorContribution(CallHierarchyController.Id, CallHierarchyController, EditorContributionInstantiation.Eager);
+registerEditorContribution(CallHierarchyController.Id, CallHierarchyController, 0 );
 registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showCallHierarchy',
-            title: ( localize2(4122, 'Peek Call Hierarchy')),
+            title: ( localize2(4231, 'Peek Call Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -164,8 +161,8 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
             },
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH
+                weight: 200 ,
+                primary: 1024  + 512  + 38
             },
             precondition: ( (ContextKeyExpr.and(_ctxHasCallHierarchyProvider, PeekContext.notInPeekEditor))),
             f1: true
@@ -179,19 +176,19 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showIncomingCalls',
-            title: ( localize2(4123, 'Show Incoming Calls')),
-            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4124, 'Icon for incoming calls in the call hierarchy view.'))),
+            title: ( localize2(4232, 'Show Incoming Calls')),
+            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4233, 'Icon for incoming calls in the call hierarchy view.'))),
             precondition: ( (ContextKeyExpr.and(
                 _ctxCallHierarchyVisible,
-                 (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom))
+                 (_ctxCallHierarchyDirection.isEqualTo("outgoingCalls" ))
             ))),
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
+                weight: 200 ,
+                primary: 1024  + 512  + 38 ,
             },
             menu: {
                 id: CallHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom))),
+                when: ( (_ctxCallHierarchyDirection.isEqualTo("outgoingCalls" ))),
                 order: 1,
             }
         });
@@ -204,19 +201,19 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showOutgoingCalls',
-            title: ( localize2(4125, 'Show Outgoing Calls')),
-            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4126, 'Icon for outgoing calls in the call hierarchy view.'))),
+            title: ( localize2(4234, 'Show Outgoing Calls')),
+            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4235, 'Icon for outgoing calls in the call hierarchy view.'))),
             precondition: ( (ContextKeyExpr.and(
                 _ctxCallHierarchyVisible,
-                 (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo))
+                 (_ctxCallHierarchyDirection.isEqualTo("incomingCalls" ))
             ))),
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
+                weight: 200 ,
+                primary: 1024  + 512  + 38 ,
             },
             menu: {
                 id: CallHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo))),
+                when: ( (_ctxCallHierarchyDirection.isEqualTo("incomingCalls" ))),
                 order: 1
             }
         });
@@ -229,11 +226,11 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusCallHierarchy',
-            title: ( localize2(4127, 'Refocus Call Hierarchy')),
+            title: ( localize2(4236, 'Refocus Call Hierarchy')),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.Shift + KeyCode.Enter
+                weight: 200 ,
+                primary: 1024  + 3
             }
         });
     }
@@ -245,12 +242,12 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeCallHierarchy',
-            title: ( localize(4128, 'Close')),
+            title: ( localize(4237, 'Close')),
             icon: Codicon.close,
             precondition: _ctxCallHierarchyVisible,
             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/callHierarchy/browser/callHierarchyPeek.js

@@ -2,11 +2,9 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/callHierarchy.css.js';
 import { PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { CallHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { Sorter, AccessibilityProvider, IdentityProvider, VirtualDelegate, CallRenderer, DataSource } from './callHierarchyTree.js';
 import { localize } from 'vscode/vscode/vs/nls';
-import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { SplitView, Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { Dimension, isKeyboardEvent } from 'vscode/vscode/vs/base/browser/dom';
@@ -15,10 +13,9 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { TrackedRangeStickiness, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { TreeMouseEventTarget } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
@@ -26,21 +23,14 @@ import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
-import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
 var CallHierarchyTreePeekWidget_1;
-var State;
-( ((function(State) {
-    State["Loading"] = "loading";
-    State["Message"] = "message";
-    State["Data"] = "data";
-})(State || (State = {}))));
 class LayoutInfo {
     static store(info, storageService) {
-        storageService.store('callHierarchyPeekLayout', JSON.stringify(info), StorageScope.PROFILE, StorageTarget.MACHINE);
+        storageService.store('callHierarchyPeekLayout', JSON.stringify(info), 0 , 1 );
     }
     static retrieve(storageService) {
-        const value = storageService.get('callHierarchyPeekLayout', StorageScope.PROFILE, '{}');
+        const value = storageService.get('callHierarchyPeekLayout', 0 , '{}');
         const defaultInfo = { ratio: 0.7, height: 17 };
         try {
             return { ...defaultInfo, ...JSON.parse(value) };
@@ -124,7 +114,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget 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 CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         this._previewDisposable.clear();
         const options = {
             description: 'call-hierarchy-decoration',
-            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+            stickiness: 1 ,
             className: 'call-decoration',
             overviewRuler: {
                 color: themeColorFromId(peekViewEditorMatchHighlight),
@@ -240,7 +230,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
             },
         };
         let previewUri;
-        if (this._direction === CallHierarchyDirection.CallsFrom) {
+        if (this._direction === "outgoingCalls" ) {
             previewUri = element.parent ? element.parent.item.uri : element.model.root.uri;
         }
         else {
@@ -261,23 +251,23 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
             }
         }
         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 === CallHierarchyDirection.CallsFrom
-            ? ( localize(9545, "Calls from '{0}'", element.model.root.name))
-            : ( localize(9546, "Callers of '{0}'", element.model.root.name));
+        const title = this._direction === "outgoingCalls"
+            ? ( localize(9627, "Calls from '{0}'", element.model.root.name))
+            : ( localize(9628, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
-        this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(9547, "Loading...")));
+        this._parent.dataset['state'] = "loading" ;
+        this.setTitle(( localize(9629, "Loading...")));
         this._show();
     }
     showMessage(message) {
-        this._parent.dataset['state'] = State.Message;
+        this._parent.dataset['state'] = "message" ;
         this.setTitle('');
         this.setMetaTitle('');
         this._message.innerText = message;
@@ -291,12 +281,12 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget 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 === CallHierarchyDirection.CallsFrom
-                ? ( localize(9548, "No calls from '{0}'", model.root.name))
-                : ( localize(9549, "No callers of '{0}'", model.root.name)));
+            this.showMessage(this._direction === "outgoingCalls"
+                ? ( localize(9630, "No calls from '{0}'", model.root.name))
+                : ( localize(9631, "No callers 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]);
             }
@@ -320,7 +310,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget 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/callHierarchy/browser/callHierarchyTree.js

@@ -1,8 +1,8 @@
-import { CallHierarchyModel, CallHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
+import { CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
 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';
@@ -37,7 +37,7 @@ class DataSource {
             );
         }
         const { model, item } = element;
-        if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
+        if (this.getDirection() === "outgoingCalls" ) {
             return (
                  ((await model.resolveOutgoingCalls(item, CancellationToken.None)).map(call => {
                     return (
@@ -106,7 +106,7 @@ class CallRenderer {
     }
     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.className = '';
         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 });
@@ -128,14 +128,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11242, "Call Hierarchy"));
+        return ( localize(11353, "Call Hierarchy"));
     }
     getAriaLabel(element) {
-        if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
-            return ( localize(11243, "calls from {0}", element.item.name));
+        if (this.getDirection() === "outgoingCalls" ) {
+            return ( localize(11354, "calls from {0}", element.item.name));
         }
         else {
-            return ( localize(11244, "callers of {0}", element.item.name));
+            return ( localize(11355, "callers of {0}", element.item.name));
         }
     }
 }

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

@@ -1,8 +1,7 @@
 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 { CustomEditorInputSerializer, ComplexCustomWorkingCopyEditorHandler } from './customEditorInputFactory.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -16,4 +15,4 @@ import './customEditors.js';
 ]);
 ( Registry.as(EditorExtensions.EditorFactory))
     .registerEditorSerializer(CustomEditorInputSerializer.ID, CustomEditorInputSerializer);
-registerWorkbenchContribution2(ComplexCustomWorkingCopyEditorHandler.ID, ComplexCustomWorkingCopyEditorHandler, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(ComplexCustomWorkingCopyEditorHandler.ID, ComplexCustomWorkingCopyEditorHandler, 1 );

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js

@@ -7,7 +7,6 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { ICustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor.service';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { WebviewContentPurpose } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { WebviewEditorInputSerializer, reviveWebviewExtensionDescription, restoreWebviewOptions, restoreWebviewContentOptions } from '../../webviewPanel/browser/webviewEditorInputSerializer.js';
 import { IWebviewWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
@@ -64,7 +63,7 @@ function reviveWebview(webviewService, data) {
         origin: data.origin,
         title: undefined,
         options: {
-            purpose: WebviewContentPurpose.CustomEditor,
+            purpose: "customEditor" ,
             enableFindWidget: data.webviewOptions.enableFindWidget,
             retainContextWhenHidden: data.webviewOptions.retainContextWhenHidden,
         },

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js

@@ -8,7 +8,6 @@ import { extname, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { UndoCommand, RedoCommand } from 'vscode/vscode/vs/editor/browser/editorExtensions';
-import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -59,7 +58,7 @@ let CustomEditorService = class CustomEditorService extends Disposable {
         this._register(this.editorGroupService.registerContextKeyProvider(activeCustomEditorContextKeyProvider));
         this._register(this.editorGroupService.registerContextKeyProvider(customEditorIsEditableContextKeyProvider));
         this._register(fileService.onDidRunOperation(e => {
-            if (e.isOperation(FileOperation.MOVE)) {
+            if (e.isOperation(2 )) {
                 this.handleMovedFileInOpenedFileEditors(e.resource, this.uriIdentityService.asCanonicalUri(e.target.resource));
             }
         }));

package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js

@@ -1,7 +1,6 @@
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { CustomEditorInfo } from './customEditor.js';
 import { customEditorsExtensionPoint } from './extensionPoint.js';
@@ -16,7 +15,7 @@ class ContributedCustomEditors extends Disposable {
         this._onChange = this._register(( (new Emitter())));
         this.onChange = this._onChange.event;
         this._memento = ( (new Memento(ContributedCustomEditors.CUSTOM_EDITORS_STORAGE_ID, storageService)));
-        const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
+        const mementoObject = this._memento.getMemento(0 , 1 );
         for (const info of (mementoObject[ContributedCustomEditors.CUSTOM_EDITORS_ENTRY_ID] || [])) {
             this.add(( (new CustomEditorInfo(info))));
         }
@@ -31,13 +30,13 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( (new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(9533, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(9615, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
                     selector: webviewEditorContribution.selector || [],
                     priority: getPriorityFromContribution(webviewEditorContribution, extension.description),
                 }))));
             }
         }
-        const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
+        const mementoObject = this._memento.getMemento(0 , 1 );
         mementoObject[ContributedCustomEditors.CUSTOM_EDITORS_ENTRY_ID] = Array.from(( (this._editors.values())));
         this._memento.saveMemento();
         this._onChange.fire();

package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js

@@ -5,15 +5,9 @@ import { globMatchesResource, RegisteredEditorPriority, priorityToRank } from 'v
 
 const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( (new RawContextKey('activeCustomEditorId', '', {
     type: 'string',
-    description: ( localize(9532, "The viewType of the currently active custom editor.")),
+    description: ( localize(9614, "The viewType of the currently active custom editor.")),
 })));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( (new RawContextKey('focusedCustomEditorIsEditable', false)));
-var CustomEditorPriority;
-( ((function(CustomEditorPriority) {
-    CustomEditorPriority["default"] = "default";
-    CustomEditorPriority["builtin"] = "builtin";
-    CustomEditorPriority["option"] = "option";
-})(CustomEditorPriority || (CustomEditorPriority = {}))));
 class CustomEditorInfo {
     constructor(descriptor) {
         this.id = descriptor.id;
@@ -57,4 +51,4 @@ function isLowerPriority(otherEditor, editor) {
     return priorityToRank(otherEditor.priority) < priorityToRank(editor.priority);
 }
 
-export { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorInfo, CustomEditorInfoCollection, CustomEditorPriority };
+export { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorInfo, CustomEditorInfoCollection };

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js

@@ -3,7 +3,6 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { CustomEditorPriority } from './customEditor.js';
 import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { languagesExtPoint } from 'vscode/vscode/vs/workbench/services/language/common/languageService';
@@ -15,7 +14,7 @@ const Fields = ( (Object.freeze({
     priority: 'priority',
 })));
 const CustomEditorsContribution = {
-    description: ( localize(11230, 'Contributed custom editors.')),
+    description: ( localize(11341, 'Contributed custom editors.')),
     type: 'array',
     defaultSnippets: [{
             body: [{
@@ -37,20 +36,20 @@ const CustomEditorsContribution = {
             [Fields.viewType]: {
                 type: 'string',
                 markdownDescription: ( localize(
-                    11231,
+                    11342,
                     'Identifier for the custom editor. This must be unique across all custom editors, so we recommend including your extension id as part of `viewType`. The `viewType` is used when registering custom editors with `vscode.registerCustomEditorProvider` and in the `onCustomEditor:${id}` [activation event](https://code.visualstudio.com/api/references/activation-events).'
                 )),
             },
             [Fields.displayName]: {
                 type: 'string',
                 description: ( localize(
-                    11232,
+                    11343,
                     'Human readable name of the custom editor. This is displayed to users when selecting which editor to use.'
                 )),
             },
             [Fields.selector]: {
                 type: 'array',
-                description: ( localize(11233, 'Set of globs that the custom editor is enabled for.')),
+                description: ( localize(11344, 'Set of globs that the custom editor is enabled for.')),
                 items: {
                     type: 'object',
                     defaultSnippets: [{
@@ -61,7 +60,7 @@ const CustomEditorsContribution = {
                     properties: {
                         filenamePattern: {
                             type: 'string',
-                            description: ( localize(11234, 'Glob that the custom editor is enabled for.')),
+                            description: ( localize(11345, 'Glob that the custom editor is enabled for.')),
                         },
                     }
                 }
@@ -69,20 +68,20 @@ const CustomEditorsContribution = {
             [Fields.priority]: {
                 type: 'string',
                 markdownDeprecationMessage: ( localize(
-                    11235,
+                    11346,
                     'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
                 )),
                 enum: [
-                    CustomEditorPriority.default,
-                    CustomEditorPriority.option,
+                    "default" ,
+                    "option" ,
                 ],
                 markdownEnumDescriptions: [
                     ( localize(
-                        11236,
+                        11347,
                         'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
                     )),
                     ( localize(
-                        11237,
+                        11348,
                         'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'
                     )),
                 ],
@@ -118,9 +117,9 @@ class CustomEditorsDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(11238, "View Type")),
-            ( localize(11239, "Priority")),
-            ( localize(11240, "Filename Pattern")),
+            ( localize(11349, "View Type")),
+            ( localize(11350, "Priority")),
+            ( localize(11351, "Filename Pattern")),
         ];
         const rows = ( (customEditors
             .map(customEditor => {
@@ -141,7 +140,7 @@ class CustomEditorsDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'customEditors',
-    label: ( localize(11241, "Custom Editors")),
+    label: ( localize(11352, "Custom Editors")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.js

@@ -1,5 +1,4 @@
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { externalUriOpenersConfigurationNode } from 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
 import 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';