@codingame/monaco-vscode-view-common-service-override 11.1.2 → 12.0.0

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

@@ -1,10 +1,13 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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 '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/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';
@@ -13,24 +16,32 @@ 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 { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { TrackedRangeStickiness, 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';
 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 { getFlatActionBarActions } 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), 0 , 1 );
+        storageService.store('callHierarchyPeekLayout', JSON.stringify(info), StorageScope.PROFILE, StorageTarget.MACHINE);
     }
     static retrieve(storageService) {
-        const value = storageService.get('callHierarchyPeekLayout', 0 , '{}');
+        const value = storageService.get('callHierarchyPeekLayout', StorageScope.PROFILE, '{}');
         const defaultInfo = { ratio: 0.7, height: 17 };
         try {
             return { ...defaultInfo, ...JSON.parse(value) };
@@ -48,7 +59,7 @@ class CallHierarchyTree extends WorkbenchAsyncDataTree {
 }
 let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends PeekViewWidget {
     static { CallHierarchyTreePeekWidget_1 = this; }
-    static { this.TitleMenu = ( (new MenuId('callhierarchy/title'))); }
+    static { this.TitleMenu = ( new MenuId('callhierarchy/title')); }
     constructor(editor, _where, _direction, themeService, _peekViewService, _editorService, _textModelService, _storageService, _menuService, _contextKeyService, _instantiationService) {
         super(editor, { showFrame: true, showArrow: true, isResizeable: true, isAccessible: true }, _instantiationService);
         this._where = _where;
@@ -60,8 +71,8 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         this._menuService = _menuService;
         this._contextKeyService = _contextKeyService;
         this._instantiationService = _instantiationService;
-        this._treeViewStates = ( (new Map()));
-        this._previewDisposable = ( (new DisposableStore()));
+        this._treeViewStates = ( new Map());
+        this._previewDisposable = ( new DisposableStore());
         this.create();
         this._peekViewService.addExclusiveWidget(editor, this);
         this._applyTheme(themeService.getColorTheme());
@@ -92,8 +103,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         super._fillHead(container, true);
         const menu = this._menuService.createMenu(CallHierarchyTreePeekWidget_1.TitleMenu, this._contextKeyService);
         const updateToolbar = () => {
-            const actions = [];
-            createAndFillInActionBarActions(menu, undefined, actions);
+            const actions = getFlatActionBarActions(menu.getActions());
             this._actionbarWidget.clear();
             this._actionbarWidget.push(actions, { label: false, icon: true });
         };
@@ -103,7 +113,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
     }
     _fillBody(parent) {
         this._layoutInfo = LayoutInfo.retrieve(this._storageService);
-        this._dim = ( (new Dimension(0, 0)));
+        this._dim = ( new Dimension(0, 0));
         this._parent = parent;
         parent.classList.add('call-hierarchy');
         const message = document.createElement('div');
@@ -114,7 +124,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: 1  })));
+        this._splitView = ( new SplitView(container, { orientation: Orientation.HORIZONTAL }));
         const editorContainer = document.createElement('div');
         editorContainer.classList.add('editor');
         container.appendChild(editorContainer);
@@ -222,7 +232,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         this._previewDisposable.clear();
         const options = {
             description: 'call-hierarchy-decoration',
-            stickiness: 1 ,
+            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
             className: 'call-decoration',
             overviewRuler: {
                 color: themeColorFromId(peekViewEditorMatchHighlight),
@@ -230,7 +240,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
             },
         };
         let previewUri;
