@theia/core 1.76.0-next.6 → 1.76.0

package/src/electron-main/launch-argv-parser.spec.ts

@@ -0,0 +1,70 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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 { expect } from 'chai';
+import { LaunchArguments } from '../common/launch-arguments';
+import { LaunchArgvParser } from './launch-argv-parser';
+
+describe('LaunchArgvParser', () => {
+
+    it('parses a "--name value" option', () => {
+        const args = LaunchArgvParser.parse(['--attach-container', 'B']);
+        expect(LaunchArguments.lastValue(args, 'attach-container')).to.equal('B');
+    });
+
+    it('parses a "--name=value" option', () => {
+        const args = LaunchArgvParser.parse(['--attach-container=B']);
+        expect(LaunchArguments.lastValue(args, 'attach-container')).to.equal('B');
+    });
+
+    it('keeps a value that itself contains "="', () => {
+        const args = LaunchArgvParser.parse(['--session-preference=a=1']);
+        expect(LaunchArguments.values(args, 'session-preference')).to.deep.equal(['a=1']);
+    });
+
+    it('collects repeated options in order, last winning for a single value', () => {
+        const args = LaunchArgvParser.parse(['--session-preference', 'a=1', '--session-preference=b=2', '--other', 'x']);
+        expect(LaunchArguments.values(args, 'session-preference')).to.deep.equal(['a=1', 'b=2']);
+        expect(LaunchArguments.lastValue(args, 'session-preference')).to.equal('b=2');
+    });
+
+    it('does not consume a following option as a value', () => {
+        const args = LaunchArgvParser.parse(['--attach-container', '--session-preference', 'a=1']);
+        expect(LaunchArguments.lastValue(args, 'attach-container')).to.equal(undefined);
+        expect(LaunchArguments.values(args, 'session-preference')).to.deep.equal(['a=1']);
+    });
+
+    it('reports an absent option as empty', () => {
+        const args = LaunchArgvParser.parse(['--other']);
+        expect(LaunchArguments.values(args, 'session-preference')).to.deep.equal([]);
+        expect(LaunchArguments.lastValue(args, 'session-preference')).to.equal(undefined);
+    });
+
+    it('detects "--no-name" and "--name=false" negations', () => {
+        expect(LaunchArguments.isNegated(LaunchArgvParser.parse(['--no-dev-json']), 'dev-json')).to.be.true;
+        expect(LaunchArguments.isNegated(LaunchArgvParser.parse(['--dev-json=false']), 'dev-json')).to.be.true;
+    });
+
+    it('does not report a positive or absent flag as negated', () => {
+        expect(LaunchArguments.isNegated(LaunchArgvParser.parse(['--dev-json']), 'dev-json')).to.be.false;
+        expect(LaunchArguments.isNegated(LaunchArgvParser.parse([]), 'dev-json')).to.be.false;
+    });
+
+    it('ignores tokens that are not options', () => {
+        const args = LaunchArgvParser.parse(['/path/to/app', 'positional', '--attach-container', 'B']);
+        expect(LaunchArguments.lastValue(args, 'attach-container')).to.equal('B');
+    });
+});

package/src/electron-main/launch-argv-parser.ts

@@ -0,0 +1,66 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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 { LaunchArguments } from '../common/launch-arguments';
+
+/**
+ * Parses the `argv` of a forwarded launch into {@link LaunchArguments}.
+ *
+ * This lives in the Electron main process on purpose: the command line is parsed once, here, and
+ * every consumer (main-process contributions and the window the launch opened) works with the
+ * parsed result. No argument grammar is shipped to the renderer.
+ *
+ * The grammar mirrors what yargs accepts on cold start for the same flags: a value given as either
+ * `--name value` or `--name=value`, options repeatable to yield multiple values, a token that
+ * itself looks like an option (starts with `-`) never consumed as a value, and `--no-name` /
+ * `--name=false` recognised as an explicit negation.
+ *
+ * @experimental
+ */
+export namespace LaunchArgvParser {
+
+    export function parse(argv: readonly string[]): LaunchArguments {
+        const values: Record<string, string[]> = {};
+        const negated: string[] = [];
+        for (let i = 0; i < argv.length; i++) {
+            const token = argv[i];
+            if (!token.startsWith('--')) {
+                continue;
+            }
+            const name = token.substring(2);
+            const equalsIndex = name.indexOf('=');
+            if (equalsIndex >= 0) {
+                const key = name.substring(0, equalsIndex);
+                const value = name.substring(equalsIndex + 1);
+                if (value === 'false') {
+                    negated.push(key);
+                } else {
+                    (values[key] ??= []).push(value);
+                }
+            } else if (name.startsWith('no-')) {
+                negated.push(name.substring('no-'.length));
+            } else {
+                const next = argv[i + 1];
+                // Like yargs, do not consume a following option-looking token (`-x`/`--x`) as the value.
+                if (next !== undefined && !next.startsWith('-')) {
+                    (values[name] ??= []).push(next);
+                    i++;
+                }
+            }
+        }
+        return { values, negated };
+    }
+}

package/src/electron-main/theia-electron-window.ts

@@ -24,6 +24,7 @@ import { createDisposableListener } from './event-utils';
 import { URI } from '../common/uri';
 import { FileUri } from '../common/file-uri';
 import { TheiaRendererAPI } from './electron-api-main';
+import { LaunchArgsStore } from './launch-args-store';
 
 /**
  * Theia tracks the maximized state of Electron Browser Windows.
@@ -62,6 +63,7 @@ export class TheiaElectronWindow {
     @inject(TheiaBrowserWindowOptions) protected readonly options: TheiaBrowserWindowOptions;
     @inject(WindowApplicationConfig) protected readonly config: WindowApplicationConfig;
     @inject(ElectronMainApplicationGlobals) protected readonly globals: ElectronMainApplicationGlobals;
+    @inject(LaunchArgsStore) protected readonly launchArgsStore: LaunchArgsStore;
 
     protected onDidCloseEmitter = new Emitter<void>();
 
@@ -155,6 +157,13 @@ export class TheiaElectronWindow {
         this.handleStopRequest(async () => {
             this.applicationState = 'init';
             if (newUrl) {
+                // The window is being redirected to a *different* frontend, e.g. into a dev container
+                // after a CLI attach. The forwarded launch arguments belong to the launch that created
+                // this window and have been acted upon by now, so they must not be redeemed again by
+                // the frontend loaded from `newUrl`: that would re-run the attach inside the container
+                // and re-apply the launch's preferences to the remote backend. A plain reload (no
+                // `newUrl`) keeps them, so `Reload Window` still observes the arguments.
+                this.launchArgsStore.delete(this._window.webContents.id);
                 this._window.loadURL(newUrl);
             } else {
                 this._window.reload();