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

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

@@ -1,32 +1,32 @@
+
+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 { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } 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 { WebviewEditor } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewEditor } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
+import { WebviewInput } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const webviewActiveContextKeyExpr = ( (ContextKeyExpr.and(
-     (ContextKeyExpr.equals('activeEditor', WebviewEditor.ID)),
-     (EditorContextKeys.focus.toNegated())
-)));
+const webviewActiveContextKeyExpr = ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', WebviewEditor.ID)), ( EditorContextKeys.focus.toNegated() )));
 class ShowWebViewEditorFindWidgetAction extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.showFind'; }
-    static { this.LABEL = ( localize(9926, "Show find")); }
+    static { this.LABEL = ( localize(10710, "Show find")); }
     constructor() {
         super({
             id: ShowWebViewEditorFindWidgetAction.ID,
             title: ShowWebViewEditorFindWidgetAction.LABEL,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED
-                ))),
-                primary: 2048  | 36 ,
-                weight: 100
+                )),
+                primary: KeyMod.CtrlCmd | KeyCode.KeyF,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -36,18 +36,18 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
 }
 class HideWebViewEditorFindCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.hideFind'; }
-    static { this.LABEL = ( localize(9927, "Stop find")); }
+    static { this.LABEL = ( localize(10711, "Stop find")); }
     constructor() {
         super({
             id: HideWebViewEditorFindCommand.ID,
             title: HideWebViewEditorFindCommand.LABEL,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE
-                ))),
-                primary: 9 ,
-                weight: 100
+                )),
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -57,18 +57,18 @@ class HideWebViewEditorFindCommand extends Action2 {
 }
 class WebViewEditorFindNextCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findNext'; }
-    static { this.LABEL = ( localize(9928, 'Find next')); }
+    static { this.LABEL = ( localize(10712, 'Find next')); }
     constructor() {
         super({
             id: WebViewEditorFindNextCommand.ID,
             title: WebViewEditorFindNextCommand.LABEL,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
-                ))),
-                primary: 3 ,
-                weight: 100
+                )),
+                primary: KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -78,18 +78,18 @@ class WebViewEditorFindNextCommand extends Action2 {
 }
 class WebViewEditorFindPreviousCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
