@theia/monaco 1.71.0-next.49 → 1.71.0-next.57

package/lib/browser/monaco-init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-init.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-init.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAiCzD,eAAO,MAAM,yBAAyB,oEAAoC,CAAC;AAwH3E,yBAAiB,UAAU,CAAC;IACxB,SAAgB,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CA8D/C;CACJ"}
+{"version":3,"file":"monaco-init.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-init.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAmCzD,eAAO,MAAM,yBAAyB,oEAAoC,CAAC;AAwH3E,yBAAiB,UAAU,CAAC;IACxB,SAAgB,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CA+C/C;CACJ"}

package/lib/browser/monaco-init.js

@@ -37,6 +37,8 @@ const codeEditorService_1 = require("@theia/monaco-editor-core/esm/vs/editor/bro
 const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
 const descriptors_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/descriptors");
 const instantiation_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation");
+const instantiationService_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService");
+const serviceCollection_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection");
 const monaco_editor_service_1 = require("./monaco-editor-service");
 const configuration_1 = require("@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration");
 const resolverService_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService");
@@ -63,6 +65,7 @@ const layoutService_1 = require("@theia/monaco-editor-core/esm/vs/platform/layou
 const event_1 = require("@theia/monaco-editor-core/esm/vs/base/common/event");
 const dom = require("@theia/monaco-editor-core/esm/vs/base/browser/dom");
 const window_1 = require("@theia/monaco-editor-core/esm/vs/base/browser/window");
+const core_1 = require("@theia/core");
 exports.contentHoverWidgetPatcher = (0, content_hover_widget_patcher_1.createContentHoverWidgetPatcher)();
 let MonacoEditorServiceConstructor = class MonacoEditorServiceConstructor {
     /**
@@ -183,45 +186,32 @@ var MonacoInit;
             [workspace_1.IWorkspaceContextService.toString()]: new descriptors_1.SyncDescriptor(MonacoWorkspaceContextServiceConstructor, [container]),
             [layoutService_1.ILayoutService.toString()]: new descriptors_1.SyncDescriptor(MonacoLayoutServiceConstructor, [])
         };
+        // Detect whether StandaloneServices was already initialized before we get a chance to
+        // apply our overrides.  `withServices` calls the callback synchronously when `initialized`
+        // is already `true`, so the flag will be set before we proceed.  If it remains `false`,
+        // our `initialize(overrides)` call below will be the first and our descriptors will be
+        // applied normally.
+        // @monaco-uplift: verify that `withServices` still calls the callback synchronously when
+        // already initialized — if this changes, the premature-initialization detection will break.
+        let isInitialized = false;
+        standaloneServices_1.StandaloneServices.withServices(() => {
+            isInitialized = true;
+            return core_1.Disposable.NULL;
+        });
+        const servicesInitializedBeforeOverrides = isInitialized;
         // Try the standard initialization path first.
         standaloneServices_1.StandaloneServices.initialize(overrides);
         // If StandaloneServices was already initialized (e.g., by a premature StandaloneServices.get() call
         // triggered as a side-effect during module loading), the call above is a no-op and our overrides are
         // silently dropped.  Detect this situation, warn about it, and inject our service descriptors directly
         // into the internal service collection so that they are used when the services are next resolved.
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const instantiationService = standaloneServices_1.StandaloneServices.get(instantiation_1.IInstantiationService);
-        const serviceCollection = instantiationService?._services;
-        if (serviceCollection) {
-            const patchedServices = [];
-            const alreadyInstantiatedServices = [];
-            for (const serviceId of Object.keys(overrides)) {
-                const serviceIdentifier = (0, instantiation_1.createDecorator)(serviceId);
-                const existing = serviceCollection.get(serviceIdentifier);
-                if (existing instanceof descriptors_1.SyncDescriptor && existing !== overrides[serviceId]) {
-                    // The override was not applied by initialize() – patch it in manually.
-                    serviceCollection.set(serviceIdentifier, overrides[serviceId]);
-                    patchedServices.push(serviceId);
-                }
-                else if (existing !== undefined && !(existing instanceof descriptors_1.SyncDescriptor) && existing !== overrides[serviceId]) {
-                    // The service was already instantiated – we cannot override it anymore.
-                    alreadyInstantiatedServices.push(serviceId);
-                }
-            }
-            if (patchedServices.length > 0) {
-                console.warn('StandaloneServices was already initialized before MonacoInit.init() was called. '
-                    + 'This typically happens when a StandaloneServices.get() call is triggered as a side-effect during module loading. '
-                    + 'The following Theia service overrides had to be patched in after the fact: '
-                    + patchedServices.join(', ')
-                    + '. Investigate the module loading order to prevent premature initialization.');
-            }
-            if (alreadyInstantiatedServices.length > 0) {
-                console.error('StandaloneServices was already initialized and the following services were already instantiated '
-                    + 'before MonacoInit.init() could apply Theia overrides: '
-                    + alreadyInstantiatedServices.join(', ')
-                    + '. These services are using the default Monaco implementations instead of Theia\'s. '
-                    + 'This may cause unexpected behavior. Investigate which code triggers premature service resolution.');
-            }
+        //
+        // We only need this fallback when initialize() was a no-op.  On the normal startup path,
+        // initialize() succeeds and any services that get instantiated during that call (e.g. as
+        // dependencies of editor features) are created from *our* Theia descriptors — not the
+        // Monaco defaults — so they are perfectly fine and must not be flagged.
+        if (servicesInitializedBeforeOverrides) {
+            patchServices(overrides);
         }
         // Make sure the global base hover delegate is initialized as otherwise the quick input will throw an error and not update correctly
         // in case no Monaco editor was constructed before and items with keybindings are shown. See #15042.
@@ -229,4 +219,54 @@ var MonacoInit;
     }
     MonacoInit.init = init;
 })(MonacoInit || (exports.MonacoInit = MonacoInit = {}));
+// @monaco-uplift: verify that the concrete InstantiationService class still exposes a
+// private `_services: ServiceCollection` property.  See monaco-init.spec.ts for a CI
+// guard that will flag a mismatch after a Monaco version bump.
+function patchServices(overrides) {
+    const instantiationService = standaloneServices_1.StandaloneServices.get(instantiation_1.IInstantiationService);
+    if (!(instantiationService instanceof instantiationService_1.InstantiationService)) {
+        console.error('StandaloneServices returned an IInstantiationService that is not an instance of InstantiationService. '
+            + 'Theia service overrides cannot be patched in after premature initialization. '
+            + 'Investigate whether Monaco\'s internal InstantiationService class has been refactored.');
+        return;
+    }
+    const serviceCollection = instantiationService['_services'];
+    if (!(serviceCollection instanceof serviceCollection_1.ServiceCollection)) {
+        console.error('InstantiationService._services is not a ServiceCollection (got '
+            + (serviceCollection === undefined ? 'undefined' : typeof serviceCollection)
+            + '). Theia service overrides cannot be patched in after premature initialization. '
+            + 'Investigate whether Monaco\'s InstantiationService internals have changed.');
+        return;
+    }
+    const patchedServices = [];
+    const alreadyInstantiatedServices = [];
+    for (const serviceId of Object.keys(overrides)) {
+        const serviceIdentifier = (0, instantiation_1.createDecorator)(serviceId);
+        const existing = serviceCollection.get(serviceIdentifier);
+        if (existing instanceof descriptors_1.SyncDescriptor && existing !== overrides[serviceId]) {
+            // The override was not applied by initialize() – patch it in manually.
+            serviceCollection.set(serviceIdentifier, overrides[serviceId]);
+            patchedServices.push(serviceId);
+        }
+        else if (existing !== undefined && !(existing instanceof descriptors_1.SyncDescriptor)) {
+            // The service was already instantiated from the default Monaco
+            // implementation – we cannot override it anymore.
+            alreadyInstantiatedServices.push(serviceId);
+        }
+    }
+    if (patchedServices.length > 0) {
+        console.warn('StandaloneServices was already initialized before MonacoInit.init() was called. '
+            + 'This typically happens when a StandaloneServices.get() call is triggered as a side-effect during module loading. '
+            + 'The following Theia service overrides had to be patched in after the fact: '
+            + patchedServices.join(', ')
+            + '. Investigate the module loading order to prevent premature initialization.');
+    }
+    if (alreadyInstantiatedServices.length > 0) {
+        console.error('StandaloneServices was already initialized and the following services were already instantiated '
+            + 'before MonacoInit.init() could apply Theia overrides: '
+            + alreadyInstantiatedServices.join(', ')
+            + '. These services are using the default Monaco implementations instead of Theia\'s. '
+            + 'This may cause unexpected behavior. Investigate which code triggers premature service resolution.');
+    }
+}
 //# sourceMappingURL=monaco-init.js.map

package/lib/browser/monaco-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-init.js","sourceRoot":"","sources":["../../src/browser/monaco-init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-init.js","sourceRoot":"","sources":["../../src/browser/monaco-init.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF;;;;;;;;;;;GAWG;AAEH,6EAA6E;AAC7E,uFAAuF;AACvF,wDAAwD;AAExD,4DAAyD;AACzD,kHAAgH;AAChH,sHAAmH;AACnH,4GAA4G;AAC5G,gHAAsI;AACtI,8HAA2H;AAC3H,wHAAqH;AACrH,mEAAqG;AACrG,gHAAqH;AACrH,6GAA4G;AAC5G,qEAAsE;AACtE,2EAAqE;AACrE,+DAAiE;AACjE,2GAAgH;AAChH,uGAA4G;AAC5G,sGAAoG;AACpG,yEAAmE;AACnE,qEAAgE;AAChE,8GAA4G;AAC5G,iGAAqG;AACrG,6EAA8E;AAC9E,uGAA4G;AAC5G,+GAAoH;AACpH,uFAAiF;AACjF,iFAAiF;AACjF,yFAA8F;AAC9F,0GAAkH;AAClH,oGAAgH;AAChH,yFAAmF;AACnF,0GAAwG;AACxG,8EAA2E;AAC3E,yEAAyE;AACzE,iFAAkF;AAClF,sCAAyC;AAE5B,QAAA,yBAAyB,GAAG,IAAA,8DAA+B,GAAE,CAAC;AAE3E,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAChC;;;;;;OAMG;IACH,YAAY,SAAoB,EACR,iBAAqC,EAC1C,YAA2B;QAE1C,OAAO,SAAS,CAAC,GAAG,CAAiC,kDAA0B,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IACtH,CAAC;IAAA,CAAC;CACL,CAAA;AAdK,8BAA8B;IAS3B,mBAAA,+BAAkB,CAAA;IAClB,mBAAA,4BAAa,CAAA;6CAFK,qBAAS;GAR9B,8BAA8B,CAcnC;AAED,MAAM,qCAAqC;IACvC,YAAY,SAAoB;QAC5B,OAAO,SAAS,CAAC,GAAG,CAAC,mDAA0B,CAAC,CAAC;IACrD,CAAC;CACJ;AAED,MAAM,iCAAiC;IACnC,YAAY,SAAoB;QAC5B,OAAO,SAAS,CAAC,GAAG,CAAC,kDAAsB,CAAC,CAAC;IACjD,CAAC;CACJ;AAED,MAAM,mCAAmC;IACrC,YAAY,SAAoB;QAC5B,OAAO,SAAS,CAAC,GAAG,CAAC,8CAAwB,CAAC,CAAC;IACnD,CAAC;CACJ;AAED,MAAM,gCAAgC;IAClC,YAAY,SAAoB;QAC5B,OAAO,SAAS,CAAC,GAAG,CAAC,gDAAqB,CAAC,CAAC;IAChD,CAAC;CACJ;AAED,MAAM,+BAA+B;IACjC,YAAY,SAAoB;QAC5B,OAAO,SAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC;IAC/C,CAAC;CACJ;AAED,MAAM,yCAAyC;IAC3C,YAAY,SAAoB;QAC5B,OAAO,SAAS,CAAC,GAAG,CAAC,2DAA8B,CAAC,CAAC;IACzD,CAAC;CACJ;AAED,MAAM,uCAAuC;IACzC,YAAY,SAAoB;QAC5B,OAAO,IAAI,8DAA4B,EAAE,CAAC;IAC9C,CAAC;CACJ;AAED,MAAM,wCAAwC;IAC1C,YAAY,SAAoB;QAC5B,OAAO,SAAS,CAAC,GAAG,CAAC,gEAA6B,CAAC,CAAC;IACxD,CAAC;CACJ;AAED;;;;;GAKG;AACH,MAAM,mBAAmB;IAAzB;QACa,6BAAwB,GAAG,aAAK,CAAC,IAAI,CAAC;QACtC,+BAA0B,GAAG,aAAK,CAAC,IAAI,CAAC;QACxC,yBAAoB,GAAG,aAAK,CAAC,IAAI,CAAC;QAClC,+BAA0B,GAAG,aAAK,CAAC,IAAI,CAAC;QACxC,sBAAiB,GAAG,aAAK,CAAC,IAAI,CAAC;QAC/B,wBAAmB,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;QAClD,0BAAqB,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAiCjE,CAAC;IA/BG,IAAI,aAAa;QACb,OAAO,mBAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,mBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC7F,CAAC;IAED,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,IAAI,sBAAsB;QACtB,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,wBAAwB;QACxB,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,UAAU;QACV,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAChC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,yBAAyB;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;CACJ;AAED,MAAM,8BAA8B;IAChC;QACI,OAAO,IAAI,mBAAmB,EAAE,CAAC;IACrC,CAAC;CACJ;AAED,IAAiB,UAAU,CAiD1B;AAjDD,WAAiB,UAAU;IACvB,SAAgB,IAAI,CAAC,SAAoB;QACrC,MAAM,SAAS,GAA4C;YACvD,CAAC,sCAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,8BAA8B,EAAE,CAAC,SAAS,CAAC,CAAC;YAChG,CAAC,qCAAqB,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,qCAAqC,EAAE,CAAC,SAAS,CAAC,CAAC;YAC1G,CAAC,mCAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,iCAAiC,EAAE,CAAC,SAAS,CAAC,CAAC;YAClG,CAAC,iCAAmB,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,mCAAmC,EAAE,CAAC,SAAS,CAAC,CAAC;YACtG,CAAC,kCAAgB,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,gCAAgC,EAAE,CAAC,SAAS,CAAC,CAAC;YAChG,CAAC,0BAAe,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,+BAA+B,EAAE,CAAC,SAAS,CAAC,CAAC;YAC9F,CAAC,+BAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,yCAAyC,EAAE,CAAC,SAAS,CAAC,CAAC;YAC3G,CAAC,yCAAuB,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,uCAAuC,EAAE,EAAE,CAAC;YACrG,CAAC,oCAAwB,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,wCAAwC,EAAE,CAAC,SAAS,CAAC,CAAC;YAChH,CAAC,8BAAc,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,4BAAc,CAAC,8BAA8B,EAAE,EAAE,CAAC;SACtF,CAAC;QAEF,sFAAsF;QACtF,2FAA2F;QAC3F,wFAAwF;QACxF,uFAAuF;QACvF,oBAAoB;QACpB,yFAAyF;QACzF,4FAA4F;QAC5F,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,uCAAkB,CAAC,YAAY,CAAC,GAAG,EAAE;YACjC,aAAa,GAAG,IAAI,CAAC;YACrB,OAAO,iBAAU,CAAC,IAAI,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,MAAM,kCAAkC,GAAG,aAAa,CAAC;QAEzD,8CAA8C;QAC9C,uCAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAEzC,oGAAoG;QACpG,qGAAqG;QACrG,uGAAuG;QACvG,kGAAkG;QAClG,EAAE;QACF,yFAAyF;QACzF,yFAAyF;QACzF,sFAAsF;QACtF,wEAAwE;QACxE,IAAI,kCAAkC,EAAE,CAAC;YACrC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QAED,oIAAoI;QACpI,oGAAoG;QACpG,IAAA,0CAAyB,EAAC,uCAAkB,CAAC,GAAG,CAAC,qBAAa,CAAC,CAAC,CAAC;IACrE,CAAC;IA/Ce,eAAI,OA+CnB,CAAA;AACL,CAAC,EAjDgB,UAAU,0BAAV,UAAU,QAiD1B;AAED,sFAAsF;AACtF,qFAAqF;AACrF,+DAA+D;AAC/D,SAAS,aAAa,CAAC,SAAkD;IACrE,MAAM,oBAAoB,GAAG,uCAAkB,CAAC,GAAG,CAAC,qCAAqB,CAAC,CAAC;IAC3E,IAAI,CAAC,CAAC,oBAAoB,YAAY,2CAAoB,CAAC,EAAE,CAAC;QAC1D,OAAO,CAAC,KAAK,CACT,wGAAwG;cACtG,+EAA+E;cAC/E,wFAAwF,CAC7F,CAAC;QACF,OAAO;IACX,CAAC;IACD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,CAAC,CAAC,iBAAiB,YAAY,qCAAiB,CAAC,EAAE,CAAC;QACpD,OAAO,CAAC,KAAK,CACT,iEAAiE;cAC/D,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,iBAAiB,CAAC;cAC1E,kFAAkF;cAClF,4EAA4E,CACjF,CAAC;QACF,OAAO;IACX,CAAC;IACD,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,MAAM,2BAA2B,GAAa,EAAE,CAAC;IACjD,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7C,MAAM,iBAAiB,GAAG,IAAA,+BAAe,EAAC,SAAS,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC1D,IAAI,QAAQ,YAAY,4BAAc,IAAI,QAAQ,KAAK,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1E,uEAAuE;YACvE,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/D,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,YAAY,4BAAc,CAAC,EAAE,CAAC;YACzE,+DAA+D;YAC/D,kDAAkD;YAClD,2BAA2B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChD,CAAC;IACL,CAAC;IACD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,CAAC,IAAI,CACR,kFAAkF;cAChF,mHAAmH;cACnH,6EAA6E;cAC7E,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;cAC1B,6EAA6E,CAClF,CAAC;IACN,CAAC;IACD,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,KAAK,CACT,kGAAkG;cAChG,wDAAwD;cACxD,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC;cACtC,qFAAqF;cACrF,mGAAmG,CACxG,CAAC;IACN,CAAC;AACL,CAAC"}

package/lib/browser/monaco-init.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=monaco-init.spec.d.ts.map

package/lib/browser/monaco-init.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"monaco-init.spec.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-init.spec.ts"],"names":[],"mappings":""}

package/lib/browser/monaco-init.spec.js

@@ -0,0 +1,72 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
+let disableJSDOM = (0, jsdom_1.enableJSDOM)();
+const chai_1 = require("chai");
+const core_1 = require("@theia/core");
+const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
+const instantiation_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation");
+const instantiationService_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService");
+const serviceCollection_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection");
+disableJSDOM();
+/**
+ * @monaco-uplift
+ *
+ * These tests guard internal assumptions that `monaco-init.ts` makes about
+ * Monaco's `StandaloneServices`.  Specifically:
+ *
+ * 1. `StandaloneServices.get(IInstantiationService)` returns an instance of the
+ *    concrete {@link InstantiationService} class.
+ * 2. That class exposes a private `_services` field of type {@link ServiceCollection}.
+ * 3. `StandaloneServices.withServices` calls its callback **synchronously** when
+ *    services are already initialized (used to detect premature initialization).
+ *
+ * Because these rely on private implementation details of Monaco, they may break
+ * in a future release.  If any of these tests fail after a Monaco version bump,
+ * the corresponding code in `monaco-init.ts` must be updated to match.
+ */
+describe('Monaco InstantiationService internals', () => {
+    before(() => disableJSDOM = (0, jsdom_1.enableJSDOM)());
+    after(() => disableJSDOM());
+    it('StandaloneServices.get(IInstantiationService) should be an instance of InstantiationService', () => {
+        const instantiationService = standaloneServices_1.StandaloneServices.get(instantiation_1.IInstantiationService);
+        (0, chai_1.expect)(instantiationService).to.be.an.instanceOf(instantiationService_1.InstantiationService);
+    });
+    it('StandaloneServices.get(IInstantiationService) should have a _services property that is a ServiceCollection', () => {
+        const instantiationService = standaloneServices_1.StandaloneServices.get(instantiation_1.IInstantiationService);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const services = instantiationService['_services'];
+        (0, chai_1.expect)(services).to.not.be.undefined;
+        (0, chai_1.expect)(services).to.be.an.instanceOf(serviceCollection_1.ServiceCollection);
+    });
+    // MonacoInit.init() uses withServices to detect whether StandaloneServices
+    // was already initialized: it passes a callback that sets a flag, then reads
+    // the flag immediately afterwards.  This only works if withServices calls
+    // the callback synchronously when services are already initialized.
+    it('StandaloneServices.withServices should call the callback synchronously when already initialized', () => {
+        // Ensure services are initialized (get triggers initialization if needed).
+        standaloneServices_1.StandaloneServices.get(instantiation_1.IInstantiationService);
+        let called = false;
+        standaloneServices_1.StandaloneServices.withServices(() => {
+            called = true;
+            return core_1.Disposable.NULL;
+        });
+        (0, chai_1.expect)(called).to.be.true;
+    });
+});
+//# sourceMappingURL=monaco-init.spec.js.map

package/lib/browser/monaco-init.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"monaco-init.spec.js","sourceRoot":"","sources":["../../src/browser/monaco-init.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,8DAAiE;AACjE,IAAI,YAAY,GAAG,IAAA,mBAAW,GAAE,CAAC;AAEjC,+BAA8B;AAC9B,sCAAyC;AACzC,sHAAmH;AACnH,gHAAqH;AACrH,8HAA2H;AAC3H,wHAAqH;AAErH,YAAY,EAAE,CAAC;AAEf;;;;;;;;;;;;;;;GAeG;AACH,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;IAEnD,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,GAAG,IAAA,mBAAW,GAAE,CAAC,CAAC;IAC3C,KAAK,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;IAE5B,EAAE,CAAC,6FAA6F,EAAE,GAAG,EAAE;QACnG,MAAM,oBAAoB,GAAG,uCAAkB,CAAC,GAAG,CAAC,qCAAqB,CAAC,CAAC;QAC3E,IAAA,aAAM,EAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,2CAAoB,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4GAA4G,EAAE,GAAG,EAAE;QAClH,MAAM,oBAAoB,GAAG,uCAAkB,CAAC,GAAG,CAAC,qCAAqB,CAAC,CAAC;QAC3E,8DAA8D;QAC9D,MAAM,QAAQ,GAAI,oBAA4B,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;QACrC,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,qCAAiB,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,2EAA2E;IAC3E,6EAA6E;IAC7E,0EAA0E;IAC1E,oEAAoE;IACpE,EAAE,CAAC,iGAAiG,EAAE,GAAG,EAAE;QACvG,2EAA2E;QAC3E,uCAAkB,CAAC,GAAG,CAAC,qCAAqB,CAAC,CAAC;QAE9C,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,uCAAkB,CAAC,YAAY,CAAC,GAAG,EAAE;YACjC,MAAM,GAAG,IAAI,CAAC;YACd,OAAO,iBAAU,CAAC,IAAI,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/monaco",
-  "version": "1.71.0-next.49+ff8893f59",
+  "version": "1.71.0-next.57+1fc9a8239",
   "description": "Theia - Monaco Extension",
   "dependencies": {
-    "@theia/core": "1.71.0-next.49+ff8893f59",
-    "@theia/editor": "1.71.0-next.49+ff8893f59",
-    "@theia/filesystem": "1.71.0-next.49+ff8893f59",
-    "@theia/markers": "1.71.0-next.49+ff8893f59",
+    "@theia/core": "1.71.0-next.57+1fc9a8239",
+    "@theia/editor": "1.71.0-next.57+1fc9a8239",
+    "@theia/filesystem": "1.71.0-next.57+1fc9a8239",
+    "@theia/markers": "1.71.0-next.57+1fc9a8239",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/outline-view": "1.71.0-next.49+ff8893f59",
-    "@theia/workspace": "1.71.0-next.49+ff8893f59",
+    "@theia/outline-view": "1.71.0-next.57+1fc9a8239",
+    "@theia/workspace": "1.71.0-next.57+1fc9a8239",
     "fast-plist": "^0.1.3",
     "idb": "^4.0.5",
     "jsonc-parser": "^2.3.1",
@@ -57,5 +57,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "ff8893f5957f8e505176ecd8c3ef10d722d47172"
+  "gitHead": "1fc9a8239357c913ab79f1922b6e87aecd79cfdb"
 }

package/src/browser/monaco-init.spec.ts

@@ -0,0 +1,78 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+
+import { expect } from 'chai';
+import { Disposable } from '@theia/core';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
+import { InstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService';
+import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection';
+
+disableJSDOM();
+
+/**
+ * @monaco-uplift
+ *
+ * These tests guard internal assumptions that `monaco-init.ts` makes about
+ * Monaco's `StandaloneServices`.  Specifically:
+ *
+ * 1. `StandaloneServices.get(IInstantiationService)` returns an instance of the
+ *    concrete {@link InstantiationService} class.
+ * 2. That class exposes a private `_services` field of type {@link ServiceCollection}.
+ * 3. `StandaloneServices.withServices` calls its callback **synchronously** when
+ *    services are already initialized (used to detect premature initialization).
+ *
+ * Because these rely on private implementation details of Monaco, they may break
+ * in a future release.  If any of these tests fail after a Monaco version bump,
+ * the corresponding code in `monaco-init.ts` must be updated to match.
+ */
+describe('Monaco InstantiationService internals', () => {
+
+    before(() => disableJSDOM = enableJSDOM());
+    after(() => disableJSDOM());
+
+    it('StandaloneServices.get(IInstantiationService) should be an instance of InstantiationService', () => {
+        const instantiationService = StandaloneServices.get(IInstantiationService);
+        expect(instantiationService).to.be.an.instanceOf(InstantiationService);
+    });
+
+    it('StandaloneServices.get(IInstantiationService) should have a _services property that is a ServiceCollection', () => {
+        const instantiationService = StandaloneServices.get(IInstantiationService);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const services = (instantiationService as any)['_services'];
+        expect(services).to.not.be.undefined;
+        expect(services).to.be.an.instanceOf(ServiceCollection);
+    });
+
+    // MonacoInit.init() uses withServices to detect whether StandaloneServices
+    // was already initialized: it passes a callback that sets a flag, then reads
+    // the flag immediately afterwards.  This only works if withServices calls
+    // the callback synchronously when services are already initialized.
+    it('StandaloneServices.withServices should call the callback synchronously when already initialized', () => {
+        // Ensure services are initialized (get triggers initialization if needed).
+        StandaloneServices.get(IInstantiationService);
+
+        let called = false;
+        StandaloneServices.withServices(() => {
+            called = true;
+            return Disposable.NULL;
+        });
+        expect(called).to.be.true;
+    });
+});

package/src/browser/monaco-init.ts

@@ -36,6 +36,7 @@ import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/brow
 import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService, createDecorator } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
+import { InstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService';
 import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection';
 import { MonacoEditorServiceFactory, MonacoEditorServiceFactoryType } from './monaco-editor-service';
 import { IConfigurationService } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
@@ -63,6 +64,7 @@ import { ILayoutService } from '@theia/monaco-editor-core/esm/vs/platform/layout
 import { Event } from '@theia/monaco-editor-core/esm/vs/base/common/event';
 import * as dom from '@theia/monaco-editor-core/esm/vs/base/browser/dom';
 import { mainWindow } from '@theia/monaco-editor-core/esm/vs/base/browser/window';
+import { Disposable } from '@theia/core';
 
 export const contentHoverWidgetPatcher = createContentHoverWidgetPatcher();
 
@@ -199,6 +201,20 @@ export namespace MonacoInit {
             [ILayoutService.toString()]: new SyncDescriptor(MonacoLayoutServiceConstructor, [])
         };
 
+        // Detect whether StandaloneServices was already initialized before we get a chance to
+        // apply our overrides.  `withServices` calls the callback synchronously when `initialized`
+        // is already `true`, so the flag will be set before we proceed.  If it remains `false`,
+        // our `initialize(overrides)` call below will be the first and our descriptors will be
+        // applied normally.
+        // @monaco-uplift: verify that `withServices` still calls the callback synchronously when
+        // already initialized — if this changes, the premature-initialization detection will break.
+        let isInitialized = false;
+        StandaloneServices.withServices(() => {
+            isInitialized = true;
+            return Disposable.NULL;
+        });
+        const servicesInitializedBeforeOverrides = isInitialized;
+
         // Try the standard initialization path first.
         StandaloneServices.initialize(overrides);
 
@@ -206,42 +222,13 @@ export namespace MonacoInit {
         // triggered as a side-effect during module loading), the call above is a no-op and our overrides are
         // silently dropped.  Detect this situation, warn about it, and inject our service descriptors directly
         // into the internal service collection so that they are used when the services are next resolved.
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const instantiationService = StandaloneServices.get(IInstantiationService) as any;
-        const serviceCollection: ServiceCollection | undefined = instantiationService?._services;
-        if (serviceCollection) {
-            const patchedServices: string[] = [];
-            const alreadyInstantiatedServices: string[] = [];
-            for (const serviceId of Object.keys(overrides)) {
-                const serviceIdentifier = createDecorator(serviceId);
-                const existing = serviceCollection.get(serviceIdentifier);
-                if (existing instanceof SyncDescriptor && existing !== overrides[serviceId]) {
-                    // The override was not applied by initialize() – patch it in manually.
-                    serviceCollection.set(serviceIdentifier, overrides[serviceId]);
-                    patchedServices.push(serviceId);
-                } else if (existing !== undefined && !(existing instanceof SyncDescriptor) && existing !== overrides[serviceId]) {
-                    // The service was already instantiated – we cannot override it anymore.
-                    alreadyInstantiatedServices.push(serviceId);
-                }
-            }
-            if (patchedServices.length > 0) {
-                console.warn(
-                    'StandaloneServices was already initialized before MonacoInit.init() was called. '
-                    + 'This typically happens when a StandaloneServices.get() call is triggered as a side-effect during module loading. '
-                    + 'The following Theia service overrides had to be patched in after the fact: '
-                    + patchedServices.join(', ')
-                    + '. Investigate the module loading order to prevent premature initialization.'
-                );
-            }
-            if (alreadyInstantiatedServices.length > 0) {
-                console.error(
-                    'StandaloneServices was already initialized and the following services were already instantiated '
-                    + 'before MonacoInit.init() could apply Theia overrides: '
-                    + alreadyInstantiatedServices.join(', ')
-                    + '. These services are using the default Monaco implementations instead of Theia\'s. '
-                    + 'This may cause unexpected behavior. Investigate which code triggers premature service resolution.'
-                );
-            }
+        //
+        // We only need this fallback when initialize() was a no-op.  On the normal startup path,
+        // initialize() succeeds and any services that get instantiated during that call (e.g. as
+        // dependencies of editor features) are created from *our* Theia descriptors — not the
+        // Monaco defaults — so they are perfectly fine and must not be flagged.
+        if (servicesInitializedBeforeOverrides) {
+            patchServices(overrides);
         }
 
         // Make sure the global base hover delegate is initialized as otherwise the quick input will throw an error and not update correctly
@@ -249,3 +236,61 @@ export namespace MonacoInit {
         setBaseLayerHoverDelegate(StandaloneServices.get(IHoverService));
     }
 }
+
+// @monaco-uplift: verify that the concrete InstantiationService class still exposes a
+// private `_services: ServiceCollection` property.  See monaco-init.spec.ts for a CI
+// guard that will flag a mismatch after a Monaco version bump.
+function patchServices(overrides: Record<string, SyncDescriptor<unknown>>): void {
+    const instantiationService = StandaloneServices.get(IInstantiationService);
+    if (!(instantiationService instanceof InstantiationService)) {
+        console.error(
+            'StandaloneServices returned an IInstantiationService that is not an instance of InstantiationService. '
+            + 'Theia service overrides cannot be patched in after premature initialization. '
+            + 'Investigate whether Monaco\'s internal InstantiationService class has been refactored.'
+        );
+        return;
+    }
+    const serviceCollection = instantiationService['_services'];
+    if (!(serviceCollection instanceof ServiceCollection)) {
+        console.error(
+            'InstantiationService._services is not a ServiceCollection (got '
+            + (serviceCollection === undefined ? 'undefined' : typeof serviceCollection)
+            + '). Theia service overrides cannot be patched in after premature initialization. '
+            + 'Investigate whether Monaco\'s InstantiationService internals have changed.'
+        );
+        return;
+    }
+    const patchedServices: string[] = [];
+    const alreadyInstantiatedServices: string[] = [];
+    for (const serviceId of Object.keys(overrides)) {
+        const serviceIdentifier = createDecorator(serviceId);
+        const existing = serviceCollection.get(serviceIdentifier);
+        if (existing instanceof SyncDescriptor && existing !== overrides[serviceId]) {
+            // The override was not applied by initialize() – patch it in manually.
+            serviceCollection.set(serviceIdentifier, overrides[serviceId]);
+            patchedServices.push(serviceId);
+        } else if (existing !== undefined && !(existing instanceof SyncDescriptor)) {
+            // The service was already instantiated from the default Monaco
+            // implementation – we cannot override it anymore.
+            alreadyInstantiatedServices.push(serviceId);
+        }
+    }
+    if (patchedServices.length > 0) {
+        console.warn(
+            'StandaloneServices was already initialized before MonacoInit.init() was called. '
+            + 'This typically happens when a StandaloneServices.get() call is triggered as a side-effect during module loading. '
+            + 'The following Theia service overrides had to be patched in after the fact: '
+            + patchedServices.join(', ')
+            + '. Investigate the module loading order to prevent premature initialization.'
+        );
+    }
+    if (alreadyInstantiatedServices.length > 0) {
+        console.error(
+            'StandaloneServices was already initialized and the following services were already instantiated '
+            + 'before MonacoInit.init() could apply Theia overrides: '
+            + alreadyInstantiatedServices.join(', ')
+            + '. These services are using the default Monaco implementations instead of Theia\'s. '
+            + 'This may cause unexpected behavior. Investigate which code triggers premature service resolution.'
+        );
+    }
+}