@codingame/monaco-vscode-api 16.0.1 → 16.0.2

package/missing-services.js

@@ -1304,8 +1304,8 @@ registerSingleton(IPathService, PathService, InstantiationType.Delayed);
 class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.99.1";
-        this.commit = "7c6fdfb0b8f2f675eb0b47f3d95eeca78962565b";
+        this.version = "1.99.2";
+        this.commit = "4949701c880d4bdb949e3c0e6b400288da7f474b";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
@@ -15,13 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-base-service-override": "16.0.1",
-    "@codingame/monaco-vscode-environment-service-override": "16.0.1",
-    "@codingame/monaco-vscode-extensions-service-override": "16.0.1",
-    "@codingame/monaco-vscode-files-service-override": "16.0.1",
-    "@codingame/monaco-vscode-host-service-override": "16.0.1",
-    "@codingame/monaco-vscode-layout-service-override": "16.0.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "16.0.1",
+    "@codingame/monaco-vscode-base-service-override": "16.0.2",
+    "@codingame/monaco-vscode-environment-service-override": "16.0.2",
+    "@codingame/monaco-vscode-extensions-service-override": "16.0.2",
+    "@codingame/monaco-vscode-files-service-override": "16.0.2",
+    "@codingame/monaco-vscode-host-service-override": "16.0.2",
+    "@codingame/monaco-vscode-layout-service-override": "16.0.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "16.0.2",
     "marked": "14.0.0"
   },
   "main": "services.js",

package/services.js

@@ -181,18 +181,18 @@ export { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/k
 export { ISecretStorageService } from './vscode/src/vs/platform/secrets/common/secrets.service.js';
 export { ConfigurationTarget } from './vscode/src/vs/platform/configuration/common/configuration.js';
 
-if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.99.1-821df8cb-39e3-4964-8106-f21b11021135") {
-    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.99.1-821df8cb-39e3-4964-8106-f21b11021135"}, ${window.monacoVscodeApiBuildId} is already loaded`);
+if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.99.2-b6f55cb7-31f9-4b50-9e8e-df1c373dc578") {
+    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.99.2-b6f55cb7-31f9-4b50-9e8e-df1c373dc578"}, ${window.monacoVscodeApiBuildId} is already loaded`);
 }