-    static { this.LABEL = ( localize(9929, 'Find previous')); }
+    static { this.LABEL = ( localize(10713, 'Find previous')); }
     constructor() {
         super({
             id: WebViewEditorFindPreviousCommand.ID,
             title: WebViewEditorFindPreviousCommand.LABEL,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     webviewActiveContextKeyExpr,
                     KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
-                ))),
-                primary: 1024  | 3 ,
-                weight: 100
+                )),
+                primary: KeyMod.Shift | KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -99,7 +99,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
 }
 class ReloadWebviewAction extends Action2 {
     static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
-    static { this.LABEL = ( localize2(9930, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(10714, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.d.ts

@@ -0,0 +1,50 @@
+import { UriComponents } from "vscode/vscode/vs/base/common/uri";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IEditorSerializer } from "vscode/vscode/vs/workbench/common/editor";
+import { WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { WebviewIcons } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewIconManager";
+import { WebviewInput } from "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { IWebviewWorkbenchService } from "vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
+export type SerializedWebviewOptions = WebviewOptions & WebviewContentOptions;
+interface SerializedIconPath {
+    light: string | UriComponents;
+    dark: string | UriComponents;
+}
+export interface SerializedWebview {
+    readonly origin: string | undefined;
+    readonly viewType: string;
+    readonly providedId: string | undefined;
+    readonly title: string;
+    readonly options: SerializedWebviewOptions;
+    readonly extensionLocation: UriComponents | undefined;
+    readonly extensionId: string | undefined;
+    readonly state: any;
+    readonly iconPath: SerializedIconPath | undefined;
+    readonly group?: number;
+}
+export interface DeserializedWebview {
+    readonly origin: string | undefined;
+    readonly viewType: string;
+    readonly providedId: string | undefined;
+    readonly title: string;
+    readonly webviewOptions: WebviewOptions;
+    readonly contentOptions: WebviewContentOptions;
+    readonly extension: WebviewExtensionDescription | undefined;
+    readonly state: any;
+    readonly iconPath: WebviewIcons | undefined;
+    readonly group?: number;
+}
+export declare class WebviewEditorInputSerializer implements IEditorSerializer {
+    private readonly _webviewWorkbenchService;
+    static readonly ID: string;
+    constructor(_webviewWorkbenchService: IWebviewWorkbenchService);
+    canSerialize(input: WebviewInput): boolean;
+    serialize(input: WebviewInput): string | undefined;
+    deserialize(_instantiationService: IInstantiationService, serializedEditorInput: string): WebviewInput;
+    protected fromJson(data: SerializedWebview): DeserializedWebview;
+    protected toJson(input: WebviewInput): SerializedWebview;
+}
+export declare function reviveWebviewExtensionDescription(extensionId: string | undefined, extensionLocation: UriComponents | undefined): WebviewExtensionDescription | undefined;
+export declare function restoreWebviewOptions(options: SerializedWebviewOptions): WebviewOptions;
+export declare function restoreWebviewContentOptions(options: SerializedWebviewOptions): WebviewContentOptions;
+export {};

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

@@ -1,7 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewInput } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
 
 let WebviewEditorInputSerializer = class WebviewEditorInputSerializer {

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

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

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

@@ -1,22 +1,24 @@
-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 { 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 } 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 { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ShowWebViewEditorFindWidgetAction, HideWebViewEditorFindCommand, WebViewEditorFindNextCommand, WebViewEditorFindPreviousCommand, ReloadWebviewAction } from './webviewCommands.js';
-import { WebviewEditor } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewEditor } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
+import { WebviewInput } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { WebviewEditorInputSerializer } from './webviewEditorInputSerializer.js';
-import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
+import '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
 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(4429, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
+(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(10716, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
     static { this.ID = 'workbench.contrib.webviewPanel'; }
     constructor(editorService, editorGroupService) {
@@ -50,12 +52,12 @@ let WebviewPanelContribution = class WebviewPanelContribution extends Disposable
         previousGroup.closeEditor(editor);
     }
 };
-WebviewPanelContribution = ( (__decorate([
-    ( (__param(0, IEditorService))),
-    ( (__param(1, IEditorGroupsService)))
-], WebviewPanelContribution)));
-registerWorkbenchContribution2(WebviewPanelContribution.ID, WebviewPanelContribution, 1 );
-( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(WebviewEditorInputSerializer.ID, WebviewEditorInputSerializer);
+WebviewPanelContribution = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IEditorGroupsService))
+], WebviewPanelContribution));
+registerWorkbenchContribution2(WebviewPanelContribution.ID, WebviewPanelContribution, WorkbenchPhase.BlockStartup);
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(WebviewEditorInputSerializer.ID, WebviewEditorInputSerializer);
 registerAction2(ShowWebViewEditorFindWidgetAction);
 registerAction2(HideWebViewEditorFindCommand);
 registerAction2(WebViewEditorFindNextCommand);

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.d.ts

@@ -0,0 +1,64 @@
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+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 { 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";
+import { ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewletViewOptions } from "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
+import { IViewBadge } from "vscode/vscode/vs/workbench/common/views";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { IViewsService } from "vscode/vscode/vs/workbench/services/views/common/viewsService.service";
+import { IWebviewService } from "vscode/vscode/vs/workbench/contrib/webview/browser/webview.service";
+import { IWebviewViewService } from "vscode/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService.service";
+import { IActivityService } from "vscode/vscode/vs/workbench/services/activity/common/activity.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IHoverService } from "vscode/vscode/vs/platform/hover/browser/hover.service";
+export declare class WebviewViewPane extends ViewPane {
+    private readonly activityService;
+    private readonly extensionService;
+    private readonly progressService;
+    private readonly storageService;
+    private readonly viewService;
+    private readonly webviewService;
+    private readonly webviewViewService;
+    private static _originStore?;
+    private static getOriginStore;
+    private readonly _webview;
+    private readonly _webviewDisposables;
+    private _activated;
+    private _container?;
+    private _rootContainer?;
+    private _resizeObserver?;
+    private readonly defaultTitle;
+    private setTitle;
+    private badge;
+    private readonly activity;
+    private readonly memento;
+    private readonly viewState;
+    private readonly extensionId?;
+    private _repositionTimeout?;
+    constructor(options: IViewletViewOptions, configurationService: IConfigurationService, contextKeyService: IContextKeyService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, keybindingService: IKeybindingService, openerService: IOpenerService, telemetryService: ITelemetryService, hoverService: IHoverService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, activityService: IActivityService, extensionService: IExtensionService, progressService: IProgressService, storageService: IStorageService, viewService: IViewsService, webviewService: IWebviewService, webviewViewService: IWebviewViewService);
+    private readonly _onDidChangeVisibility;
+    readonly onDidChangeVisibility: import("vscode/vscode/vs/base/common/event").Event<boolean>;
+    private readonly _onDispose;
+    readonly onDispose: import("vscode/vscode/vs/base/common/event").Event<void>;
+    dispose(): void;
+    focus(): void;
+    protected renderBody(container: HTMLElement): void;
+    saveState(): void;
+    protected layoutBody(height: number, width: number): void;
+    private updateTreeVisibility;
+    private activate;
+    protected updateTitle(value: string | undefined): void;
+    protected updateBadge(badge: IViewBadge | undefined): void;
+    private withProgress;
+    onDidScrollRoot(): void;
+    private doLayoutWebview;
+    private layoutWebview;
+    private findRootContainer;
+}

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.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 { Dimension, getWindow, EventType, addDisposableListener, findParentWithClass } from 'vscode/vscode/vs/base/browser/dom';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -11,18 +12,19 @@ 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';
-import { ViewPane, ViewPaneShowActions } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
+import { ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { Memento } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/common/memento';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { ExtensionKeyedWebviewOriginStore } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
+import { ExtensionKeyedWebviewOriginStore, WebviewContentPurpose } from '@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 { WebviewWindowDragMonitor } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
+import { WebviewWindowDragMonitor } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
 import { IWebviewViewService } from 'vscode/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService.service';
-import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
@@ -57,7 +59,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         this.extensionId = options.fromExtensionId;
         this.defaultTitle = this.title;
         this.memento = ( new Memento(`webviewView.${this.id}`, storageService));
-        this.viewState = this.memento.getMemento(1 , 1 );
+        this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         this._register(this.onDidChangeBodyVisibility(() => this.updateTreeVisibility()));
         this._register(this.webviewViewService.onNewResolverRegistered(e => {
             if (e.viewType === this.id) {
@@ -121,7 +123,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
             origin,
             providedViewType: this.id,
             title: this.title,
-            options: { purpose: "webviewView"  },
+            options: { purpose: WebviewContentPurpose.WebviewView },
             contentOptions: {},
             extension: this.extensionId ? { id: this.extensionId } : undefined
         });

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewService.d.ts

@@ -0,0 +1,30 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IViewBadge } from "vscode/vscode/vs/workbench/common/views";
+import { IOverlayWebview } from "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebviewViewService } from "vscode/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService.service";
+export interface WebviewView {
+    title?: string;
+    description?: string;
+    badge?: IViewBadge;
+    readonly webview: IOverlayWebview;
+    readonly onDidChangeVisibility: Event<boolean>;
+    readonly onDispose: Event<void>;
+    dispose(): void;
+    show(preserveFocus: boolean): void;
+}
+export interface IWebviewViewResolver {
+    resolve(webviewView: WebviewView, cancellation: CancellationToken): Promise<void>;
+}
+export declare class WebviewViewService extends Disposable implements IWebviewViewService {
+    readonly _serviceBrand: undefined;
+    private readonly _resolvers;
+    private readonly _awaitingRevival;
+    private readonly _onNewResolverRegistered;
+    readonly onNewResolverRegistered: Event<{
+        readonly viewType: string;
+    }>;
+    register(viewType: string, resolver: IWebviewViewResolver): IDisposable;
+    resolve(viewType: string, webview: WebviewView, cancellation: CancellationToken): Promise<void>;
+}

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

@@ -1,3 +1,4 @@
+
 import { promiseWithResolvers } from 'vscode/vscode/vs/base/common/async';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';

package/vscode/src/vs/workbench/services/editor/browser/editorPaneService.d.ts

@@ -0,0 +1,6 @@
+import { IEditorPaneService } from "vscode/vscode/vs/workbench/services/editor/common/editorPaneService.service";
+export declare class EditorPaneService implements IEditorPaneService {
+    readonly _serviceBrand: undefined;
+    readonly onWillInstantiateEditorPane: import("vscode/vscode/vs/base/common/event").Event<import("vscode/vscode/vs/workbench/common/editor").IWillInstantiateEditorPaneEvent>;
+    didInstantiateEditorPane(typeId: string): boolean;
+}

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

@@ -1,5 +1,7 @@
+
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 class EditorPaneService {
     constructor() {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.d.ts

@@ -0,0 +1,60 @@
+import * as glob from "vscode/vscode/vs/base/common/glob";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IUntypedEditorInput } from "vscode/vscode/vs/workbench/common/editor";
+import { IEditorGroupsService } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { RegisteredEditorInfo, RegisteredEditorOptions, EditorAssociations, ResolvedEditor, EditorInputFactoryObject } from "vscode/vscode/vs/workbench/services/editor/common/editorResolverService";
+import { IEditorResolverService } from "vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service";
+import { IQuickInputService } from "vscode/vscode/vs/platform/quickinput/common/quickInput.service";
+import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { PreferredGroup } from "vscode/vscode/vs/workbench/services/editor/common/editorService";
+export declare class EditorResolverService extends Disposable implements IEditorResolverService {
+    private readonly editorGroupService;
+    private readonly instantiationService;
+    private readonly configurationService;
+    private readonly quickInputService;
+    private readonly notificationService;
+    private readonly telemetryService;
+    private readonly storageService;
+    private readonly extensionService;
+    private readonly logService;
+    readonly _serviceBrand: undefined;
+    private readonly _onDidChangeEditorRegistrations;
+    readonly onDidChangeEditorRegistrations: import("vscode/vscode/vs/base/common/event").Event<void>;
+    private static readonly configureDefaultID;
+    private static readonly cacheStorageID;
+    private static readonly conflictingDefaultsStorageID;
+    private _editors;
+    private _flattenedEditors;
+    private _shouldReFlattenEditors;
+    private cache;
+    constructor(editorGroupService: IEditorGroupsService, instantiationService: IInstantiationService, configurationService: IConfigurationService, quickInputService: IQuickInputService, notificationService: INotificationService, telemetryService: ITelemetryService, storageService: IStorageService, extensionService: IExtensionService, logService: ILogService);
+    private resolveUntypedInputAndGroup;
+    resolveEditor(editor: IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): Promise<ResolvedEditor>;
+    private doResolveSideBySideEditor;
+    bufferChangeEvents(callback: Function): void;
+    registerEditor(globPattern: string | glob.IRelativePattern, editorInfo: RegisteredEditorInfo, options: RegisteredEditorOptions, editorFactoryObject: EditorInputFactoryObject): IDisposable;
+    getAssociationsForResource(resource: URI): EditorAssociations;
+    getAllUserAssociations(): EditorAssociations;
+    private _flattenEditorsMap;
+    private get _registeredEditors();
+    updateUserAssociations(globPattern: string, editorID: string): void;
+    private findMatchingEditors;
+    getEditors(resource?: URI): RegisteredEditorInfo[];
+    private getEditor;
+    private doResolveEditor;
+    private moveExistingEditorForResource;
+    private findExistingEditorsForResource;
+    private doHandleConflictingDefaults;
+    private mapEditorsToQuickPickEntry;
+    private doPickEditor;
+    private sendEditorResolutionTelemetry;
+    private cacheEditors;
+    private resourceMatchesCache;
+}