-        if (this._direction === "outgoingCalls" ) {
+        if (this._direction === CallHierarchyDirection.CallsFrom) {
             previewUri = element.parent ? element.parent.item.uri : element.model.root.uri;
         }
         else {
@@ -245,29 +255,29 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
             locations = [{ uri: element.item.uri, range: element.item.selectionRange }];
         }
         for (const loc of locations) {
-            if (( (loc.uri.toString())) === ( (previewUri.toString()))) {
+            if (( loc.uri.toString()) === ( previewUri.toString())) {
                 decorations.push({ range: loc.range, options });
                 fullRange = !fullRange ? loc.range : Range.plusRange(loc.range, fullRange);
             }
         }
         if (fullRange) {
-            this._editor.revealRangeInCenter(fullRange, 1 );
+            this._editor.revealRangeInCenter(fullRange, ScrollType.Immediate);
             const decorationsCollection = this._editor.createDecorationsCollection(decorations);
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === "outgoingCalls"
-            ? ( localize(9708, "Calls from '{0}'", element.model.root.name))
-            : ( localize(9709, "Callers of '{0}'", element.model.root.name));
+        const title = this._direction === CallHierarchyDirection.CallsFrom
+            ? ( localize(4123, "Calls from '{0}'", element.model.root.name))
+            : ( localize(4124, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
-        this._parent.dataset['state'] = "loading" ;
-        this.setTitle(( localize(9710, "Loading...")));
+        this._parent.dataset['state'] = State.Loading;
+        this.setTitle(( localize(4125, "Loading...")));
         this._show();
     }
     showMessage(message) {
-        this._parent.dataset['state'] = "message" ;
+        this._parent.dataset['state'] = State.Message;
         this.setTitle('');
         this.setMetaTitle('');
         this._message.innerText = message;
@@ -281,12 +291,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 === "outgoingCalls"
-                ? ( localize(9711, "No calls from '{0}'", model.root.name))
-                : ( localize(9712, "No callers of '{0}'", model.root.name)));
+            this.showMessage(this._direction === CallHierarchyDirection.CallsFrom
+                ? ( localize(4126, "No calls from '{0}'", model.root.name))
+                : ( localize(4127, "No callers of '{0}'", model.root.name)));
         }
         else {
-            this._parent.dataset['state'] = "data" ;
+            this._parent.dataset['state'] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {
                 this._tree.setFocus([root.children[0].element]);
             }
@@ -310,7 +320,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
     }
     _show() {
         if (!this._isShowing) {
-            this.editor.revealLineInCenterIfOutsideViewport(this._where.lineNumber, 0 );
+            this.editor.revealLineInCenterIfOutsideViewport(this._where.lineNumber, ScrollType.Smooth);
             super.show(Range.fromPositions(this._where), this._layoutInfo.height);
         }
     }
@@ -322,22 +332,22 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
     _doLayoutBody(height, width) {
         if (this._dim.height !== height || this._dim.width !== width) {
             super._doLayoutBody(height, width);
-            this._dim = ( (new Dimension(width, height)));
+            this._dim = ( new Dimension(width, height));
             this._layoutInfo.height = this._viewZone ? this._viewZone.heightInLines : this._layoutInfo.height;
             this._splitView.layout(width);
             this._splitView.resizeView(0, width * this._layoutInfo.ratio);
         }
     }
 };
-CallHierarchyTreePeekWidget = CallHierarchyTreePeekWidget_1 = ( (__decorate([
-    ( (__param(3, IThemeService))),
-    ( (__param(4, IPeekViewService))),
-    ( (__param(5, IEditorService))),
-    ( (__param(6, ITextModelService))),
-    ( (__param(7, IStorageService))),
-    ( (__param(8, IMenuService))),
-    ( (__param(9, IContextKeyService))),
-    ( (__param(10, IInstantiationService)))
-], CallHierarchyTreePeekWidget)));
+CallHierarchyTreePeekWidget = CallHierarchyTreePeekWidget_1 = ( __decorate([
+    ( __param(3, IThemeService)),
+    ( __param(4, IPeekViewService)),
+    ( __param(5, IEditorService)),
+    ( __param(6, ITextModelService)),
+    ( __param(7, IStorageService)),
+    ( __param(8, IMenuService)),
+    ( __param(9, IContextKeyService)),
+    ( __param(10, IInstantiationService))
+], CallHierarchyTreePeekWidget));
 
 export { CallHierarchyTreePeekWidget };

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.d.ts

@@ -0,0 +1,54 @@
+import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from "vscode/vscode/vs/base/browser/ui/tree/tree";
+import { CallHierarchyItem, CallHierarchyDirection, CallHierarchyModel } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy";
+import { IIdentityProvider, IListVirtualDelegate } from "vscode/vscode/vs/base/browser/ui/list/list";
+import { FuzzyScore } from "vscode/vscode/vs/base/common/filters";
+import { IconLabel } from "vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel";
+import { Location } from "vscode/vscode/vs/editor/common/languages";
+import { IListAccessibilityProvider } from "vscode/vscode/vs/base/browser/ui/list/listWidget";
+export declare class Call {
+    readonly item: CallHierarchyItem;
+    readonly locations: Location[] | undefined;
+    readonly model: CallHierarchyModel;
+    readonly parent: Call | undefined;
+    constructor(item: CallHierarchyItem, locations: Location[] | undefined, model: CallHierarchyModel, parent: Call | undefined);
+    static compare(a: Call, b: Call): number;
+}
+export declare class DataSource implements IAsyncDataSource<CallHierarchyModel, Call> {
+    getDirection: () => CallHierarchyDirection;
+    constructor(getDirection: () => CallHierarchyDirection);
+    hasChildren(): boolean;
+    getChildren(element: CallHierarchyModel | Call): Promise<Call[]>;
+}
+export declare class Sorter implements ITreeSorter<Call> {
+    compare(element: Call, otherElement: Call): number;
+}
+export declare class IdentityProvider implements IIdentityProvider<Call> {
+    getDirection: () => CallHierarchyDirection;
+    constructor(getDirection: () => CallHierarchyDirection);
+    getId(element: Call): {
+        toString(): string;
+    };
+}
+declare class CallRenderingTemplate {
+    readonly icon: HTMLDivElement;
+    readonly label: IconLabel;
+    constructor(icon: HTMLDivElement, label: IconLabel);
+}
+export declare class CallRenderer implements ITreeRenderer<Call, FuzzyScore, CallRenderingTemplate> {
+    static readonly id = "CallRenderer";
+    templateId: string;
+    renderTemplate(container: HTMLElement): CallRenderingTemplate;
+    renderElement(node: ITreeNode<Call, FuzzyScore>, _index: number, template: CallRenderingTemplate): void;
+    disposeTemplate(template: CallRenderingTemplate): void;
+}
+export declare class VirtualDelegate implements IListVirtualDelegate<Call> {
+    getHeight(_element: Call): number;
+    getTemplateId(_element: Call): string;
+}
+export declare class AccessibilityProvider implements IListAccessibilityProvider<Call> {
+    getDirection: () => CallHierarchyDirection;
+    constructor(getDirection: () => CallHierarchyDirection);
+    getWidgetAriaLabel(): string;
+    getAriaLabel(element: Call): string | null;
+}
+export {};

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

@@ -1,8 +1,9 @@
-import { CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
+
+import { CallHierarchyModel, CallHierarchyDirection } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/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 { SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
+import { SymbolTag, 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';
@@ -16,7 +17,7 @@ class Call {
         this.parent = parent;
     }
     static compare(a, b) {
-        let res = compare(( (a.item.uri.toString())), ( (b.item.uri.toString())));
+        let res = compare(( a.item.uri.toString()), ( b.item.uri.toString()));
         if (res === 0) {
             res = Range.compareRangesUsingStarts(a.item.range, b.item.range);
         }
@@ -32,38 +33,18 @@ class DataSource {
     }
     async getChildren(element) {
         if (element instanceof CallHierarchyModel) {
-            return (
-                 (element.roots.map(root => ( (new Call(root, undefined, element, undefined)))))
-            );
+            return ( element.roots.map(root => ( new Call(root, undefined, element, undefined))));
         }
         const { model, item } = element;
-        if (this.getDirection() === "outgoingCalls" ) {
-            return (
-                 ((await model.resolveOutgoingCalls(item, CancellationToken.None)).map(call => {
-                    return (
-                         (new Call(
-                            call.to,
-                             (call.fromRanges.map(range => ({ range, uri: item.uri }))),
-                            model,
-                            element
-                        ))
-                    );
-                }))
-            );
+        if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
+            return ( (await model.resolveOutgoingCalls(item, CancellationToken.None)).map(call => {
+                return ( new Call(call.to, ( call.fromRanges.map(range => ({ range, uri: item.uri }))), model, element));
+            }));
         }
         else {
-            return (
-                 ((await model.resolveIncomingCalls(item, CancellationToken.None)).map(call => {
-                    return (
-                         (new Call(
-                            call.from,
-                             (call.fromRanges.map(range => ({ range, uri: call.from.uri }))),
-                            model,
-                            element
-                        ))
-                    );
-                }))
-            );
+            return ( (await model.resolveIncomingCalls(item, CancellationToken.None)).map(call => {
+                return ( new Call(call.from, ( call.fromRanges.map(range => ({ range, uri: call.from.uri }))), model, element));
+            }));
         }
     }
 }
@@ -99,14 +80,12 @@ class CallRenderer {
         container.classList.add('callhierarchy-element');
         const icon = document.createElement('div');
         container.appendChild(icon);
-        const label = ( (new IconLabel(container, { supportHighlights: true })));
-        return (
-             (new CallRenderingTemplate(icon, label))
-        );
+        const label = ( new IconLabel(container, { supportHighlights: true }));
+        return ( new CallRenderingTemplate(icon, label));
     }
     renderElement(node, _index, template) {
         const { element, filterData } = node;
-        const deprecated = element.item.tags?.includes(1 );
+        const deprecated = element.item.tags?.includes(SymbolTag.Deprecated);
         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 +107,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11471, "Call Hierarchy"));
+        return localize(4128, "Call Hierarchy");
     }
     getAriaLabel(element) {
-        if (this.getDirection() === "outgoingCalls" ) {
-            return ( localize(11472, "calls from {0}", element.item.name));
+        if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
+            return localize(4129, "calls from {0}", element.item.name);
         }
         else {
-            return ( localize(11473, "callers of {0}", element.item.name));
+            return localize(4130, "callers of {0}", element.item.name);
         }
     }
 }

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/media/callHierarchy.css.js

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".monaco-workbench .call-hierarchy .message,.monaco-workbench .call-hierarchy .results{display:none}.monaco-workbench .call-hierarchy[data-state=data] .results{display:inherit;height:100%}.monaco-workbench .call-hierarchy[data-state=message] .message{align-items:center;display:flex;height:100%;justify-content:center}.monaco-workbench .call-hierarchy .editor,.monaco-workbench .call-hierarchy .tree{height:100%}.monaco-editor .call-hierarchy .tree{background-color:var(--vscode-peekViewResult-background);color:var(--vscode-peekViewResult-fileForeground)}.monaco-workbench .call-hierarchy .tree .callhierarchy-element{align-items:center;display:flex;flex:1;flex-flow:row nowrap}.monaco-workbench .call-hierarchy .tree .callhierarchy-element .monaco-icon-label{padding-left:4px}.monaco-editor .call-hierarchy .tree .monaco-list:focus .monaco-list-rows>.monaco-list-row.selected:not(.highlighted){background-color:var(--vscode-peekViewResult-selectionBackground);color:var(--vscode-peekViewResult-selectionForeground)!important}.monaco-editor .call-hierarchy .call-decoration{background-color:var(--vscode-peekViewEditor-matchHighlightBackground);border:2px solid var(--vscode-peekViewEditor-matchHighlightBorder);box-sizing:border-box}.monaco-editor .call-hierarchy .editor .monaco-editor .inputarea.ime-input,.monaco-editor .call-hierarchy .editor .monaco-editor .monaco-editor-background{background-color:var(--vscode-peekViewEditor-background)}.monaco-editor .call-hierarchy .editor .monaco-editor .margin{background-color:var(--vscode-peekViewEditorGutter-background)}";
 n(css,{});

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,12 +1,14 @@
+
 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 { EditorPaneDescriptor } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
+import { registerWorkbenchContribution2, WorkbenchPhase } 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';
-import { WebviewEditor } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
+import { WebviewEditor } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
+import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import './customEditors.js';
 
 ( Registry.as(EditorExtensions.EditorPane))
@@ -15,4 +17,4 @@ import './customEditors.js';
 ]);
 ( Registry.as(EditorExtensions.EditorFactory))
     .registerEditorSerializer(CustomEditorInputSerializer.ID, CustomEditorInputSerializer);