-window.monacoVscodeApiBuildId = "1.99.1-821df8cb-39e3-4964-8106-f21b11021135";
+window.monacoVscodeApiBuildId = "1.99.2-b6f55cb7-31f9-4b50-9e8e-df1c373dc578";
 async function initialize(overrides, container = document.body, configuration = {}, env) {
     checkServicesNotInitialized();
     initialize$1(container, configuration, env);
     const instantiationService = StandaloneServices.initialize({
         [IProductService.toString()]: mixin({
-            version: "1.99.1",
+            version: "1.99.2",
             quality: 'stable',
-            commit: "7c6fdfb0b8f2f675eb0b47f3d95eeca78962565b",
+            commit: "4949701c880d4bdb949e3c0e6b400288da7f474b",
             nameShort: 'Code - OSS',
             nameLong: 'Code - OSS',
             applicationName: 'code-oss',

package/vscode/src/vs/editor/editor.worker.start.d.ts

@@ -0,0 +1,2 @@
+import { IWorkerContext } from "./common/services/editorWebWorker.js";
+export declare function start<THost extends object, TClient extends object>(client: TClient): IWorkerContext<THost>;

package/vscode/src/vs/editor/editor.worker.start.js

@@ -0,0 +1,27 @@
+
+import { initialize } from '../base/common/worker/webWorkerBootstrap.js';
+import { EditorWorker } from './common/services/editorWebWorker.js';
+import { EditorWorkerHost } from './common/services/editorWorkerHost.js';
+
+function start(client) {
+    const webWorkerServer = initialize(() => ( new EditorWorker(client)));
+    const editorWorkerHost = EditorWorkerHost.getChannel(webWorkerServer);
+    const host = ( new Proxy({}, {
+        get(target, prop, receiver) {
+            if (typeof prop !== 'string') {
+                throw ( new Error(`Not supported`));
+            }
+            return (...args) => {
+                return editorWorkerHost.$fhr(prop, args);
+            };
+        }
+    }));
+    return {
+        host: host,
+        getMirrorModels: () => {
+            return webWorkerServer.requestHandler.getModels();
+        }
+    };
+}
+
+export { start };

package/vscode/src/vs/platform/actionWidget/browser/actionList.d.ts

@@ -4,6 +4,7 @@ import { Disposable } from "../../../base/common/lifecycle.js";
 import { ThemeIcon } from "../../../base/common/themables.js";
 import { IContextViewService } from "../../contextview/browser/contextView.service.js";
 import { IKeybindingService } from "../../keybinding/common/keybinding.service.js";
+import { ILayoutService } from "../../layout/browser/layoutService.service.js";
 export declare const acceptSelectedActionCommand = "acceptSelectedCodeAction";
 export declare const previewSelectedActionCommand = "previewSelectedCodeAction";
 export interface IActionListDelegate<T> {
@@ -36,13 +37,14 @@ export declare class ActionList<T> extends Disposable {
     private readonly _delegate;
     private readonly _contextViewService;
     private readonly _keybindingService;
+    private readonly _layoutService;
     readonly domNode: HTMLElement;
     private readonly _list;
     private readonly _actionLineHeight;
     private readonly _headerLineHeight;
     private readonly _allMenuItems;
     private readonly cts;
-    constructor(user: string, preview: boolean, items: readonly IActionListItem<T>[], _delegate: IActionListDelegate<T>, _contextViewService: IContextViewService, _keybindingService: IKeybindingService);
+    constructor(user: string, preview: boolean, items: readonly IActionListItem<T>[], _delegate: IActionListDelegate<T>, _contextViewService: IContextViewService, _keybindingService: IKeybindingService, _layoutService: ILayoutService);
     private focusCondition;
     hide(didCancel?: boolean): void;
     layout(minWidth: number): number;

package/vscode/src/vs/platform/actionWidget/browser/actionList.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { setVisibility } from '../../../base/browser/dom.js';
+import { setVisibility, getWindow } from '../../../base/browser/dom.js';
 import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { List } from '../../../base/browser/ui/list/listWidget.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
@@ -24,6 +24,7 @@ import '../../theme/common/colors/minimapColors.js';
 import '../../theme/common/colors/miscColors.js';
 import '../../theme/common/colors/quickpickColors.js';
 import '../../theme/common/colors/searchColors.js';
+import { ILayoutService } from '../../layout/browser/layoutService.service.js';
 
 const acceptSelectedActionCommand = 'acceptSelectedCodeAction';
 const previewSelectedActionCommand = 'previewSelectedCodeAction';
@@ -119,11 +120,12 @@ function getKeyboardNavigationLabel(item) {
     return undefined;
 }
 let ActionList = class ActionList extends Disposable {
-    constructor(user, preview, items, _delegate, _contextViewService, _keybindingService) {
+    constructor(user, preview, items, _delegate, _contextViewService, _keybindingService, _layoutService) {
         super();
         this._delegate = _delegate;
         this._contextViewService = _contextViewService;
         this._keybindingService = _keybindingService;
+        this._layoutService = _layoutService;
         this._actionLineHeight = 24;
         this._headerLineHeight = 26;
         this.cts = this._register(( new CancellationTokenSource()));
@@ -198,7 +200,7 @@ let ActionList = class ActionList extends Disposable {
             maxWidth = Math.max(...itemWidths, minWidth);
         }
         const maxVhPrecentage = 0.7;
-        const height = Math.min(heightWithHeaders, this.domNode.ownerDocument.body.clientHeight * maxVhPrecentage);
+        const height = Math.min(heightWithHeaders, this._layoutService.getContainer(getWindow(this.domNode)).clientHeight * maxVhPrecentage);
         this._list.layout(height, maxWidth);
         this.domNode.style.height = `${height}px`;
         this._list.domFocus();
@@ -265,7 +267,8 @@ let ActionList = class ActionList extends Disposable {
 };
 ActionList = ( __decorate([
     ( __param(4, IContextViewService)),
-    ( __param(5, IKeybindingService))
+    ( __param(5, IKeybindingService)),
+    ( __param(6, ILayoutService))
 ], ActionList));
 function stripNewlines(str) {
     return str.replace(/\r\n|\r|\n/g, ' ');

package/vscode/src/vs/workbench/api/common/extHostConfiguration.js

@@ -106,9 +106,7 @@ class ExtHostConfigProvider {
     }
     getConfiguration(section, scope, extensionDescription) {
         const overrides = scopeToOverrides(scope) || {};
-        const config = this._toReadonlyValue(section
-            ? lookUp(this._configuration.getValue(undefined, overrides, this._extHostWorkspace.workspace), section)
-            : this._configuration.getValue(undefined, overrides, this._extHostWorkspace.workspace));
+        const config = this._toReadonlyValue(this._configuration.getValue(section, overrides, this._extHostWorkspace.workspace));
         if (section) {
             this._validateConfigurationAccess(section, overrides, extensionDescription?.identifier);
         }

package/vscode/src/vs/workbench/services/notebook/common/notebookDocumentService.js

@@ -55,15 +55,17 @@ function extractCellOutputDetails(uri) {
     const outputId = params.get('outputId') ?? undefined;
     const parsedCell = parse(uri.with({ scheme: Schemas.vscodeNotebookCell, query: null }));
     const outputIndex = params.get('outputIndex') ? parseInt(params.get('outputIndex') || '', 10) : undefined;
-    if (parsedCell?.notebook === undefined || parsedCell?.handle === undefined) {
-        throw ( new Error('Invalid cell URI'));
-    }
+    const notebookUri = parsedCell ? parsedCell.notebook : uri.with({
+        scheme: params.get('notebookScheme') || Schemas.file,
+        fragment: null,
+        query: null,
+    });
     return {
-        notebook: parsedCell.notebook,
+        notebook: notebookUri,
         openIn: openIn,
         outputId: outputId,
         outputIndex: outputIndex,
-        cellHandle: parsedCell.handle,
+        cellHandle: parsedCell?.handle,
         cellFragment: uri.fragment,
     };
 }

package/workers/editor.worker.d.ts

@@ -1 +1,7 @@
-export * from "../vscode/src/vs/editor/common/services/editorWebWorkerMain.js";
+import type { IWorkerContext } from "../vscode/src/vs/editor/common/services/editorWebWorker.js";
+/**
+ * Make the `initialize` method backward compatible, until the monaco standalone workers are updated
+ */
+type CreateFunction<D, R extends object = object> = (ctx: IWorkerContext<object>, data: D) => R;
+export declare function initialize<D, R extends object>(createFn: CreateFunction<D, R>): void;
+export {};

package/workers/editor.worker.js

@@ -1,2 +1,22 @@
 
 import '../vscode/src/vs/editor/common/services/editorWebWorkerMain.js';
+import { start } from '../vscode/src/vs/editor/editor.worker.start.js';
+
+function initialize(createFn) {
+    let requestHandler;
+    const foreignModule = new Proxy({}, {
+        get(_target, propKey) {
+            if (propKey === '$initialize') {
+                return async (data) => {
+                    if (!requestHandler) {
+                        requestHandler = createFn(context, data);
+                    }
+                };
+            }
+            return requestHandler?.[propKey];
+        }
+    });
+    const context = start(foreignModule);
+}
+
+export { initialize };