@codingame/monaco-vscode-views-service-override 4.4.1 → 4.5.0

package/index.d.ts

@@ -1,6 +1,6 @@
 export { InitializationStateTransformer, attachPart, default, isEditorPartVisible, onPartVisibilityChange, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart } from './views.js';
 export { SidebarPart } from './vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js';
-export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
+export { ActivityService } from './vscode/src/vs/workbench/services/activity/browser/activityService.js';
 export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
 export { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
 export { PanelPart } from './vscode/src/vs/workbench/browser/parts/panel/panelPart.js';
@@ -9,8 +9,6 @@ export { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 export { IResolvedTextEditorModel } from 'vscode/vscode/vs/editor/common/services/resolverService';
 export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
-export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
-export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 export { CustomViewOption, EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 export { IViewContainerDescriptor, IViewDescriptor, ViewContainer, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
@@ -20,5 +18,7 @@ export { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
+export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 export { ILayoutInitializationState } from 'vscode/vscode/vs/workbench/browser/layout';
 export { OpenEditor } from './tools/editor.js';

package/index.js

@@ -1,19 +1,19 @@
 export { attachPart, default, isEditorPartVisible, onPartVisibilityChange, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart } from './views.js';
-export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
-export { ActivitybarPart } from 'vscode/vscode/vs/workbench/browser/parts/activitybar/activitybarPart';
+export { ActivityService } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/services/activity/browser/activityService';
+export { ActivitybarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/activitybar/activitybarPart';
 export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
 export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
+export { ConfirmResult } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
-export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
-export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
-export { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
-export { SidebarPart } from 'vscode/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
+export { PanelPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/panel/panelPart';
+export { SidebarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -17,16 +17,18 @@
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./vscode/*": {
+      "default": "./vscode/src/*.js"
+    }
+  },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.4.1",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "4.4.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "4.4.1",
-    "@codingame/monaco-vscode-keybindings-service-override": "4.4.1",
-    "@codingame/monaco-vscode-files-service-override": "4.4.1",
-    "@codingame/monaco-vscode-extensions-service-override": "4.4.1",
-    "@codingame/monaco-vscode-environment-service-override": "4.4.1",
-    "@codingame/monaco-vscode-layout-service-override": "4.4.1",
-    "@codingame/monaco-vscode-host-service-override": "4.4.1",
-    "@codingame/monaco-vscode-base-service-override": "4.4.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "4.5.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "4.5.0",
+    "@codingame/monaco-vscode-view-common-service-override": "4.5.0"
   }
 }

package/tools/editor.d.ts

@@ -1,6 +1,6 @@
+import { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { ICodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IResolvedTextEditorModel } from 'vscode/vscode/vs/editor/common/services/resolverService';
 
 type OpenEditor = (modelRef: IReference<IResolvedTextEditorModel>, options: IEditorOptions | undefined, sideBySide?: boolean) => Promise<ICodeEditor | undefined>;

package/tools/editor.js

@@ -2,26 +2,26 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { isPreferredGroup, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { EditorCloseContext, isEditorInput, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
+import { isEditorInput, isResourceEditorInput, EditorCloseContext } from 'vscode/vscode/vs/workbench/common/editor';
 import { applyTextEditorOptions } from 'vscode/vscode/vs/workbench/common/editor/editorOptions';
 import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vscode/vscode/vs/workbench/browser/parts/editor/editor';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { StandaloneCodeEditor, StandaloneEditor } from 'vscode/vscode/vs/editor/standalone/browser/standaloneCodeEditor';
+import { StandaloneEditor, StandaloneCodeEditor } from 'vscode/vscode/vs/editor/standalone/browser/standaloneCodeEditor';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { EditorService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorService';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
-import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { ITextEditorService } from 'vscode/vscode/vs/workbench/services/textfile/common/textEditorService';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
+import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ITextEditorService } from 'vscode/vscode/vs/workbench/services/textfile/common/textEditorService.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { TextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { unsupported } from '../tools.js';
 

package/tools/views.js

@@ -9,8 +9,8 @@ import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/view
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
+import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
@@ -21,17 +21,17 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { BaseActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { assertIsDefined, assertAllDefined } from 'vscode/vscode/vs/base/common/types';
-export { ConfirmResult } from '../override/vs/platform/dialogs/common/dialogs.js';
+export { ConfirmResult } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 export { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { fakeActiveGroup } from './editor.js';

package/tools.js

@@ -1,5 +1,42 @@
 function unsupported() {
     throw new Error('unsupported');
 }
+function memoized(fct) {
+    let v = null;
+    return (...args) => {
+        if (v == null) {
+            v = fct(...args);
+        }
+        return v;
+    };
+}
+function memoizedConstructor(ctor) {
+    return new Proxy(ctor, {
+        construct: memoized((target, args) => {
+            return Reflect.construct(ctor, args);
+        })
+    });
+}
+async function sleep(duration) {
+    await new Promise(resolve => setTimeout(resolve, duration));
+}
+function throttle(fct, merge, delay) {
+    let lastPromise = Promise.resolve();
+    let toConsume = null;
+    return async (param) => {
+        if (toConsume == null) {
+            toConsume = param;
+            lastPromise = lastPromise.then(async () => sleep(delay)).then(async () => {
+                const _toConsume = toConsume;
+                toConsume = null;
+                await fct(_toConsume);
+            });
+        }
+        else {
+            toConsume = merge(toConsume, param);
+        }
+        await lastPromise;
+    };
+}
 
-export { unsupported };
+export { memoized, memoizedConstructor, sleep, throttle, unsupported };

package/views.d.ts

@@ -1,8 +1,8 @@
 import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
-import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 export { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { ILayoutInitializationState } from 'vscode/vscode/vs/workbench/browser/layout';
 export { ILayoutInitializationState } from 'vscode/vscode/vs/workbench/browser/layout';

package/views.js

@@ -1,105 +1,51 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { SidebarPart } from 'vscode/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
-export { SidebarPart } from 'vscode/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
-import { ViewDescriptorService } from 'vscode/vscode/vs/workbench/services/views/browser/viewDescriptorService';
-import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
-export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-export { ActivitybarPart } from 'vscode/vscode/vs/workbench/browser/parts/activitybar/activitybarPart';
-import { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
-export { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
+import { SidebarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
+export { SidebarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
+export { ActivityService } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/services/activity/browser/activityService';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+export { ActivitybarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/activitybar/activitybarPart';
+import { PanelPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/panel/panelPart';
+export { PanelPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/panel/panelPart';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
-export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
-import { EditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorResolverService';
-import { IBreadcrumbsService, BreadcrumbsService } from 'vscode/vscode/vs/workbench/browser/parts/editor/breadcrumbs';
-import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { ContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextViewService';
-import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { pathsToEditors, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
 export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
-import { ITextEditorService, TextEditorService } from 'vscode/vscode/vs/workbench/services/textfile/common/textEditorService';
-import { CodeEditorService } from 'vscode/vscode/vs/workbench/services/editor/browser/codeEditorService';
-import { IUntitledTextEditorService, UntitledTextEditorService } from 'vscode/vscode/vs/workbench/services/untitled/common/untitledTextEditorService';
-import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
-import { HistoryService } from 'vscode/vscode/vs/workbench/services/history/browser/historyService';
-import { ICustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor';
-import { CustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditors';
-import { WebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webviewService';
-import { IWebviewWorkbenchService, WebviewEditorService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
-import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
-import { IWebviewViewService, WebviewViewService } from 'vscode/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService';
 import { positionToString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { ProgressService } from 'vscode/vscode/vs/workbench/services/progress/browser/progressService';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { AuxiliaryBarPart } from 'vscode/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
+import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
+import { AuxiliaryBarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { mark } from 'vscode/vscode/vs/base/common/performance';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
-import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
-import { IWorkspaceContextService, isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
+import { isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
-import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { PaneCompositePartService } from 'vscode/vscode/vs/workbench/browser/parts/paneCompositePartService';
-import { EditorParts } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorParts';
-import { IAuxiliaryWindowService, BrowserAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
-import { ViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/viewsService';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
-import { IEditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/common/editorPaneService';
-import { EditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorPaneService';
-import { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
+import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
+import { EditorParts } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/editor/editorParts';
 export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
-import { ICustomEditorLabelService, CustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService';
 import { MonacoDelegateEditorGroupsService, MonacoEditorService } from './tools/editor.js';
-import getServiceOverride$1 from '@codingame/monaco-vscode-bulk-edit-service-override';
 import getServiceOverride$2 from '@codingame/monaco-vscode-quickaccess-service-override';
 import getServiceOverride$3 from '@codingame/monaco-vscode-keybindings-service-override';
-import { changeUrlDomain } from './tools/url.js';
+import getServiceOverride$1 from '@codingame/monaco-vscode-view-common-service-override';
 import { onRenderWorkbench } from 'vscode/lifecycle';
-import { registerAssets } from 'vscode/assets';
-import 'vscode/vscode/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
-import 'vscode/vscode/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution';
-import 'vscode/vscode/vs/workbench/browser/actions/listCommands';
-import 'vscode/vscode/vs/workbench/browser/parts/views/media/views.css';
-import 'vscode/vscode/vs/workbench/api/browser/viewsExtensionPoint';
-import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution';
-import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
-import 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditor.contribution';
-import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution';
-import 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution';
-import 'vscode/vscode/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution';
-import 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution';
-import 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.contribution';
-import 'vscode/vscode/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution';
-import 'vscode/vscode/vs/workbench/contrib/sash/browser/sash.contribution';
-import 'vscode/vscode/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
-import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.autosave.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/files.editorPane.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands.save';
-import 'vscode/vscode/vs/workbench/browser/actions/navigationActions';
-import 'vscode/vscode/vs/workbench/browser/style';
-import './tools/editorAssets.js';
 export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
+export { ConfirmResult } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
@@ -218,13 +164,6 @@ let MonacoEditorParts = class MonacoEditorParts extends MonacoDelegateEditorGrou
 MonacoEditorParts = __decorate([
     ( __param(0, IInstantiationService))
 ], MonacoEditorParts);
-let webviewIframeAlternateDomains;
-registerAssets({
-    'vs/workbench/contrib/webview/browser/pre/service-worker.js': () => changeUrlDomain(new URL('./assets/service-worker.js', import.meta.url).href, webviewIframeAlternateDomains),
-    'vs/workbench/contrib/webview/browser/pre/index.html': () => changeUrlDomain(new URL('./assets/index.html', import.meta.url).href, webviewIframeAlternateDomains),
-    'vs/workbench/contrib/webview/browser/pre/index-no-csp.html': () => changeUrlDomain(new URL('./assets/index-no-csp.html', import.meta.url).href, webviewIframeAlternateDomains),
-    'vs/workbench/contrib/webview/browser/pre/fake.html': () => changeUrlDomain(new URL('./assets/fake.html', import.meta.url).href, webviewIframeAlternateDomains)
-});
 let transformInitializationState = state => state;
 onRenderWorkbench(async (accessor) => {
     const paneCompositePartService = accessor.get(IPaneCompositePartService);
@@ -547,9 +486,6 @@ onRenderWorkbench(async (accessor) => {
     await Promises.settled(layoutRestoredPromises);
 });
 function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains, initializationStateOrRestoreEditors) {
-    if (_webviewIframeAlternateDomains != null) {
-        webviewIframeAlternateDomains = _webviewIframeAlternateDomains;
-    }
     if (initializationStateOrRestoreEditors != null) {
         transformInitializationState = typeof initializationStateOrRestoreEditors === 'boolean'
             ? (state) => ({
@@ -562,7 +498,7 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
             : initializationStateOrRestoreEditors;
     }
     return {
-        ...getServiceOverride$1(),
+        ...getServiceOverride$1(_webviewIframeAlternateDomains),
         ...getServiceOverride$2({
             isKeybindingConfigurationVisible: isEditorPartVisible,
             shouldUseGlobalPicker: isEditorPartVisible
@@ -570,28 +506,8 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
         ...getServiceOverride$3({
             shouldUseGlobalKeybindings: isEditorPartVisible
         }),
-        [( IViewsService.toString())]: new SyncDescriptor(ViewsService, [], false),
-        [( IViewDescriptorService.toString())]: new SyncDescriptor(ViewDescriptorService, [], true),
-        [( IActivityService.toString())]: new SyncDescriptor(ActivityService, [], true),
-        [( IPaneCompositePartService.toString())]: new SyncDescriptor(PaneCompositePartService, [], true),
-        [( IHoverService.toString())]: new SyncDescriptor(HoverService, [], true),
-        [( ICodeEditorService.toString())]: new SyncDescriptor(CodeEditorService, [], true),
-        [( ITextEditorService.toString())]: new SyncDescriptor(TextEditorService, [], false),
         [( IEditorGroupsService.toString())]: new SyncDescriptor(MonacoEditorParts, [], false),
-        [( IEditorService.toString())]: new SyncDescriptor(MonacoEditorService, [openEditorFallback, isEditorPartVisible], false),
-        [( IEditorResolverService.toString())]: new SyncDescriptor(EditorResolverService, [], false),
-        [( IBreadcrumbsService.toString())]: new SyncDescriptor(BreadcrumbsService, [], true),
-        [( IContextViewService.toString())]: new SyncDescriptor(ContextViewService, [], true),
-        [( IUntitledTextEditorService.toString())]: new SyncDescriptor(UntitledTextEditorService, [], true),
-        [( IHistoryService.toString())]: new SyncDescriptor(HistoryService, [], false),
-        [( ICustomEditorService.toString())]: new SyncDescriptor(CustomEditorService, [], true),
-        [( IWebviewService.toString())]: new SyncDescriptor(WebviewService, [], true),
-        [( IWebviewViewService.toString())]: new SyncDescriptor(WebviewViewService, [], true),
-        [( IWebviewWorkbenchService.toString())]: new SyncDescriptor(WebviewEditorService, [], true),
-        [( IProgressService.toString())]: new SyncDescriptor(ProgressService, [], true),
-        [( IAuxiliaryWindowService.toString())]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true),
-        [( IEditorPaneService.toString())]: new SyncDescriptor(EditorPaneService, [], true),
-        [( ICustomEditorLabelService.toString())]: new SyncDescriptor(CustomEditorLabelService, [], true)
+        [( IEditorService.toString())]: new SyncDescriptor(MonacoEditorService, [openEditorFallback, isEditorPartVisible], false)
     };
 }
 

package/vscode/src/vs/platform/actions/browser/toolbar.d.ts

@@ -1,10 +1,11 @@
 import { ToolBar, IToolBarOptions } from '../../../base/browser/ui/toolbar/toolbar.js';
 import { IAction } from 'vscode/vscode/vs/base/common/actions';
-import { IMenuService, MenuId, IMenuActionOptions } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { MenuId, IMenuActionOptions } 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 { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 
 declare const enum HiddenItemStrategy {
     /** This toolbar doesn't support hiding*/

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.d.ts

@@ -1,17 +1,18 @@
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
-import { IWorkbenchLayoutService, Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IAction } from 'vscode/vscode/vs/base/common/actions';
 import { IPaneCompositePart } from '../paneCompositePart.js';
 import { PaneCompositeBar, IPaneCompositeBarOptions } from '../paneCompositeBar.js';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 
 declare class ActivitybarPart extends Part {
     private readonly paneCompositePart;

package/vscode/src/vs/workbench/browser/parts/compositePart.d.ts

@@ -4,14 +4,14 @@ import { IAction } from 'vscode/vscode/vs/base/common/actions';
 import { Part, IPartOptions } from 'vscode/vscode/vs/workbench/browser/part';
 import { Composite, CompositeRegistry } from 'vscode/vscode/vs/workbench/browser/composite';
 import { IComposite } from 'vscode/vscode/vs/workbench/common/composite';
-import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IProgressIndicator } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/contextview';
 import { WorkbenchToolBar } from '../../../platform/actions/browser/toolbar.js';
 import { IBoundarySashes } from 'vscode/vscode/vs/base/browser/ui/sash/sash';

package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.d.ts

@@ -1,14 +1,15 @@
 import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
-import { IWorkbenchLayoutService, Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IColorTheme } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IActivityHoverOptions, ICompositeBarColors } from './compositeBarActions.js';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { ICompositeDragAndDrop } from '../dnd.js';
 import { IAction } from 'vscode/vscode/vs/base/common/actions';
 import { GestureEvent } from 'vscode/vscode/vs/base/browser/touch';

package/vscode/src/vs/workbench/browser/parts/paneCompositePart.d.ts

@@ -3,22 +3,24 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IProgressIndicator } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { PaneCompositeDescriptor, PaneComposite } from 'vscode/vscode/vs/workbench/browser/panecomposite';
 import { IPaneComposite } from 'vscode/vscode/vs/workbench/common/panecomposite';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IView } from 'vscode/vscode/vs/base/browser/ui/grid/grid';
-import { Parts, IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { CompositePart, ICompositeTitleLabel } from './compositePart.js';
 import { PaneCompositeBar, IPaneCompositeBarOptions } from './paneCompositeBar.js';
 import { Dimension } from 'vscode/vscode/vs/base/browser/dom';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { IContextKeyService, IContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { IContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IPartOptions } from 'vscode/vscode/vs/workbench/browser/part';
-import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { SubmenuAction } from 'vscode/vscode/vs/base/common/actions';
 import { Composite } from 'vscode/vscode/vs/workbench/browser/composite';