@codingame/monaco-vscode-views-service-override 1.85.0 → 1.85.2

package/assets/index-no-csp.html

@@ -123,7 +123,11 @@
 			}
 
 			code {
+				font-family: var(--monaco-monospace-font);
 				color: var(--vscode-textPreformat-foreground);
+				background-color: var(--vscode-textPreformat-background);
+				padding: 1px 3px;
+				border-radius: 4px;
 			}
 
 			blockquote {

package/assets/index.html

@@ -5,7 +5,7 @@
 	<meta charset="UTF-8">
 
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-6JpGoG7PLARCKjONYYTGdYKRS+ziu31DUoawja2IO5k=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-Mwwy+ji/EFfa/LgTjpVzHimU6p9WqsPQ+HDXefe3/wQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -124,7 +124,11 @@
 			}
 
 			code {
+				font-family: var(--monaco-monospace-font);
 				color: var(--vscode-textPreformat-foreground);
+				background-color: var(--vscode-textPreformat-background);
+				padding: 1px 3px;
+				border-radius: 4px;
 			}
 
 			blockquote {

package/index.d.ts

@@ -1,4 +1,4 @@
-export { CustomViewOption, InitializationStateTransformer, SimpleEditorInput, SimpleEditorPane, attachPart, default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility } from './views.js';
+export { CustomViewOption, InitializationStateTransformer, SimpleEditorInput, SimpleEditorPane, attachPart, default, getPanelPosition, getSideBarPosition, isEditorPartVisible, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility } 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 { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
@@ -17,5 +17,5 @@ export { EditorPane } from './vscode/src/vs/workbench/browser/parts/editor/edito
 export { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 export { ILayoutInitializationState } from './vscode/src/vs/workbench/browser/layout.js';
 export { OpenEditor } from './tools/editor.js';
-export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';

package/index.js

@@ -1,10 +1,10 @@
-export { SimpleEditorInput, SimpleEditorPane, attachPart, default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility } from './views.js';
+export { SimpleEditorInput, SimpleEditorPane, attachPart, default, getPanelPosition, getSideBarPosition, isEditorPartVisible, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility } from './views.js';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
 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 } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "1.85.0",
+  "version": "1.85.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,14 +18,16 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.2",
     "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "1.85.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.85.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.0",
-    "@codingame/monaco-vscode-keybindings-service-override": "1.85.0",
-    "@codingame/monaco-vscode-environment-service-override": "1.85.0",
-    "@codingame/monaco-vscode-extensions-service-override": "1.85.0",
-    "@codingame/monaco-vscode-files-service-override": "1.85.0"
+    "@codingame/monaco-vscode-bulk-edit-service-override": "1.85.2",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.2",
+    "@codingame/monaco-vscode-keybindings-service-override": "1.85.2",
+    "@codingame/monaco-vscode-files-service-override": "1.85.2",
+    "@codingame/monaco-vscode-extensions-service-override": "1.85.2",
+    "@codingame/monaco-vscode-environment-service-override": "1.85.2",
+    "@codingame/monaco-vscode-host-service-override": "1.85.2",
+    "@codingame/monaco-vscode-base-service-override": "1.85.2"
   }
 }

package/tools/editor.js

