@theia/external-terminal 1.53.0-next.5 → 1.53.0-next.55

package/src/electron-node/windows-external-terminal-service.ts

@@ -1,110 +1,110 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson 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 * as cp from 'child_process';
-import * as path from 'path';
-import { injectable } from '@theia/core/shared/inversify';
-import { FileUri } from '@theia/core/lib/common/file-uri';
-import { ExternalTerminalService, ExternalTerminalConfiguration } from '../common/external-terminal';
-
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// some code copied and modified from https://github.com/microsoft/vscode/blob/1.52.1/src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts
-
-@injectable()
-export class WindowsExternalTerminalService implements ExternalTerminalService {
-    protected readonly CMD = 'cmd.exe';
-    protected DEFAULT_TERMINAL_WINDOWS: string;
-
-    async openTerminal(configuration: ExternalTerminalConfiguration, cwd: string): Promise<void> {
-        await this.spawnTerminal(configuration, FileUri.fsPath(cwd));
-    }
-
-    async getDefaultExec(): Promise<string> {
-        return this.getDefaultTerminalWindows();
-    }
-
-    /**
-     * Spawn the external terminal for the given options.
-     * - The method spawns the terminal application based on the preferences, else uses the default value.
-     * @param configuration the preference configuration.
-     * @param cwd the optional current working directory to spawn from.
-     */
-    protected async spawnTerminal(configuration: ExternalTerminalConfiguration, cwd?: string): Promise<void> {
-
-        // Use the executable value from the preferences if available, else fallback to the default.
-        const terminalConfig = configuration['terminal.external.windowsExec'];
-        const exec = terminalConfig || this.getDefaultTerminalWindows();
-
-        // Make the drive letter uppercase on Windows (https://github.com/microsoft/vscode/issues/9448).
-        if (cwd && cwd[1] === ':') {
-            cwd = cwd[0].toUpperCase() + cwd.substring(1);
-        }
-
-        // cmder ignores the environment cwd and instead opts to always open in %USERPROFILE%
-        // unless otherwise specified.
-        const basename = path.basename(exec).toLowerCase();
-        if (basename === 'cmder' || basename === 'cmder.exe') {
-            cp.spawn(exec, cwd ? [cwd] : undefined);
-            return;
-        }
-
-        const cmdArgs = ['/c', 'start', '/wait'];
-        // The "" argument is the window title. Without this, exec doesn't work when the path contains spaces.
-        if (exec.indexOf(' ') >= 0) {
-            cmdArgs.push('""');
-        }
-
-        cmdArgs.push(exec);
-
-        // Add starting directory parameter for Windows Terminal app.
-        if (basename === 'wt' || basename === 'wt.exe') {
-            cmdArgs.push('-d .');
-        }
-
-        return new Promise<void>(async (resolve, reject) => {
-            const env = cwd ? { cwd } : undefined;
-            const command = this.getWindowsShell();
-            const child = cp.spawn(command, cmdArgs, env);
-            child.on('error', reject);
-            child.on('exit', resolve);
-        });
-    }
-
-    /**
-     * Get the default terminal application on Windows.
-     * - The following method uses environment variables to identify the best default possible value.
-     *
-     * @returns the default application on Windows.
-     */
-    protected getDefaultTerminalWindows(): string {
-        if (!this.DEFAULT_TERMINAL_WINDOWS) {
-            const isWoW64 = !!process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
-            this.DEFAULT_TERMINAL_WINDOWS = `${process.env.windir ? process.env.windir : 'C:\\Windows'}\\${isWoW64 ? 'Sysnative' : 'System32'}\\cmd.exe`;
-        }
-        return this.DEFAULT_TERMINAL_WINDOWS;
-    }
-
-    /**
-     * Find the Windows Shell process to start up (defaults to cmd.exe).
-     */
-    protected getWindowsShell(): string {
-        // Find the path to cmd.exe if possible (%compsec% environment variable).
-        return process.env.compsec || this.CMD;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson 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 * as cp from 'child_process';
+import * as path from 'path';
+import { injectable } from '@theia/core/shared/inversify';
+import { FileUri } from '@theia/core/lib/common/file-uri';
+import { ExternalTerminalService, ExternalTerminalConfiguration } from '../common/external-terminal';
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// some code copied and modified from https://github.com/microsoft/vscode/blob/1.52.1/src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts
+
+@injectable()
+export class WindowsExternalTerminalService implements ExternalTerminalService {
+    protected readonly CMD = 'cmd.exe';
+    protected DEFAULT_TERMINAL_WINDOWS: string;
+
+    async openTerminal(configuration: ExternalTerminalConfiguration, cwd: string): Promise<void> {
+        await this.spawnTerminal(configuration, FileUri.fsPath(cwd));
+    }
+
+    async getDefaultExec(): Promise<string> {
+        return this.getDefaultTerminalWindows();
+    }
+
+    /**
+     * Spawn the external terminal for the given options.
+     * - The method spawns the terminal application based on the preferences, else uses the default value.
+     * @param configuration the preference configuration.
+     * @param cwd the optional current working directory to spawn from.
+     */
+    protected async spawnTerminal(configuration: ExternalTerminalConfiguration, cwd?: string): Promise<void> {
+
+        // Use the executable value from the preferences if available, else fallback to the default.
+        const terminalConfig = configuration['terminal.external.windowsExec'];
+        const exec = terminalConfig || this.getDefaultTerminalWindows();
+
+        // Make the drive letter uppercase on Windows (https://github.com/microsoft/vscode/issues/9448).
+        if (cwd && cwd[1] === ':') {
+            cwd = cwd[0].toUpperCase() + cwd.substring(1);
+        }
+
+        // cmder ignores the environment cwd and instead opts to always open in %USERPROFILE%
+        // unless otherwise specified.
+        const basename = path.basename(exec).toLowerCase();
+        if (basename === 'cmder' || basename === 'cmder.exe') {
+            cp.spawn(exec, cwd ? [cwd] : undefined);
+            return;
+        }
+
+        const cmdArgs = ['/c', 'start', '/wait'];
+        // The "" argument is the window title. Without this, exec doesn't work when the path contains spaces.
+        if (exec.indexOf(' ') >= 0) {
+            cmdArgs.push('""');
+        }
+
+        cmdArgs.push(exec);
+
+        // Add starting directory parameter for Windows Terminal app.
+        if (basename === 'wt' || basename === 'wt.exe') {
+            cmdArgs.push('-d .');
+        }
+
+        return new Promise<void>(async (resolve, reject) => {
+            const env = cwd ? { cwd } : undefined;
+            const command = this.getWindowsShell();
+            const child = cp.spawn(command, cmdArgs, env);
+            child.on('error', reject);
+            child.on('exit', resolve);
+        });
+    }
+
+    /**
+     * Get the default terminal application on Windows.
+     * - The following method uses environment variables to identify the best default possible value.
+     *
+     * @returns the default application on Windows.
+     */
+    protected getDefaultTerminalWindows(): string {
+        if (!this.DEFAULT_TERMINAL_WINDOWS) {
+            const isWoW64 = !!process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
+            this.DEFAULT_TERMINAL_WINDOWS = `${process.env.windir ? process.env.windir : 'C:\\Windows'}\\${isWoW64 ? 'Sysnative' : 'System32'}\\cmd.exe`;
+        }
+        return this.DEFAULT_TERMINAL_WINDOWS;
+    }
+
+    /**
+     * Find the Windows Shell process to start up (defaults to cmd.exe).
+     */
+    protected getWindowsShell(): string {
+        // Find the path to cmd.exe if possible (%compsec% environment variable).
+        return process.env.compsec || this.CMD;
+    }
+}

package/src/package.spec.ts

@@ -1,29 +1,29 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson 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
-// *****************************************************************************
-
-/* note: this bogus test file is required so that
-  we are able to run mocha unit tests on this
-  package, without having any actual unit tests in it.
-  This way a coverage report will be generated,
-  showing 0% coverage, instead of no report.
-  This file can be removed once we have real unit
-  tests in place. */
-
-describe('external-terminal package', () => {
-
-  it('support code coverage statistics', () => true);
-
-});
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson 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
+// *****************************************************************************
+
+/* note: this bogus test file is required so that
+  we are able to run mocha unit tests on this
+  package, without having any actual unit tests in it.
+  This way a coverage report will be generated,
+  showing 0% coverage, instead of no report.
+  This file can be removed once we have real unit
+  tests in place. */
+
+describe('external-terminal package', () => {
+
+  it('support code coverage statistics', () => true);
+
+});