@codingame/monaco-vscode-api 1.80.0-next.0 → 1.80.0-next.1

package/dist/extensions.js

@@ -1,5 +1,5 @@
 import { ExtensionsRegistry, ExtensionMessageCollector } from './vscode/vs/workbench/services/extensions/common/extensionsRegistry.js';
-import { IExtensionService, toExtensionDescription } from './vscode/vs/workbench/services/extensions/common/extensions.js';
+import { toExtensionDescription, IExtensionService } from './vscode/vs/workbench/services/extensions/common/extensions.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
 import { getExtensionId } from './vscode/vs/platform/extensionManagement/common/extensionManagementUtil.js';
@@ -45,6 +45,7 @@ function handleExtensionPoint(extensionPoint, availableExtensions, messageHandle
     extensionPoint.acceptUsers(users);
 }
 async function deltaExtensions(toAdd, toRemove) {
+    console.log('deltaExtensions', toAdd, toRemove)
     const affectedExtensions = [].concat(toAdd).concat(toRemove);
     const affectedExtensionPoints = Object.create(null);
     for (const extensionDescription of affectedExtensions) {
@@ -71,6 +72,31 @@ async function deltaExtensions(toAdd, toRemove) {
         }
     }
 }
+let deltaExtensionPromise = Promise.resolve();
+function deltaExtensionsSequential(toAdd, toRemove) {
+    console.log('deltaExtensionsSequential', toAdd, toRemove)
+    async function call() {
+        await deltaExtensions(toAdd, toRemove);
+    }
+    deltaExtensionPromise = deltaExtensionPromise.then(call, call);
+}
+let toAdd = [];
+let toRemove = [];
+let deltaExtensionTimeout;
+function deltaExtensionsDebounced(_toAdd, _toRemove) {
+    console.log('deltaExtensionsDebounced', _toAdd, _toRemove)
+    toAdd.push(..._toAdd);
+    toRemove.push(..._toRemove);
+    if (deltaExtensionTimeout != null) {
+        window.clearTimeout(deltaExtensionTimeout);
+    }
+    deltaExtensionTimeout = window.setTimeout(() => {
+        deltaExtensionTimeout = undefined;
+        deltaExtensionsSequential(toAdd, toRemove);
+        toAdd = [];
+        toRemove = [];
+    }, 0);
+}
 const extensionFileBlobUrls = new Map();
 function registerExtensionFileBlob(extensionLocation, filePath, content, mimeType) {
     const blob = new Blob([content instanceof Uint8Array ? content : new TextEncoder().encode(content)], {
@@ -103,7 +129,7 @@ function registerExtension(manifest, defaultNLS) {
         validations: []
     };
     const extensionDescription = toExtensionDescription(extension);
-    void deltaExtensions([extensionDescription], []);
+    void deltaExtensionsDebounced([extensionDescription], []);
     const api = createApi(extensionDescription);
     return {
         api,
@@ -115,7 +141,7 @@ function registerExtension(manifest, defaultNLS) {
             return registerExtensionFile(location, path, async () => content);
         },
         dispose() {
-            void deltaExtensions([], [extensionDescription]);
+            void deltaExtensionsDebounced([], [extensionDescription]);
         }
     };
 }

package/dist/monaco.js

@@ -39,7 +39,6 @@ import { createInjectedClass } from './tools/injection.js';
 import './vscode/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.js';
 import './vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer.js';
 import './vscode/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js';
-import './vscode/vs/workbench/contrib/codeEditor/browser/editorFeatures.js';
 import './vscode/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js';
 import './vscode/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js';
 import './vscode/vs/workbench/contrib/codeEditor/browser/saveParticipants.js';

package/dist/rollup-vsix-plugin.js

@@ -121,12 +121,7 @@ function plugin({ include = '**/*.vsix', exclude, rollupPlugins = [], transformM
             const extensionResources = (await extractResourcesFromExtensionManifest(manifest, async (path) => {
                 return files[getVsixPath(path)];
             })).filter(resource => getVsixPath(resource.path) in files);
-            const vsixFile = Object.keys(files).reduce((acc, usedFile) => {
-                return ({
-                    ...acc,
-                    [usedFile]: files[getVsixPath(usedFile)]
-                });
-            }, {});
+            const vsixFile = Object.fromEntries(Object.entries(files).map(([key, value]) => [getVsixPath(key), value]));
             vsixFiles[id] = vsixFile;
             const syncPaths = extensionResources.filter(resource => resource.sync).map(r => r.path);
             const asyncPaths = Array.from(new Set([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.80.0-next.0",
+  "version": "1.80.0-next.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],

package/dist/vscode/vs/workbench/contrib/codeEditor/browser/editorFeatures.js

@@ -1,44 +0,0 @@
-import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import { getEditorFeatures } from 'monaco-editor/esm/vs/editor/common/editorFeatures.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { Extensions } from '../../../common/contributions.js';
-let EditorFeaturesInstantiator = class EditorFeaturesInstantiator extends Disposable {
-    constructor(codeEditorService, _instantiationService) {
-        super();
-        this._instantiationService = _instantiationService;
-        this._instantiated = false;
-        this._register(codeEditorService.onWillCreateCodeEditor(() => this._instantiate()));
-        this._register(codeEditorService.onWillCreateDiffEditor(() => this._instantiate()));
-        if (codeEditorService.listCodeEditors().length > 0 || codeEditorService.listDiffEditors().length > 0) {
-            this._instantiate();
-        }
-    }
-    _instantiate() {
-        if (this._instantiated) {
-            return;
-        }
-        this._instantiated = true;
-        const editorFeatures = getEditorFeatures();
-        for (const feature of editorFeatures) {
-            try {
-                const instance = this._instantiationService.createInstance(feature);
-                if (typeof instance.dispose === 'function') {
-                    this._register(instance);
-                }
-            }
-            catch (err) {
-                onUnexpectedError(err);
-            }
-        }
-    }
-};
-EditorFeaturesInstantiator = ( __decorate([
-    ( __param(0, ICodeEditorService)),
-    ( __param(1, IInstantiationService))
-], EditorFeaturesInstantiator));
-const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-workbenchRegistry.registerWorkbenchContribution(EditorFeaturesInstantiator, 2 );