@@ -344,7 +344,7 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             return this.delegate.getLayout();
         };
         this.getGroups = (order) => {
-            return [...this.additionalGroups, ...this.delegate.getGroups(order)];
+            return [...this.delegate.getGroups(order), ...this.additionalGroups];
         };
         this.getGroup = (identifier) => {
             return this.delegate.getGroup(identifier) ?? this.additionalGroups.find(group => group.id === identifier);

package/views.d.ts

@@ -2,19 +2,20 @@ import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/brow
 import { ViewContainerLocation, ViewContainer } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { BrandedService, ServicesAccessor } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { Parts, Position } 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 { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 export { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { Dimension } from 'vscode/vscode/vs/base/browser/dom';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 export { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from './vscode/src/vs/base/common/codicons.js';
 import { RegisteredEditorInfo, RegisteredEditorOptions, EditorInputFactoryObject } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
@@ -31,6 +32,10 @@ declare function attachPart(part: Parts, container: HTMLElement): IDisposable;
 declare function onPartVisibilityChange(part: Parts, listener: (visible: boolean) => void): IDisposable;
 declare function isPartVisibile(part: Parts): boolean;
 declare function setPartVisibility(part: Exclude<Parts, Parts.STATUSBAR_PART | Parts.TITLEBAR_PART>, visible: boolean): void;
+declare const onDidChangePanelPosition: Event<string>;
+declare function getPanelPosition(): Position;
+declare const onDidChangeSideBarPosition: Event<string>;
+declare function getSideBarPosition(): Position;
 declare function renderActivitybarPar(container: HTMLElement): IDisposable;
 declare function renderSidebarPart(container: HTMLElement): IDisposable;
 declare function renderPanelPart(container: HTMLElement): IDisposable;
@@ -116,4 +121,4 @@ declare function getServiceOverride(openEditorFallback?: OpenEditor, _webviewIfr
 declare function getServiceOverride(openEditorFallback?: OpenEditor, _webviewIframeAlternateDomains?: string, restoreEditors?: boolean): IEditorOverrideServices;
 declare function getServiceOverride(openEditorFallback?: OpenEditor, _webviewIframeAlternateDomains?: string, initializationState?: InitializationStateTransformer): IEditorOverrideServices;
 
-export { type CustomViewOption, EditorPane, ILayoutInitializationState, type InitializationStateTransformer, OpenEditor, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };
+export { type CustomViewOption, EditorPane, ILayoutInitializationState, type InitializationStateTransformer, OpenEditor, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, getPanelPosition, getSideBarPosition, isEditorPartVisible, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };

package/views.js

@@ -29,7 +29,7 @@ import './vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.co
 import './vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.js';
 import './vscode/src/vs/workbench/contrib/outline/browser/outline.contribution.js';
 import './vscode/src/vs/workbench/browser/actions/listCommands.js';
-import './vscode/src/vs/workbench/browser/parts/views/media/views.css.js';
+import 'vscode/vscode/vs/workbench/browser/parts/views/media/views.css';
 import './vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js';
 import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution';
 import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
@@ -37,7 +37,8 @@ import './vscode/src/vs/workbench/contrib/customEditor/browser/customEditor.cont
 import './vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js';
 import './vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.js';
 import './vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js';
-import './vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.js';
+import './vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js';
+import './vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js';
 import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution';
 import './vscode/src/vs/workbench/contrib/files/browser/files.contribution2.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
@@ -73,7 +74,7 @@ import { IWebviewWorkbenchService, WebviewEditorService } from 'vscode/vscode/vs
 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, IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
@@ -129,7 +130,7 @@ function layoutPart(part) {
     if (parent == null) {
         return;
     }
-    part.layout(Math.max(part.minimumWidth, Math.min(part.maximumWidth, parent.offsetWidth)), Math.max(part.minimumHeight, Math.min(part.maximumHeight, parent.offsetHeight)), 0, 0);
+    part.layout(Math.max(part.minimumWidth, Math.min(part.maximumWidth, parent.offsetWidth)), Math.max(part.minimumHeight, Math.min(part.maximumHeight, parent.offsetHeight)), parent.offsetTop, parent.offsetLeft);
 }
 function renderPart(partContainer, part) {
     partContainer.oncontextmenu = () => false;
@@ -176,6 +177,18 @@ function isPartVisibile(part) {
 function setPartVisibility(part, visible) {
     StandaloneServices.get(IWorkbenchLayoutService).setPartHidden(!visible, part, window);
 }
+const onDidChangePanelPosition = (listener) => {
+    return StandaloneServices.get(IWorkbenchLayoutService).onDidChangePanelPosition(listener);
+};
+function getPanelPosition() {
+    return StandaloneServices.get(IWorkbenchLayoutService).getPanelPosition();
+}
+const onDidChangeSideBarPosition = (listener) => {
+    return StandaloneServices.get(IWorkbenchLayoutService).onDidChangeSideBarPosition(listener);
+};
+function getSideBarPosition() {
+    return StandaloneServices.get(IWorkbenchLayoutService).getSideBarPosition();
+}
 function renderActivitybarPar(container) {
     return attachPart("workbench.parts.activitybar" , container);
 }
@@ -592,14 +605,14 @@ onRenderWorkbench(async (accessor) => {
     const invisibleContainer = document.createElement('div');
     invisibleContainer.style.display = 'none';
     document.body.append(invisibleContainer);
-    for (const { id, role, classes, options } of [
+    for (const { id, role, classes, options, getPosition, onDidChangePosition } of [
         { id: "workbench.parts.titlebar" , role: 'none', classes: ['titlebar'] },
         { id: "workbench.parts.banner" , role: 'banner', classes: ['banner'] },
-        { id: "workbench.parts.activitybar" , role: 'none', classes: ['activitybar', 'left'] },
-        { id: "workbench.parts.sidebar" , role: 'none', classes: ['sidebar', 'left'] },
+        { id: "workbench.parts.activitybar" , role: 'none', classes: ['activitybar'], getPosition: () => layoutService.getSideBarPosition(), onDidChangePosition: layoutService.onDidChangeSideBarPosition },
+        { id: "workbench.parts.sidebar" , role: 'none', classes: ['sidebar'], getPosition: () => layoutService.getSideBarPosition(), onDidChangePosition: layoutService.onDidChangeSideBarPosition },
         { id: "workbench.parts.editor" , role: 'main', classes: ['editor'], options: { restorePreviousState: initialLayoutState.editor.restoreEditors } },
-        { id: "workbench.parts.panel" , role: 'none', classes: ['panel', 'basepanel', positionToString(2 )] },
-        { id: "workbench.parts.auxiliarybar" , role: 'none', classes: ['auxiliarybar', 'basepanel', 'right'] },
+        { id: "workbench.parts.panel" , role: 'none', classes: ['panel', 'basepanel'], getPosition: () => layoutService.getPanelPosition(), onDidChangePosition: layoutService.onDidChangePanelPosition },
+        { id: "workbench.parts.auxiliarybar" , role: 'none', classes: ['auxiliarybar', 'basepanel'], getPosition: () => layoutService.getSideBarPosition() === 0  ? 1  : 0 , onDidChangePosition: layoutService.onDidChangeSideBarPosition },
         { id: "workbench.parts.statusbar" , role: 'status', classes: ['statusbar'] }
     ]) {
         const part = layoutService.getPart(id);
@@ -609,6 +622,15 @@ onRenderWorkbench(async (accessor) => {
             renderPart(partContainer, part);
             part.layout(9999, 9999, 0, 0);
             invisibleContainer.append(partContainer);
+            if (getPosition != null) {
+                let position = getPosition();
+                part.element.classList.add(positionToString(position));
+                onDidChangePosition?.(() => {
+                    part.element.classList.remove(positionToString(position));
+                    position = getPosition();
+                    part.element.classList.add(positionToString(position));
+                });
+            }
         }
     }
     const layoutReadyPromises = [];
@@ -778,4 +800,4 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
     };
 }
 
-export { ActivityService, HoverService, PanelPart, SidebarPart, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };
+export { ActivityService, HoverService, PanelPart, SidebarPart, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, getPanelPosition, getSideBarPosition, isEditorPartVisible, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };

package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js

@@ -9,13 +9,13 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/browser/panecomposite';
-import { RawCustomTreeViewContextKey, TreeViewPane, CustomTreeView } from '../../browser/parts/views/treeView.js';
+import { RawCustomTreeViewContextKey, TreeViewPane, CustomTreeView } from 'vscode/vscode/vs/workbench/browser/parts/views/treeView';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Extensions as Extensions$1, ResolvableTreeItem } from 'vscode/vscode/vs/workbench/common/views';
 import { VIEWLET_ID as VIEWLET_ID$3 } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { VIEWLET_ID as VIEWLET_ID$1 } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
-import { VIEWLET_ID } from '../../contrib/remote/browser/remoteExplorer.js';
+import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/remote/browser/remoteExplorer';
 import { VIEWLET_ID as VIEWLET_ID$2 } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { WebviewViewPane } from '../../contrib/webviewView/browser/webviewViewPane.js';
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';

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

@@ -6,7 +6,7 @@ import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { ICustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor';
-import { NotebookEditorInput } from '../../../../../../../override/vs/workbench/contrib/notebook/common/notebookEditorInput.js';
+import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { WebviewEditorInputSerializer, reviveWebviewExtensionDescription, restoreWebviewOptions, restoreWebviewContentOptions } from '../../webviewPanel/browser/webviewEditorInputSerializer.js';
 import { IWebviewWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';