@codingame/monaco-vscode-editor-api 23.3.0 → 24.1.0

package/esm/vs/editor/editor.api.d.ts

@@ -1,36 +1,7 @@
 import { createModelReference, writeFile } from "@codingame/monaco-vscode-api/monaco";
-import type { IInternalWebWorkerOptions, MonacoWebWorker } from "../../../vscode/src/vs/editor/standalone/browser/standaloneWebWorker.js";
 export * from "../../../vscode/src/vs/editor/editor.api.js";
 declare module "../../../vscode/src/vs/editor/editor.api.js" {
     namespace editor {
         export { createModelReference, writeFile };
     }
 }
-/**
- * Make the `createWebWorker` method backward compatible, until the monaco standalone workers are updated
- */
-export interface IWebWorkerOptions {
-    /**
-     * The AMD moduleId to load.
-     * It should export a function `create` that should return the exported proxy.
-     */
-    moduleId: string;
-    /**
-     * The data to send over when calling create on the module.
-     */
-    createData?: unknown;
-    /**
-     * A label to be used to identify the web worker for debugging purposes.
-     */
-    label?: string;
-    /**
-     * An object that can be used by the web worker to make calls back to the main thread.
-     */
-    host?: Record<string, Function>;
-    /**
-     * Keep idle models.
-     * Defaults to false, which means that idle models will stop syncing after a while.
-     */
-    keepIdleModels?: boolean;
-}
-export declare function createWebWorker<T extends object>(options: IWebWorkerOptions | IInternalWebWorkerOptions): MonacoWebWorker<T>;

package/esm/vs/editor/editor.api.js

@@ -3,8 +3,6 @@ import { languages, editor } from '../../../vscode/src/vs/editor/editor.api.js';
 export { CancellationTokenSource, Emitter, KeyCode, KeyMod, MarkerSeverity, MarkerTag, Position, Range, Selection, SelectionDirection, Token, Uri } from '../../../vscode/src/vs/editor/editor.api.js';
 import { createConfiguredEditor, createConfiguredDiffEditor, createModelReference, writeFile } from '@codingame/monaco-vscode-api/monaco';
 import { withReadyServices } from '@codingame/monaco-vscode-api/services';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { createWebWorker as createWebWorker$1 } from '../../../vscode/src/vs/editor/standalone/browser/standaloneEditor.js';
 
 const originalOnLanguage = languages.onLanguage;
 languages.onLanguage = (languageId, callback) => withReadyServices(() => originalOnLanguage(languageId, callback));
@@ -14,46 +12,5 @@ editor.create = createConfiguredEditor;
 editor.createDiffEditor = createConfiguredDiffEditor;
 editor.createModelReference = createModelReference;
 editor.writeFile = writeFile;
