@codingame/monaco-vscode-views-service-override 2.2.0-next.3 → 2.2.0-next.5

package/index.d.ts

@@ -10,8 +10,8 @@ export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/spl
 export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 export { IResolvedTextEditorModel } from 'vscode/vscode/vs/editor/common/services/resolverService';
 export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
-export { CustomViewOption, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility } from './tools/views.js';
-export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
+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 { 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

@@ -5,7 +5,7 @@ export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/com
 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 { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility } from './tools/views.js';
+export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 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-views-service-override",
-  "version": "2.2.0-next.3",
+  "version": "2.2.0-next.5",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,16 +18,16 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.5",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "2.2.0-next.3",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.3",
-    "@codingame/monaco-vscode-keybindings-service-override": "2.2.0-next.3",
-    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.3",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.3",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.3",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.3",
-    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.3",
-    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.3"
+    "@codingame/monaco-vscode-bulk-edit-service-override": "2.2.0-next.5",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.5",
+    "@codingame/monaco-vscode-keybindings-service-override": "2.2.0-next.5",
+    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.5",
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.5",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.5",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.5",
+    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.5",
+    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.5"
   }
 }

package/tools/views.d.ts

@@ -1,5 +1,5 @@
-import { ViewContainerLocation, ViewContainer } from 'vscode/vscode/vs/workbench/common/views';
-export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewContainerLocation, ViewContainer, IViewContainersRegistry, IViewsRegistry } from 'vscode/vscode/vs/workbench/common/views';
+export { IViewContainerDescriptor, IViewDescriptor, ViewContainer, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 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';
@@ -29,6 +29,7 @@ type Label = string | {
 };
 declare abstract class SimpleEditorPane extends EditorPane {
     protected container: HTMLElement;
+    protected wrapper: HTMLElement;
     private scrollbar;
     private inputDisposable;
     constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
@@ -91,6 +92,8 @@ interface CustomViewOption {
     hideByDefault?: boolean;
     collapsed?: boolean;
 }
+declare const viewContainerRegistry: IViewContainersRegistry;
+declare const viewRegistry: IViewsRegistry;
 declare function registerCustomView(options: CustomViewOption): IDisposable;
 declare function isPartVisibile(part: Parts): boolean;
 declare function setPartVisibility(part: Exclude<Parts, Parts.STATUSBAR_PART | Parts.TITLEBAR_PART>, visible: boolean): void;
@@ -99,4 +102,4 @@ declare function getPanelPosition(): Position;
 declare const onDidChangeSideBarPosition: Event<string>;
 declare function getSideBarPosition(): Position;
 
-export { type CustomViewOption, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility };
+export { type CustomViewOption, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/tools/views.js

@@ -26,7 +26,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
-import { assertAllDefined, assertIsDefined } from 'vscode/vscode/vs/base/common/types';
+import { assertIsDefined, assertAllDefined } from 'vscode/vscode/vs/base/common/types';
 export { ConfirmResult } from '../override/vs/platform/dialogs/common/dialogs.js';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -40,8 +40,19 @@ let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
     }
     createEditor(parent) {
         this.container = this.initialize();
-        this.scrollbar = this._register(new DomScrollableElement(this.container, { horizontal: 1 , vertical: 1  }));
+        this.wrapper = document.createElement('div');
+        this.wrapper.append(this.container);
+        this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
         parent.appendChild(this.scrollbar.getDomNode());
+        const observer = new ResizeObserver(() => {
+            assertIsDefined(this.scrollbar).scanDomNode();
+        });
+        observer.observe(this.container);
+        this._register({
+            dispose() {
+                observer.disconnect();
+            }
+        });
     }
     async setInput(input, editorOptions, context, token) {
         await super.setInput(input, editorOptions, context, token);
@@ -49,10 +60,11 @@ let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
             return;
         }
         this.inputDisposable.value = await this.renderInput?.(input, editorOptions, context, token);
+        assertIsDefined(this.scrollbar).scanDomNode();
     }
     layout(dimension) {
-        const [container, scrollbar] = assertAllDefined(this.container, this.scrollbar);
-        size(container, dimension.width, dimension.height);
+        const [wrapper, scrollbar] = assertAllDefined(this.wrapper, this.scrollbar);
+        size(wrapper, dimension.width, dimension.height);
         scrollbar.scanDomNode();
     }
     focus() {
@@ -146,9 +158,11 @@ function registerEditor(globPattern, editorInfo, editorOptions, factory) {
 function registerEditorSerializer(editorTypeId, ctor) {
     return ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(editorTypeId, ctor);
 }
+const viewContainerRegistry = ( Registry.as(Extensions.ViewContainersRegistry));
+const viewRegistry = ( Registry.as(Extensions.ViewsRegistry));
 function registerCustomView(options) {
     const iconUrl = options.icon != null ? ( URI.parse(options.icon)) : undefined;
-    const viewContainer = options.viewContainer ?? ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
+    const viewContainer = options.viewContainer ?? viewContainerRegistry.registerViewContainer({
         id: options.id,
         title: { value: options.name, original: options.name },
         order: options.order,
@@ -197,13 +211,13 @@ function registerCustomView(options) {
             order: options.order,
             containerIcon: iconUrl
         }];
-    ( Registry.as(Extensions.ViewsRegistry)).registerViews(views, viewContainer);
+    viewRegistry.registerViews(views, viewContainer);
     const disposableCollection = new DisposableStore();
     disposableCollection.add({
         dispose() {
-            ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(views, viewContainer);
+            viewRegistry.deregisterViews(views, viewContainer);
             if (options.viewContainer == null) {
-                ( Registry.as(Extensions.ViewContainersRegistry)).deregisterViewContainer(viewContainer);
+                viewContainerRegistry.deregisterViewContainer(viewContainer);
             }
         }
     });
@@ -250,4 +264,4 @@ function getSideBarPosition() {
     return StandaloneServices.get(IWorkbenchLayoutService).getSideBarPosition();
 }
 
-export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility };
+export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/views.js

@@ -93,7 +93,7 @@ import getServiceOverride$3 from '@codingame/monaco-vscode-keybindings-service-o
 import { changeUrlDomain } from './tools/url.js';
 import { onRenderWorkbench } from 'vscode/lifecycle';
 import { registerAssets } from 'vscode/assets';
-export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility } from './tools/views.js';
+export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 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';