@codingame/monaco-vscode-api 1.76.0-next.1 → 1.76.0-next.2

package/dist/extHost.js

@@ -1,7 +1,7 @@
 import { _ as __decorate, a as __param, E as Emitter$1, c as __classPrivateFieldSet, d as __classPrivateFieldGet } from './contextkey.js';
 import { l as checkProposedApiEnabled, u as unsupported, c as IExtensionService, m as ILoggerService, n as isLogLevel, i as isProposedApiEnabled } from './missing-services.js';
 import { b as IEditorService, I as IEditorGroupsService, h as IProductService, B as FileSystemProviderErrorCode, P as markAsFileSystemProviderError, A as ACTIVE_GROUP, p as SIDE_GROUP, Q as preferredSideBySideGroupDirection, S as Services, k as IUriIdentityService, f as IPaneCompositePartService, j as ITextFileService, c as IFileService, l as IWorkbenchEnvironmentService, m as IWorkingCopyFileService, g as IPathService, e as ILanguageStatusService, d as IHostService } from './services2.js';
-import { z as disposed, h as isStringArray, w as withUndefinedAsNull, A as mapArrayOrNot, B as delta$1, C as readonly, D as NotImplementedError, E as encodeBase64 } from './polyfill.js';
+import { z as disposed, h as isStringArray, w as withUndefinedAsNull, B as mapArrayOrNot, C as delta$1, D as readonly, E as NotImplementedError, F as encodeBase64 } from './polyfill.js';
 import { illegalArgument, canceled, transformErrorForSerialization, CancellationError, onUnexpectedError, onUnexpectedExternalError, isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { coalesceInPlace, equals as equals$1, coalesce, isNonEmptyArray, isFalsyOrEmpty, asArray, distinct } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { URI, uriToFsPath } from 'monaco-editor/esm/vs/base/common/uri.js';
@@ -11,10 +11,10 @@ import { compare, equalsIgnoreCase, isFalsyOrWhitespace, nextCharLength, splitLi
 import { Mimes } from 'monaco-editor/esm/vs/base/common/mime.js';
 import { ResourceMap as ResourceMap$1 } from 'monaco-editor/esm/vs/base/common/map.js';
 import { MarkdownString as MarkdownString$2, parseHrefAndDimensions, isMarkdownString } from 'monaco-editor/esm/vs/base/common/htmlContent.js';
-import { marked as marked$1 } from 'monaco-editor/esm/vs/base/common/marked/marked.js';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
 import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
 import { MarkerSeverity, IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
+import { marked } from 'monaco-editor/esm/vs/base/common/marked/marked.js';
 import { revive, parse } from 'monaco-editor/esm/vs/base/common/marshalling.js';
 import { equals, mixin, cloneAndChange, deepFreeze, deepClone } from 'monaco-editor/esm/vs/base/common/objects.js';
 import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
@@ -4186,7 +4186,6 @@ function cursorStyleToString(cursorStyle) {
         case TextEditorCursorStyle.UnderlineThin: return 'underline-thin';
     }
 }
-const marked = marked$1.marked;
 var Selection$1;
 ( ((function(Selection) {
     function to(selection) {

package/dist/modelEditor.js

@@ -1,5 +1,5 @@
 import { _ as __decorate, a as __param, E as Emitter } from './contextkey.js';
-import { w as withUndefinedAsNull } from './polyfill.js';
+import { w as withUndefinedAsNull, A as AsyncReferenceCollection, R as ReferenceCollection } from './polyfill.js';
 import { L as LanguageDetectionLanguageEventSource, a as ILanguageDetectionService, u as unsupported } from './missing-services.js';
 import { MutableDisposable, Disposable, ImmortalReference, dispose, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { ThrottledDelayer } from 'monaco-editor/esm/vs/base/common/async.js';
@@ -12,7 +12,6 @@ import { b as IEditorService, p as SIDE_GROUP, A as ACTIVE_GROUP, c as IFileServ
 import { MultiModelEditStackElement } from 'monaco-editor/esm/vs/editor/common/model/editStack.js';
 import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
 import { IUndoRedoService } from 'monaco-editor/esm/vs/platform/undoRedo/common/undoRedo.js';
-import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
@@ -26,46 +25,6 @@ import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/comm
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
-class ReferenceCollection {
-    constructor() {
-        this.references = ( (new Map()));
-    }
-    acquire(key, ...args) {
-        let reference = this.references.get(key);
-        if (!reference) {
-            reference = { counter: 0, object: this.createReferencedObject(key, ...args) };
-            this.references.set(key, reference);
-        }
-        const { object } = reference;
-        const dispose = once(() => {
-            if (--reference.counter === 0) {
-                this.destroyReferencedObject(key, reference.object);
-                this.references.delete(key);
-            }
-        });
-        reference.counter++;
-        return { object, dispose };
-    }
-}
-class AsyncReferenceCollection {
-    constructor(referenceCollection) {
-        this.referenceCollection = referenceCollection;
-    }
-    async acquire(key, ...args) {
-        const ref = this.referenceCollection.acquire(key, ...args);
-        try {
-            const object = await ref.object;
-            return {
-                object,
-                dispose: () => ref.dispose()
-            };
-        }
-        catch (error) {
-            ref.dispose();
-            throw error;
-        }
-    }
-}
 function isResolvedTextEditorModel(model) {
     const candidate = model;
     return !!candidate.textEditorModel;

package/dist/polyfill.js

@@ -1,5 +1,5 @@
 import { VSBuffer as VSBuffer$1 } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { Disposable, DisposableStore, dispose, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable, DisposableMap as DisposableMap$1, DisposableStore, dispose as dispose$1, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { ErrorHandler as ErrorHandler$1, illegalArgument, onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { Themable as Themable$1 } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { ProgressBar as ProgressBar$1 } from 'monaco-editor/esm/vs/base/browser/ui/progressbar/progressbar.js';
@@ -46,6 +46,8 @@ import { MultiplexLogger, ILogService } from 'monaco-editor/esm/vs/platform/log/
 import { SnippetParser } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { Keybinding as Keybinding$1, KeyCodeChord as KeyCodeChord$1 } from 'monaco-editor/esm/vs/base/common/keybindings.js';
+import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
+import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { QuickInputController } from 'monaco-editor/esm/vs/platform/quickinput/browser/quickInput.js';
 import { getSingletonServiceDescriptors } from 'monaco-editor/esm/vs/platform/instantiation/common/extensions.js';
 import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
@@ -128,6 +130,117 @@ class ErrorNoTelemetry extends Error {
         return err.name === 'CodeExpectedError';
     }
 }
+function dispose(arg) {
+    if (Iterable.is(arg)) {
+        const errors = [];
+        for (const d of arg) {
+            if (d) {
+                try {
+                    d.dispose();
+                }
+                catch (e) {
+                    errors.push(e);
+                }
+            }
+        }
+        if (errors.length === 1) {
+            throw errors[0];
+        }
+        else if (errors.length > 1) {
+            throw new AggregateError(errors, 'Encountered errors while disposing of store');
+        }
+        return Array.isArray(arg) ? [] : arg;
+    }
+    else if (arg) {
+        arg.dispose();
+        return arg;
+    }
+}
+class ReferenceCollection {
+    constructor() {
+        this.references = ( (new Map()));
+    }
+    acquire(key, ...args) {
+        let reference = this.references.get(key);
+        if (!reference) {
+            reference = { counter: 0, object: this.createReferencedObject(key, ...args) };
+            this.references.set(key, reference);
+        }
+        const { object } = reference;
+        const dispose = once(() => {
+            if (--reference.counter === 0) {
+                this.destroyReferencedObject(key, reference.object);
+                this.references.delete(key);
+            }
+        });
+        reference.counter++;
+        return { object, dispose };
+    }
+}
+class AsyncReferenceCollection {
+    constructor(referenceCollection) {
+        this.referenceCollection = referenceCollection;
+    }
+    async acquire(key, ...args) {
+        const ref = this.referenceCollection.acquire(key, ...args);
+        try {
+            const object = await ref.object;
+            return {
+                object,
+                dispose: () => ref.dispose()
+            };
+        }
+        catch (error) {
+            ref.dispose();
+            throw error;
+        }
+    }
+}
+class DisposableMap {
+    constructor() {
+        this._store = ( (new Map()));
+        this._isDisposed = false;
+    }
+    dispose() {
+        this._isDisposed = true;
+        this.clearAndDisposeAll();
+    }
+    clearAndDisposeAll() {
+        if (!this._store.size) {
+            return;
+        }
+        try {
+            dispose(( (this._store.values())));
+        }
+        finally {
+            this._store.clear();
+        }
+    }
+    has(key) {
+        return this._store.has(key);
+    }
+    get(key) {
+        return this._store.get(key);
+    }
+    set(key, value, skipDisposeOnOverwrite = false) {
+        if (this._isDisposed) {
+            console.warn(( (new Error(
+                'Trying to add a disposable to a DisposableMap that has already been disposed of. The added object will be leaked!'
+            ))).stack);
+        }
+        if (!skipDisposeOnOverwrite) {
+            this._store.get(key)?.dispose();
+        }
+        this._store.set(key, value);
+    }
+    deleteAndDispose(key) {
+        this._store.get(key)?.dispose();
+        this._store.delete(key);
+    }
+    [Symbol.iterator]() {
+        return this._store[Symbol.iterator]();
+    }
+}
 function isReadableStream(obj) {
     const candidate = obj;
     if (!candidate) {
@@ -4004,7 +4117,7 @@ class Trait {
         return binarySearch(this.sortedIndexes, index, numericSort) >= 0;
     }
     dispose() {
-        dispose(this._onChange);
+        dispose$1(this._onChange);
     }
 }
 class SelectionTrait extends Trait {
@@ -5851,6 +5964,7 @@ polyfillPrototypeSimple(ProgressBar$1.prototype, ProgressBar.prototype);
 polyfillPrototypeSimple(DefaultConfiguration$1.prototype, DefaultConfiguration.prototype);
 polyfillPrototypeSimple(Keybinding$1.prototype, Keybinding.prototype);
 polyfillPrototypeSimple(KeyCodeChord$1.prototype, KeyCodeChord.prototype);
+polyfillPrototypeSimple(DisposableMap$1.prototype, DisposableMap.prototype);
 Object.defineProperty(DefaultConfiguration$1.prototype, '_onDidChangeConfiguration', {
     get() {
         if (this.__onDidChangeConfiguration == null) {
@@ -5925,4 +6039,4 @@ function toVSCodeColor(value) {
     return value;
 }
 polyfillPrototype(Color$1.prototype, Color.prototype, toMonacoColor, toVSCodeColor);
-export { mapArrayOrNot as A, delta as B, readonly as C, NotImplementedError as D, encodeBase64 as E, IPolicyService as I, NullPolicyService as N, PolicyConfiguration as P, UserSettings as U, assertAllDefined as a, NullPolicyConfiguration as b, parseTree as c, findNodeAtLocation as d, createScanner as e, flatten as f, getNodeType as g, isStringArray as h, index as i, isReadableStream as j, peekStream as k, peekReadable as l, bufferToReadable as m, n, consumeStream as o, parse as p, isReadableBufferedStream as q, listenStream as r, streamToBuffer as s, transform as t, bufferedStreamToBuffer as u, readableToBuffer as v, withUndefinedAsNull as w, newWriteableBufferStream as x, newWriteableStream as y, disposed as z };
+export { AsyncReferenceCollection as A, mapArrayOrNot as B, delta as C, readonly as D, NotImplementedError as E, encodeBase64 as F, IPolicyService as I, NullPolicyService as N, PolicyConfiguration as P, ReferenceCollection as R, UserSettings as U, assertAllDefined as a, NullPolicyConfiguration as b, parseTree as c, findNodeAtLocation as d, createScanner as e, flatten as f, getNodeType as g, isStringArray as h, index as i, isReadableStream as j, peekStream as k, peekReadable as l, bufferToReadable as m, n, consumeStream as o, parse as p, isReadableBufferedStream as q, listenStream as r, streamToBuffer as s, transform as t, bufferedStreamToBuffer as u, readableToBuffer as v, withUndefinedAsNull as w, newWriteableBufferStream as x, newWriteableStream as y, disposed as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.76.0-next.1",
+  "version": "1.76.0-next.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
@@ -158,8 +158,8 @@
     "@types/babel__core": "^7.20.0",
     "@types/semver": "^7.3.13",
     "@types/vscode": "~1.76.0",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.54.1",
     "eslint": "^8.35.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
@@ -168,13 +168,13 @@
     "eslint-plugin-unused-imports": "^2.0.0",
     "js-cleanup": "^1.2.0",
     "recast": "^0.22.0",
-    "rollup": "^3.18.0",
+    "rollup": "^3.19.1",
     "rollup-plugin-dts": "^5.2.0",
     "rollup-plugin-styles": "^4.0.0",
     "semver": "^7.3.8",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",
-    "webpack": "^5.75.0",
+    "webpack": "^5.76.0",
     "zx": "^7.2.0"
   },
   "dependencies": {},