-registerWorkbenchContribution2(ComplexCustomWorkingCopyEditorHandler.ID, ComplexCustomWorkingCopyEditorHandler, 1 );
+registerWorkbenchContribution2(ComplexCustomWorkingCopyEditorHandler.ID, ComplexCustomWorkingCopyEditorHandler, WorkbenchPhase.BlockStartup);

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.d.ts

@@ -0,0 +1,58 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI, UriComponents } from "vscode/vscode/vs/base/common/uri";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { EditorInput } from "vscode/vscode/vs/workbench/common/editor/editorInput";
+import { CustomEditorInput } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput";
+import { ICustomEditorService } from "vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor.service";
+import { IWebviewService } from "vscode/vscode/vs/workbench/contrib/webview/browser/webview.service";
+import { DeserializedWebview, SerializedWebview, SerializedWebviewOptions, WebviewEditorInputSerializer } from "../../webviewPanel/browser/webviewEditorInputSerializer.js";
+import { IWebviewWorkbenchService } from "vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
+import { IWorkingCopyBackupMeta, IWorkingCopyIdentifier } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopyBackupService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service";
+import { IWorkingCopyEditorHandler } from "@codingame/monaco-vscode-working-copy-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService";
+import { IWorkingCopyEditorService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service";
+export interface CustomDocumentBackupData extends IWorkingCopyBackupMeta {
+    readonly viewType: string;
+    readonly editorResource: UriComponents;
+    backupId: string;
+    readonly extension: undefined | {
+        readonly location: UriComponents;
+        readonly id: string;
+    };
+    readonly webview: {
+        readonly origin: string | undefined;
+        readonly options: SerializedWebviewOptions;
+        readonly state: any;
+    };
+}
+interface SerializedCustomEditor extends SerializedWebview {
+    readonly editorResource: UriComponents;
+    readonly dirty: boolean;
+    readonly backupId?: string;
+}
+interface DeserializedCustomEditor extends DeserializedWebview {
+    readonly editorResource: URI;
+    readonly dirty: boolean;
+    readonly backupId?: string;
+}
+export declare class CustomEditorInputSerializer extends WebviewEditorInputSerializer {
+    private readonly _instantiationService;
+    private readonly _webviewService;
+    static readonly ID = "workbench.editors.webviewEditor";
+    constructor(webviewWorkbenchService: IWebviewWorkbenchService, _instantiationService: IInstantiationService, _webviewService: IWebviewService);
+    serialize(input: CustomEditorInput): string | undefined;
+    protected fromJson(data: SerializedCustomEditor): DeserializedCustomEditor;
+    deserialize(_instantiationService: IInstantiationService, serializedEditorInput: string): CustomEditorInput;
+}
+export declare class ComplexCustomWorkingCopyEditorHandler extends Disposable implements IWorkbenchContribution, IWorkingCopyEditorHandler {
+    private readonly _instantiationService;
+    private readonly _workingCopyBackupService;
+    private readonly _webviewService;
+    static readonly ID = "workbench.contrib.complexCustomWorkingCopyEditorHandler";
+    constructor(_instantiationService: IInstantiationService, _workingCopyEditorService: IWorkingCopyEditorService, _workingCopyBackupService: IWorkingCopyBackupService, _webviewService: IWebviewService, _customEditorService: ICustomEditorService);
+    handles(workingCopy: IWorkingCopyIdentifier): boolean;
+    isOpen(workingCopy: IWorkingCopyIdentifier, editor: EditorInput): boolean;
+    createEditor(workingCopy: IWorkingCopyIdentifier): Promise<EditorInput>;
+}
+export {};

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

@@ -1,12 +1,14 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
+import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/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 { NotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { WebviewContentPurpose } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/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';
@@ -63,7 +65,7 @@ function reviveWebview(webviewService, data) {
         origin: data.origin,
         title: undefined,
         options: {
-            purpose: "customEditor" ,
+            purpose: WebviewContentPurpose.CustomEditor,
             enableFindWidget: data.webviewOptions.enableFindWidget,
             retainContextWhenHidden: data.webviewOptions.retainContextWhenHidden,
         },

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.d.ts

@@ -0,0 +1,45 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection } from "../common/customEditor.js";
+import { ICustomEditorService } from "vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor.service";
+import { CustomEditorModelManager } from "../common/customEditorModelManager.js";
+import { IEditorGroupsService } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { IEditorType } from "vscode/vscode/vs/workbench/services/editor/common/editorResolverService";
+import { IEditorResolverService } from "vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class CustomEditorService extends Disposable implements ICustomEditorService {
+    private readonly editorService;
+    private readonly editorGroupService;
+    private readonly instantiationService;
+    private readonly uriIdentityService;
+    private readonly editorResolverService;
+    _serviceBrand: any;
+    private readonly _contributedEditors;
+    private _untitledCounter;
+    private readonly _editorResolverDisposables;
+    private readonly _editorCapabilities;
+    private readonly _models;
+    private readonly _onDidChangeEditorTypes;
+    readonly onDidChangeEditorTypes: Event<void>;
+    private readonly _fileEditorFactory;
+    constructor(fileService: IFileService, storageService: IStorageService, editorService: IEditorService, editorGroupService: IEditorGroupsService, instantiationService: IInstantiationService, uriIdentityService: IUriIdentityService, editorResolverService: IEditorResolverService);
+    getEditorTypes(): IEditorType[];
+    private withActiveCustomEditor;
+    private registerContributionPoints;
+    private createDiffEditorInput;
+    get models(): CustomEditorModelManager;
+    getCustomEditor(viewType: string): CustomEditorInfo | undefined;
+    getContributedCustomEditors(resource: URI): CustomEditorInfoCollection;
+    getUserConfiguredCustomEditors(resource: URI): CustomEditorInfoCollection;
+    getAllCustomEditors(resource: URI): CustomEditorInfoCollection;
+    registerCustomEditorCapabilities(viewType: string, options: CustomEditorCapabilities): IDisposable;
+    getCustomEditorCapabilities(viewType: string): CustomEditorCapabilities | undefined;
+    private getActiveCustomEditorId;
+    private getCustomEditorIsEditable;
+    private handleMovedFileInOpenedFileEditors;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import './media/customEditor.css.js';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -8,13 +9,14 @@ 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';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { EditorExtensions, DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
-import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/vscode/vs/workbench/common/editor/diffEditorInput';
 import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorInfoCollection } from '../common/customEditor.js';
 import { CustomEditorModelManager } from '../common/customEditorModelManager.js';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
@@ -22,7 +24,7 @@ import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/ed
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ContributedCustomEditors } from '../common/contributedCustomEditors.js';
-import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
+import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 
 let CustomEditorService = class CustomEditorService extends Disposable {
     constructor(fileService, storageService, editorService, editorGroupService, instantiationService, uriIdentityService, editorResolverService) {
@@ -58,7 +60,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(2 )) {
+            if (e.isOperation(FileOperation.MOVE)) {
                 this.handleMovedFileInOpenedFileEditors(e.resource, this.uriIdentityService.asCanonicalUri(e.target.resource));
             }
         }));

package/vscode/src/vs/workbench/contrib/customEditor/browser/media/customEditor.css.js

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".webview.modified{box-shadow:-6px 0 5px -5px var(--vscode-scrollbar-shadow)}";
 n(css,{});

package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.d.ts

@@ -0,0 +1,18 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { CustomEditorInfo } from "./customEditor.js";
+export declare class ContributedCustomEditors extends Disposable {
+    private static readonly CUSTOM_EDITORS_STORAGE_ID;
+    private static readonly CUSTOM_EDITORS_ENTRY_ID;
+    private readonly _editors;
+    private readonly _memento;
+    constructor(storageService: IStorageService);
+    private readonly _onChange;
+    readonly onChange: import("vscode/vscode/vs/base/common/event").Event<void>;
+    private update;
+    [Symbol.iterator](): Iterator<CustomEditorInfo>;
+    get(viewType: string): CustomEditorInfo | undefined;
+    getContributedEditors(resource: URI): readonly CustomEditorInfo[];
+    private add;
+}