@codingame/monaco-vscode-workbench-service-override 2.2.0 → 2.2.2

package/index.d.ts

@@ -3,6 +3,7 @@ export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/spl
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { CustomViewOption, 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';
 export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { ConfirmResult } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 export { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';

package/index.js

@@ -3,6 +3,7 @@ export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layout
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
 export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,19 +18,19 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "2.2.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "2.2.0",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "2.2.0",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "2.2.0",
-    "@codingame/monaco-vscode-view-banner-service-override": "2.2.0",
-    "@codingame/monaco-vscode-files-service-override": "2.2.0",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.0",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.0",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.0",
-    "@codingame/monaco-vscode-host-service-override": "2.2.0",
-    "@codingame/monaco-vscode-base-service-override": "2.2.0"
+    "@codingame/monaco-vscode-keybindings-service-override": "2.2.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.2",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "2.2.2",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "2.2.2",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "2.2.2",
+    "@codingame/monaco-vscode-view-banner-service-override": "2.2.2",
+    "@codingame/monaco-vscode-files-service-override": "2.2.2",
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.2",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.2",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.2",
+    "@codingame/monaco-vscode-host-service-override": "2.2.2",
+    "@codingame/monaco-vscode-base-service-override": "2.2.2"
   }
 }

package/tools/views.d.ts

@@ -3,7 +3,16 @@ export { IViewContainerDescriptor, IViewDescriptor, ViewContainer, ViewContainer
 import { BrandedService, ServicesAccessor } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Dimension } from 'vscode/vscode/vs/base/browser/dom';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
+import { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 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';
@@ -11,16 +20,8 @@ import { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/com
 export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 import { IEditorOpenContext, EditorInputCapabilities, Verbosity, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
 export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
-import { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { 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 { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
-import { Event } from 'vscode/vscode/vs/base/common/event';
-import { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 
 type Label = string | {
     short: string;
@@ -30,7 +31,7 @@ type Label = string | {
 declare abstract class SimpleEditorPane extends EditorPane {
     protected container: HTMLElement;
     protected wrapper: HTMLElement;
-    private scrollbar;
+    protected scrollbar: DomScrollableElement | undefined;
     private inputDisposable;
     constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
     protected createEditor(parent: HTMLElement): void;
@@ -73,7 +74,7 @@ interface CustomViewOption {
     readonly id: string;
     name: string;
     order?: number;
-    renderBody(container: HTMLElement): IDisposable;
+    renderBody(container: HTMLElement, scrollbar: DomScrollableElement): IDisposable;
     location: ViewContainerLocation;
     icon?: string;
     canMoveView?: boolean;

package/tools/views.js

@@ -3,10 +3,11 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { MutableDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { size, $, append } from 'vscode/vscode/vs/base/browser/dom';
+import { size, $ } from 'vscode/vscode/vs/base/browser/dom';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+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';
@@ -181,11 +182,23 @@ function registerCustomView(options) {
             ctorDescriptor: new SyncDescriptor(class extends ViewPane {
                 renderBody(container) {
                     super.renderBody(container);
-                    this.content = $('.view-pane-content');
-                    this.content.style.display = 'flex';
-                    this.content.style.alignItems = 'stretch';
-                    append(container, this.content);
-                    this._register(options.renderBody(this.content));
+                    this.wrapper = document.createElement('div');
+                    this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
+                    this.container = $('.view-pane-content');
+                    this.container.style.display = 'flex';
+                    this.container.style.alignItems = 'stretch';
+                    this._register(options.renderBody(this.container, this.scrollbar));
+                    this.wrapper.append(this.container);
+                    container.appendChild(this.scrollbar.getDomNode());
+                    const observer = new ResizeObserver(() => {
+                        assertIsDefined(this.scrollbar).scanDomNode();
+                    });
+                    observer.observe(this.container);
+                    this._register({
+                        dispose() {
+                            observer.disconnect();
+                        }
+                    });
                 }
                 getActionViewItem(action, actionOptions) {
                     const customAction = (options.actions ?? []).find(customAction => customAction.id === action.id);
@@ -200,8 +213,9 @@ function registerCustomView(options) {
                     return super.getActionViewItem(action, actionOptions);
                 }
                 layoutBody(height, width) {
-                    this.content.style.height = `${height}px`;
-                    this.content.style.width = `${width}px`;
+                    const [wrapper, scrollbar] = assertAllDefined(this.wrapper, this.scrollbar);
+                    size(wrapper, width, height);
+                    scrollbar.scanDomNode();
                 }
             }),
             canMoveView: options.canMoveView ?? true,

package/workbench.js

@@ -79,6 +79,7 @@ import 'vscode/vscode/vs/workbench/contrib/sash/browser/sash.contribution';
 import 'vscode/vscode/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
 import { registerAssets } from 'vscode/assets';
 export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
 export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
@@ -120,7 +121,8 @@ CustomWorkbench = __decorate([
     ( __param(1, ILogService)),
     ( __param(2, IInstantiationService))
 ], CustomWorkbench);
-setFullscreen(detectFullscreen(mainWindow) != null, mainWindow);
+const detectedFullScreen = detectFullscreen(mainWindow);
+setFullscreen(detectedFullScreen != null && !detectedFullScreen.guess, mainWindow);
 onLayout(async (accessor) => {
     accessor.get(IWorkbenchLayoutService).startup();
 });