-let id = 0;
-function getWorker(descriptor) {
-    const label = descriptor.label || 'anonymous' + ++id;
-    const monacoEnvironment = globalThis.MonacoEnvironment;
-    if (monacoEnvironment) {
-        if (typeof monacoEnvironment.getWorker === 'function') {
-            return monacoEnvironment.getWorker('workerMain.js', label);
-        }
-        if (typeof monacoEnvironment.getWorkerUrl === 'function') {
-            const workerUrl = monacoEnvironment.getWorkerUrl('workerMain.js', label);
-            return new Worker(workerUrl, { name: label, type: 'module' });
-        }
-    }
-    throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl or MonacoEnvironment.getWorker`);
-}
-function isIWebWorkerOptions(options) {
-    return 'moduleId' in options;
-}
-const originalCreateWebWorker = editor.createWebWorker;
-function createWebWorker(options) {
-    if (isIWebWorkerOptions(options)) {
-        const worker = getWorker({
-            esmModuleLocation: URI.parse(options.moduleId),
-            label: options.label
-        });
-        const webworker = createWebWorker$1({
-            worker,
-            host: options.host,
-            keepIdleModels: options.keepIdleModels
-        });
-        void (async () => {
-            const proxy = await webworker.getProxy();
-            proxy.$initialize(options.createData);
-        })();
-        return webworker;
-    }
-    else {
-        return originalCreateWebWorker(options);
-    }
-}
-editor.createWebWorker = createWebWorker;
 
-export { createWebWorker, editor, languages };
+export { editor, languages };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-editor-api",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - monaco-editor compatible api",
   "keywords": [],
@@ -15,8 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "23.3.0",
-    "@codingame/monaco-vscode-api": "23.3.0"
+    "@codingame/monaco-vscode-api": "24.1.0"
   },
   "exports": {
     ".": "./esm/vs/editor/editor.api.js",

package/vscode/src/vs/editor/editor.api.d.ts

@@ -21,12 +21,16 @@ export interface Environment {
      * A web worker factory.
      * NOTE: If `getWorker` is defined, `getWorkerUrl` is not invoked.
      */
-    getWorker?(workerId: string, label: string): Promise<Worker> | Worker;
+    getWorker?(workerId: string, label: string): Promise<Worker> | Worker | undefined;
     /**
      * Return the location for web worker scripts.
      * NOTE: If `getWorker` is defined, `getWorkerUrl` is not invoked.
      */
-    getWorkerUrl?(workerId: string, label: string): string;
+    getWorkerUrl?(workerId: string, label: string): string | undefined;
+    /**
+     * Return the options for web worker scripts.
+     */
+    getWorkerOptions?(moduleId: string, label: string): WorkerOptions | undefined;
     /**
      * Create a trusted types policy (same API as window.trustedTypes.createPolicy)
      */
@@ -87,7 +91,7 @@ export interface CancellationToken {
      *
      * @event
      */
-    readonly onCancellationRequested: (listener: (e: any) => any, thisArgs?: any, disposables?: IDisposable[]) => IDisposable;
+    readonly onCancellationRequested: (listener: (e: void) => unknown, thisArgs?: unknown, disposables?: IDisposable[]) => IDisposable;
 }
 /**
  * Uniform Resource Identifier (Uri) http://tools.ietf.org/html/rfc3986.
@@ -4102,9 +4106,9 @@ export namespace editor {
     export interface IEditorHoverOptions {
         /**
          * Enable the hover.
-         * Defaults to true.
+         * Defaults to 'on'.
          */
-        enabled?: boolean;
+        enabled?: "on" | "off" | "onKeyboardModifier";
         /**
          * Delay for showing the hover.
          * Defaults to 300.
@@ -5375,6 +5379,11 @@ export namespace editor {
          * Render this content widget in a location where it could overflow the editor's view dom node.
          */
         allowEditorOverflow?: boolean;
+        /**
+         * If true, this widget doesn't have a visual representation.
+         * The element will have display set to 'none'.
+        */
+        useDisplayNone?: boolean;
         /**
          * Call preventDefault() on mousedown events that target the content widget.
          */
@@ -5460,7 +5469,7 @@ export namespace editor {
          * When set, stacks with other overlay widgets with the same preference,
          * in an order determined by the ordinal value.
          */
-        stackOridinal?: number;
+        stackOrdinal?: number;
     }
     /**
      * An overlay widgets renders on top of the text.
@@ -5886,6 +5895,7 @@ export namespace editor {
          * Fires after the editor completes the operation it fired `onBeginUpdate` for.
         */
         readonly onEndUpdate: IEvent<void>;
+        readonly onDidChangeViewZones: IEvent<void>;
         /**
          * Saves current view state of the editor in a serializable object.
          */
@@ -6019,6 +6029,10 @@ export namespace editor {
          * @param command The commands to execute
          */
         executeCommands(source: string | null | undefined, commands: (ICommand | null)[]): void;
+        /**
+         * Scroll vertically or horizontally as necessary and reveal the current cursors.
+         */
+        revealAllCursors(revealHorizontal: boolean, minimalReveal?: boolean): void;
         /**
          * Get all the decorations on a line (filtering out decorations from other editors).
          */
@@ -6128,6 +6142,7 @@ export namespace editor {
          * Use this method with caution.
          */
         getOffsetForColumn(lineNumber: number, column: number): number;
+        getWidthOfLine(lineNumber: number): number;
         /**
          * Force an editor render now.
          */
@@ -7159,6 +7174,14 @@ export namespace languages {
         readonly requestIssuedDateTime: number;
         readonly earliestShownDateTime: number;
     }
+    export interface IInlineCompletionModelInfo {
+        models: IInlineCompletionModel[];
+        currentModelId: string;
+    }
+    export interface IInlineCompletionModel {
+        name: string;
+        id: string;
+    }
     export class SelectedSuggestionInfo {
         readonly range: IRange;
         readonly text: string;
@@ -7216,11 +7239,14 @@ export namespace languages {
         /** Only show the inline suggestion when the cursor is in the showRange. */
         readonly showRange?: IRange;
         readonly warning?: InlineCompletionWarning;
-        readonly hint?: InlineCompletionHint;
+        readonly hint?: IInlineCompletionHint;
+        readonly supportsRename?: boolean;
         /**
          * Used for telemetry.
          */
         readonly correlationId?: string | undefined;
+        readonly jumpToPosition?: IPosition;
+        readonly doNotLog?: boolean;
     }
     export interface InlineCompletionWarning {
         message: IMarkdownString | string;
@@ -7230,12 +7256,11 @@ export namespace languages {
         Code = 1,
         Label = 2
     }
-    export interface InlineCompletionHint {
+    export interface IInlineCompletionHint {
         /** Refers to the current document. */
         range: IRange;
         style: InlineCompletionHintStyle;
         content: string;
-        jumpToEdit: boolean;
     }
     export type IconPath = editor.ThemeIcon;
     export interface InlineCompletions<TItem extends InlineCompletion = InlineCompletion> {
@@ -7294,6 +7319,9 @@ export namespace languages {
         excludesGroupIds?: InlineCompletionProviderGroupId[];
         displayName?: string;
         debounceDelayMs?: number;
+        modelInfo?: IInlineCompletionModelInfo;
+        onDidModelInfoChange?: IEvent<void>;
+        setModelId?(modelId: string): Promise<void>;
         toString?(): string;
     }
     export type InlineCompletionsDisposeReason = {
@@ -7324,6 +7352,7 @@ export namespace languages {
         shownDuration: number;
         shownDurationUncollapsed: number;
         timeUntilShown: number | undefined;
+        timeUntilActuallyShown: number | undefined;
         timeUntilProviderRequest: number;
         timeUntilProviderResponse: number;
         notShownReason: string | undefined;
@@ -7332,6 +7361,7 @@ export namespace languages {
         preceeded: boolean;
         languageId: string;
         requestReason: string;
+        performanceMarkers?: string;
         cursorColumnDistance?: number;
         cursorLineDistance?: number;
         lineCountOriginal?: number;
@@ -7344,6 +7374,16 @@ export namespace languages {
         typingIntervalCharacterCount: number;
         selectedSuggestionInfo: boolean;
         availableProviders: string;
+        skuPlan: string | undefined;
+        skuType: string | undefined;
+        renameCreated: boolean;
+        renameDuration: number | undefined;
+        renameTimedOut: boolean;
+        renameDroppedOtherEdits: number | undefined;
+        renameDroppedRenameEdits: number | undefined;
+        editKind: string | undefined;
+        longDistanceHintVisible?: boolean;
+        longDistanceHintDistance?: number;
     };
     export interface CodeAction {
         title: string;

package/vscode/src/vs/editor/standalone/browser/standaloneEditor.d.ts

@@ -13,7 +13,7 @@ import { IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IStandaloneThemeData } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/common/standaloneTheme";
 import { ICommandHandler } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands";
 import { IMarker, IMarkerData } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers";
-import { MultiDiffEditorWidget } from "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget";
+import { MultiDiffEditorWidget } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget";
 /**
  * Create a new editor under `domElement`.
  * `domElement` should be empty (not contain other dom nodes).

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

@@ -30,7 +30,8 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { MultiDiffEditorWidget } from '@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
+import { MultiDiffEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
+import { IWebWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerService.service';
 
 registerCss(standaloneTokens);
 function create(domElement, options, override) {
@@ -185,7 +186,7 @@ function onDidChangeModelLanguage(listener) {
     });
 }
 function createWebWorker(opts) {
-    return createWebWorker$1(StandaloneServices.get(IModelService), opts);
+    return createWebWorker$1(StandaloneServices.get(IModelService), StandaloneServices.get(IWebWorkerService), opts);
 }
 function colorizeElement(domNode, options) {
     const languageService = StandaloneServices.get(ILanguageService);

package/vscode/src/vs/editor/standalone/browser/standaloneWebWorker.d.ts

@@ -1,10 +1,11 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IWebWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerService.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 /**
  * Create a new web worker that has model syncing capabilities built in.
  * Specify an AMD module to load that will `create` an object that will be proxied.
  */
-export declare function createWebWorker<T extends object>(modelService: IModelService, opts: IInternalWebWorkerOptions): MonacoWebWorker<T>;
+export declare function createWebWorker<T extends object>(modelService: IModelService, webWorkerService: IWebWorkerService, opts: IInternalWebWorkerOptions): MonacoWebWorker<T>;
 /**
  * A web worker that can provide a proxy to an arbitrary file.
  */

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

@@ -1,12 +1,12 @@
 
 import { EditorWorkerClient } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/editorWorkerService';
 
-function createWebWorker(modelService, opts) {
-    return ( new MonacoWebWorkerImpl(modelService, opts));
+function createWebWorker(modelService, webWorkerService, opts) {
+    return ( new MonacoWebWorkerImpl(modelService, webWorkerService, opts));
 }
 class MonacoWebWorkerImpl extends EditorWorkerClient {
-    constructor(modelService, opts) {
-        super(opts.worker, opts.keepIdleModels || false, modelService);
+    constructor(modelService, webWorkerService, opts) {
+        super(opts.worker, opts.keepIdleModels || false, modelService, webWorkerService);
         this._foreignModuleHost = opts.host || null;
         this._foreignProxy = this._getProxy().then(proxy => {
             return ( new Proxy({}, {