@codingame/monaco-vscode-api 2.2.0-next.5 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "2.2.0-next.5",
+  "version": "2.2.1",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -96,12 +96,12 @@
   "dependencies": {
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.5",
-    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.5",
-    "@codingame/monaco-vscode-quickaccess-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"
+    "@codingame/monaco-vscode-files-service-override": "2.2.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.1",
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.1",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.1",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.1",
+    "@codingame/monaco-vscode-host-service-override": "2.2.1",
+    "@codingame/monaco-vscode-base-service-override": "2.2.1"
   }
 }

package/service-override/tools/views.d.ts

@@ -3,21 +3,21 @@ export { IViewContainerDescriptor, IViewDescriptor } from '../../vscode/src/vs/w
 import { BrandedService, ServicesAccessor } from '../../vscode/src/vs/platform/instantiation/common/instantiation.js';
 import { IDisposable } from '../../vscode/src/vs/base/common/lifecycle.js';
 import { Dimension } from '../../vscode/src/vs/base/browser/dom.js';
+import { Event } from '../../vscode/src/vs/base/common/event.js';
+import { CancellationToken } from '../../vscode/src/vs/base/common/cancellation.js';
 import { URI } from '../../vscode/src/vs/base/common/uri.js';
+import { IStorageService } from '../../vscode/src/vs/platform/storage/common/storage.js';
+import { ITelemetryService } from '../../vscode/src/vs/platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../vscode/src/vs/platform/theme/common/themeService.js';
+import { IEditorOptions } from '../../vscode/src/vs/platform/editor/common/editor.js';
+import { Parts, Position } from '../../vscode/src/vs/workbench/services/layout/browser/layoutService.js';
 import { Codicon } from '../../vscode/src/vs/base/common/codicons.js';
 import { RegisteredEditorInfo, RegisteredEditorOptions, EditorInputFactoryObject } from '../../vscode/src/vs/workbench/services/editor/common/editorResolverService.js';
 export { RegisteredEditorPriority } from '../../vscode/src/vs/workbench/services/editor/common/editorResolverService.js';
 import { EditorInput, IEditorCloseHandler } from '../../vscode/src/vs/workbench/common/editor/editorInput.js';
 import { IEditorOpenContext, EditorInputCapabilities, Verbosity, IEditorSerializer } from '../../vscode/src/vs/workbench/common/editor.js';
-import { IEditorOptions } from '../../vscode/src/vs/platform/editor/common/editor.js';
 import { EditorPane } from '../../vscode/src/vs/workbench/browser/parts/editor/editorPane.js';
-import { ITelemetryService } from '../../vscode/src/vs/platform/telemetry/common/telemetry.js';
-import { IStorageService } from '../../vscode/src/vs/platform/storage/common/storage.js';
-import { IThemeService } from '../../vscode/src/vs/platform/theme/common/themeService.js';
-import { CancellationToken } from '../../vscode/src/vs/base/common/cancellation.js';
-import { Event } from '../../vscode/src/vs/base/common/event.js';
 import '../../vscode/src/vs/editor/editor.api.js';
-import { Parts, Position } from '../../vscode/src/vs/workbench/services/layout/browser/layoutService.js';
 
 type Label = string | {
     short: string;

package/service-override/tools/views.js

@@ -3,7 +3,7 @@ import { SyncDescriptor } from '../../vscode/src/vs/platform/instantiation/commo
 import { Extensions } from '../../vscode/src/vs/workbench/common/views.js';
 export { ViewContainerLocation } from '../../vscode/src/vs/workbench/common/views.js';
 import { MutableDisposable, DisposableStore } from '../../vscode/src/vs/base/common/lifecycle.js';
-import { size, $, append } from '../../vscode/src/vs/base/browser/dom.js';
+import { size, $ } from '../../vscode/src/vs/base/browser/dom.js';
 import { ViewPane } from '../../vscode/src/vs/workbench/browser/parts/views/viewPane.js';
 import { Registry } from '../../vscode/src/vs/platform/registry/common/platform.js';
 import { ViewPaneContainer } from '../../vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js';
@@ -178,11 +178,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.container = $('.view-pane-content');
+                    this.container.style.display = 'flex';
+                    this.container.style.alignItems = 'stretch';
+                    this._register(options.renderBody(this.container));
+                    this.wrapper = document.createElement('div');
+                    this.wrapper.append(this.container);
+                    this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
+                    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);
@@ -197,8 +209,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,
@@ -260,4 +273,4 @@ const onDidChangeSideBarPosition = (listener) => {
 function getSideBarPosition() {
     return StandaloneServices.get(IWorkbenchLayoutService).getSideBarPosition();
 }
-export { EditorInput, EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };
+export { EditorInput, EditorPane, SimpleEditorInput, SimpleEditorPane, ViewPaneContainer, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditor.js

@@ -148,7 +148,10 @@ StandaloneCodeEditor = ( __decorate([
 ], StandaloneCodeEditor));
 let StandaloneEditor = class StandaloneEditor extends StandaloneCodeEditor {
     constructor(domElement, _options, instantiationService, codeEditorService, commandService, contextKeyService, keybindingService, themeService, notificationService, configurationService, accessibilityService, modelService, languageService, languageConfigurationService, languageFeaturesService) {
-        const options = { ..._options };
+        const options = {
+            extraEditorClassName: 'standalone-monaco-editor',
+            ..._options
+        };
         updateConfigurationService(configurationService, options, false);
         const themeDomRegistration = themeService.registerEditorContainer(domElement);
         if (typeof options.theme === 'string') {