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

package/src/electron-browser/external-terminal-preference.ts

@@ -1,109 +1,109 @@
-// *****************************************************************************
-// 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 { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
-import { PreferenceSchema, PreferenceProxy } from '@theia/core/lib/browser';
-import { PreferenceProxyFactory } from '@theia/core/lib/browser/preferences/injectable-preference-proxy';
-import { PreferenceSchemaProvider } from '@theia/core/lib/browser/preferences/preference-contribution';
-import { isWindows, isOSX } from '@theia/core/lib/common/os';
-import { ExternalTerminalService, ExternalTerminalConfiguration } from '../common/external-terminal';
-import { nls } from '@theia/core/lib/common/nls';
-
-export const ExternalTerminalPreferences = Symbol('ExternalTerminalPreferences');
-export type ExternalTerminalPreferences = PreferenceProxy<ExternalTerminalConfiguration>;
-
-export const ExternalTerminalSchemaProvider = Symbol('ExternalTerminalSchemaPromise');
-export type ExternalTerminalSchemaProvider = () => Promise<PreferenceSchema>;
-
-export function bindExternalTerminalPreferences(bind: interfaces.Bind): void {
-    bind(ExternalTerminalPreferenceService).toSelf().inSingletonScope();
-    bind(ExternalTerminalSchemaProvider)
-        .toProvider(ctx => {
-            const schema = getExternalTerminalSchema(ctx.container.get(ExternalTerminalService));
-            return () => schema;
-        });
-    bind(ExternalTerminalPreferences)
-        .toDynamicValue(ctx => {
-            const factory = ctx.container.get<PreferenceProxyFactory>(PreferenceProxyFactory);
-            const schemaProvider = ctx.container.get<ExternalTerminalSchemaProvider>(ExternalTerminalSchemaProvider);
-            return factory(schemaProvider());
-        })
-        .inSingletonScope();
-}
-
-@injectable()
-export class ExternalTerminalPreferenceService {
-
-    @inject(ExternalTerminalPreferences)
-    protected readonly preferences: ExternalTerminalPreferences;
-
-    @inject(PreferenceSchemaProvider)
-    protected readonly preferenceSchemaProvider: PreferenceSchemaProvider;
-
-    @inject(ExternalTerminalSchemaProvider)
-    protected readonly promisedSchema: ExternalTerminalSchemaProvider;
-
-    @postConstruct()
-    protected init(): void {
-        this.doInit();
-    }
-
-    protected async doInit(): Promise<void> {
-        this.preferenceSchemaProvider.setSchema(await this.promisedSchema());
-    }
-
-    /**
-     * Get the external terminal configurations from preferences.
-     */
-    getExternalTerminalConfiguration(): ExternalTerminalConfiguration {
-        return {
-            'terminal.external.linuxExec': this.preferences['terminal.external.linuxExec'],
-            'terminal.external.osxExec': this.preferences['terminal.external.osxExec'],
-            'terminal.external.windowsExec': this.preferences['terminal.external.windowsExec'],
-        };
-    }
-}
-
-/**
- * Use the backend {@link ExternalTerminalService} to establish the schema for the `ExternalTerminalPreferences`.
- *
- * @param externalTerminalService the external terminal backend service.
- * @returns a preference schema with the OS default exec set by the backend service.
- */
-export async function getExternalTerminalSchema(externalTerminalService: ExternalTerminalService): Promise<PreferenceSchema> {
-    const hostExec = await externalTerminalService.getDefaultExec();
-    return {
-        type: 'object',
-        properties: {
-            'terminal.external.windowsExec': {
-                type: 'string',
-                typeDetails: { isFilepath: true },
-                description: nls.localizeByDefault('Customizes which terminal to run on Windows.'),
-                default: `${isWindows ? hostExec : 'C:\\WINDOWS\\System32\\cmd.exe'}`
-            },
-            'terminal.external.osxExec': {
-                type: 'string',
-                description: nls.localizeByDefault('Customizes which terminal application to run on macOS.'),
-                default: `${isOSX ? hostExec : 'Terminal.app'}`
-            },
-            'terminal.external.linuxExec': {
-                type: 'string',
-                description: nls.localizeByDefault('Customizes which terminal to run on Linux.'),
-                default: `${!(isWindows || isOSX) ? hostExec : 'xterm'}`
-            }
-        }
-    };
-}
+// *****************************************************************************
+// 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 { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
+import { PreferenceSchema, PreferenceProxy } from '@theia/core/lib/browser';
+import { PreferenceProxyFactory } from '@theia/core/lib/browser/preferences/injectable-preference-proxy';
+import { PreferenceSchemaProvider } from '@theia/core/lib/browser/preferences/preference-contribution';
+import { isWindows, isOSX } from '@theia/core/lib/common/os';
+import { ExternalTerminalService, ExternalTerminalConfiguration } from '../common/external-terminal';
+import { nls } from '@theia/core/lib/common/nls';
+
+export const ExternalTerminalPreferences = Symbol('ExternalTerminalPreferences');
+export type ExternalTerminalPreferences = PreferenceProxy<ExternalTerminalConfiguration>;
+
+export const ExternalTerminalSchemaProvider = Symbol('ExternalTerminalSchemaPromise');
+export type ExternalTerminalSchemaProvider = () => Promise<PreferenceSchema>;
+
+export function bindExternalTerminalPreferences(bind: interfaces.Bind): void {
+    bind(ExternalTerminalPreferenceService).toSelf().inSingletonScope();
+    bind(ExternalTerminalSchemaProvider)
+        .toProvider(ctx => {
+            const schema = getExternalTerminalSchema(ctx.container.get(ExternalTerminalService));
+            return () => schema;
+        });
+    bind(ExternalTerminalPreferences)
+        .toDynamicValue(ctx => {
+            const factory = ctx.container.get<PreferenceProxyFactory>(PreferenceProxyFactory);
+            const schemaProvider = ctx.container.get<ExternalTerminalSchemaProvider>(ExternalTerminalSchemaProvider);
+            return factory(schemaProvider());
+        })
+        .inSingletonScope();
+}
+
+@injectable()
+export class ExternalTerminalPreferenceService {
+
+    @inject(ExternalTerminalPreferences)
+    protected readonly preferences: ExternalTerminalPreferences;
+
+    @inject(PreferenceSchemaProvider)
+    protected readonly preferenceSchemaProvider: PreferenceSchemaProvider;
+
+    @inject(ExternalTerminalSchemaProvider)
+    protected readonly promisedSchema: ExternalTerminalSchemaProvider;
+
+    @postConstruct()
+    protected init(): void {
+        this.doInit();
+    }
+
+    protected async doInit(): Promise<void> {
+        this.preferenceSchemaProvider.setSchema(await this.promisedSchema());
+    }
+
+    /**
+     * Get the external terminal configurations from preferences.
+     */
+    getExternalTerminalConfiguration(): ExternalTerminalConfiguration {
+        return {
+            'terminal.external.linuxExec': this.preferences['terminal.external.linuxExec'],
+            'terminal.external.osxExec': this.preferences['terminal.external.osxExec'],
+            'terminal.external.windowsExec': this.preferences['terminal.external.windowsExec'],
+        };
+    }
+}
+
+/**
+ * Use the backend {@link ExternalTerminalService} to establish the schema for the `ExternalTerminalPreferences`.
+ *
+ * @param externalTerminalService the external terminal backend service.
+ * @returns a preference schema with the OS default exec set by the backend service.
+ */
+export async function getExternalTerminalSchema(externalTerminalService: ExternalTerminalService): Promise<PreferenceSchema> {
+    const hostExec = await externalTerminalService.getDefaultExec();
+    return {
+        type: 'object',
+        properties: {
+            'terminal.external.windowsExec': {
+                type: 'string',
+                typeDetails: { isFilepath: true },
+                description: nls.localizeByDefault('Customizes which terminal to run on Windows.'),
+                default: `${isWindows ? hostExec : 'C:\\WINDOWS\\System32\\cmd.exe'}`
+            },
+            'terminal.external.osxExec': {
+                type: 'string',
+                description: nls.localizeByDefault('Customizes which terminal application to run on macOS.'),
+                default: `${isOSX ? hostExec : 'Terminal.app'}`
+            },
+            'terminal.external.linuxExec': {
+                type: 'string',
+                description: nls.localizeByDefault('Customizes which terminal to run on Linux.'),
+                default: `${!(isWindows || isOSX) ? hostExec : 'xterm'}`
+            }
+        }
+    };
+}

package/src/electron-node/external-terminal-backend-module.ts

@@ -1,40 +1,40 @@
-// *****************************************************************************
-// 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 { ContainerModule, interfaces } from '@theia/core/shared/inversify';
-import { ConnectionHandler, RpcConnectionHandler } from '@theia/core/lib/common';
-import { isWindows, isOSX } from '@theia/core/lib/common/os';
-import { ExternalTerminalService, externalTerminalServicePath } from '../common/external-terminal';
-import { MacExternalTerminalService } from './mac-external-terminal-service';
-import { LinuxExternalTerminalService } from './linux-external-terminal-service';
-import { WindowsExternalTerminalService } from './windows-external-terminal-service';
-
-export function bindExternalTerminalService(bind: interfaces.Bind): void {
-    const serviceProvider: interfaces.ServiceIdentifier<ExternalTerminalService> =
-        isWindows ? WindowsExternalTerminalService : isOSX ? MacExternalTerminalService : LinuxExternalTerminalService;
-    bind(serviceProvider).toSelf().inSingletonScope();
-    bind(ExternalTerminalService).toService(serviceProvider);
-
-    bind(ConnectionHandler).toDynamicValue(ctx =>
-        new RpcConnectionHandler(externalTerminalServicePath, () =>
-            ctx.container.get(ExternalTerminalService)
-        )
-    ).inSingletonScope();
-}
-
-export default new ContainerModule(bind => {
-    bindExternalTerminalService(bind);
-});
+// *****************************************************************************
+// 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 { ContainerModule, interfaces } from '@theia/core/shared/inversify';
+import { ConnectionHandler, RpcConnectionHandler } from '@theia/core/lib/common';
+import { isWindows, isOSX } from '@theia/core/lib/common/os';
+import { ExternalTerminalService, externalTerminalServicePath } from '../common/external-terminal';
+import { MacExternalTerminalService } from './mac-external-terminal-service';
+import { LinuxExternalTerminalService } from './linux-external-terminal-service';
+import { WindowsExternalTerminalService } from './windows-external-terminal-service';
+
+export function bindExternalTerminalService(bind: interfaces.Bind): void {
+    const serviceProvider: interfaces.ServiceIdentifier<ExternalTerminalService> =
+        isWindows ? WindowsExternalTerminalService : isOSX ? MacExternalTerminalService : LinuxExternalTerminalService;
+    bind(serviceProvider).toSelf().inSingletonScope();
+    bind(ExternalTerminalService).toService(serviceProvider);
+
+    bind(ConnectionHandler).toDynamicValue(ctx =>
+        new RpcConnectionHandler(externalTerminalServicePath, () =>
+            ctx.container.get(ExternalTerminalService)
+        )
+    ).inSingletonScope();
+}
+
+export default new ContainerModule(bind => {
+    bindExternalTerminalService(bind);
+});

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

@@ -1,95 +1,95 @@
-// *****************************************************************************
-// 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 fs from '@theia/core/shared/fs-extra';
-import { injectable } from '@theia/core/shared/inversify';
-import { OS } from '@theia/core/lib/common/os';
-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 LinuxExternalTerminalService implements ExternalTerminalService {
-    protected DEFAULT_TERMINAL_LINUX_READY: Promise<string>;
-
-    async openTerminal(configuration: ExternalTerminalConfiguration, cwd: string): Promise<void> {
-        await this.spawnTerminal(configuration, FileUri.fsPath(cwd));
-    }
-
-    async getDefaultExec(): Promise<string> {
-        return this.getDefaultTerminalLinux();
-    }
-
-    /**
-     * 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.linuxExec'];
-        const execPromise = terminalConfig ? Promise.resolve(terminalConfig) : this.getDefaultTerminalLinux();
-
-        return new Promise<void>((resolve, reject) => {
-            execPromise.then(exec => {
-                const env = cwd ? { cwd } : undefined;
-                const child = cp.spawn(exec, [], env);
-                child.on('error', reject);
-                child.on('exit', resolve);
-            });
-        });
-    }
-
-    /**
-     * Get the default terminal application on Linux.
-     * - The following method uses environment variables to identify the best default possible for each distro.
-     *
-     * @returns the default application on Linux.
-     */
-    protected async getDefaultTerminalLinux(): Promise<string> {
-        if (!this.DEFAULT_TERMINAL_LINUX_READY) {
-            this.DEFAULT_TERMINAL_LINUX_READY = new Promise(async resolve => {
-                if (OS.type() === OS.Type.Linux) {
-                    const isDebian = await fs.pathExists('/etc/debian_version');
-                    if (isDebian) {
-                        resolve('x-terminal-emulator');
-                    } else if (process.env.DESKTOP_SESSION === 'gnome' || process.env.DESKTOP_SESSION === 'gnome-classic') {
-                        resolve('gnome-terminal');
-                    } else if (process.env.DESKTOP_SESSION === 'kde-plasma') {
-                        resolve('konsole');
-                    } else if (process.env.COLORTERM) {
-                        resolve(process.env.COLORTERM);
-                    } else if (process.env.TERM) {
-                        resolve(process.env.TERM);
-                    } else {
-                        resolve('xterm');
-                    }
-                } else {
-                    resolve('xterm');
-                }
-            });
-        }
-        return this.DEFAULT_TERMINAL_LINUX_READY;
-    }
-}
+// *****************************************************************************
+// 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 fs from '@theia/core/shared/fs-extra';
+import { injectable } from '@theia/core/shared/inversify';
+import { OS } from '@theia/core/lib/common/os';
+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 LinuxExternalTerminalService implements ExternalTerminalService {
+    protected DEFAULT_TERMINAL_LINUX_READY: Promise<string>;
+
+    async openTerminal(configuration: ExternalTerminalConfiguration, cwd: string): Promise<void> {
+        await this.spawnTerminal(configuration, FileUri.fsPath(cwd));
+    }
+
+    async getDefaultExec(): Promise<string> {
+        return this.getDefaultTerminalLinux();
+    }
+
+    /**
+     * 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.linuxExec'];
+        const execPromise = terminalConfig ? Promise.resolve(terminalConfig) : this.getDefaultTerminalLinux();
+
+        return new Promise<void>((resolve, reject) => {
+            execPromise.then(exec => {
+                const env = cwd ? { cwd } : undefined;
+                const child = cp.spawn(exec, [], env);
+                child.on('error', reject);
+                child.on('exit', resolve);
+            });
+        });
+    }
+
+    /**
+     * Get the default terminal application on Linux.
+     * - The following method uses environment variables to identify the best default possible for each distro.
+     *
+     * @returns the default application on Linux.
+     */
+    protected async getDefaultTerminalLinux(): Promise<string> {
+        if (!this.DEFAULT_TERMINAL_LINUX_READY) {
+            this.DEFAULT_TERMINAL_LINUX_READY = new Promise(async resolve => {
+                if (OS.type() === OS.Type.Linux) {
+                    const isDebian = await fs.pathExists('/etc/debian_version');
+                    if (isDebian) {
+                        resolve('x-terminal-emulator');
+                    } else if (process.env.DESKTOP_SESSION === 'gnome' || process.env.DESKTOP_SESSION === 'gnome-classic') {
+                        resolve('gnome-terminal');
+                    } else if (process.env.DESKTOP_SESSION === 'kde-plasma') {
+                        resolve('konsole');
+                    } else if (process.env.COLORTERM) {
+                        resolve(process.env.COLORTERM);
+                    } else if (process.env.TERM) {
+                        resolve(process.env.TERM);
+                    } else {
+                        resolve('xterm');
+                    }
+                } else {
+                    resolve('xterm');
+                }
+            });
+        }
+        return this.DEFAULT_TERMINAL_LINUX_READY;
+    }
+}

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

@@ -1,70 +1,70 @@
-// *****************************************************************************
-// 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 { 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 MacExternalTerminalService implements ExternalTerminalService {
-    protected osxOpener = '/usr/bin/open';
-    protected defaultTerminalApp = 'Terminal.app';
-
-    async openTerminal(configuration: ExternalTerminalConfiguration, cwd: string): Promise<void> {
-        await this.spawnTerminal(configuration, FileUri.fsPath(cwd));
-    }
-
-    async getDefaultExec(): Promise<string> {
-        return this.getDefaultTerminalOSX();
-    }
-
-    /**
-     * 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.osxExec'];
-        const terminalApp = terminalConfig || this.getDefaultTerminalOSX();
-
-        return new Promise<void>((resolve, reject) => {
-            const args = ['-a', terminalApp];
-            if (cwd) {
-                args.push(cwd);
-            }
-            const child = cp.spawn(this.osxOpener, args);
-            child.on('error', reject);
-            child.on('exit', () => resolve());
-        });
-    }
-
-    /**
-     * Get the default terminal app on OSX.
-     */
-    protected getDefaultTerminalOSX(): string {
-        return this.defaultTerminalApp;
-    }
-}
+// *****************************************************************************
+// 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 { 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 MacExternalTerminalService implements ExternalTerminalService {
+    protected osxOpener = '/usr/bin/open';
+    protected defaultTerminalApp = 'Terminal.app';
+
+    async openTerminal(configuration: ExternalTerminalConfiguration, cwd: string): Promise<void> {
+        await this.spawnTerminal(configuration, FileUri.fsPath(cwd));
+    }
+
+    async getDefaultExec(): Promise<string> {
+        return this.getDefaultTerminalOSX();
+    }
+
+    /**
+     * 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.osxExec'];
+        const terminalApp = terminalConfig || this.getDefaultTerminalOSX();
+
+        return new Promise<void>((resolve, reject) => {
+            const args = ['-a', terminalApp];
+            if (cwd) {
+                args.push(cwd);
+            }
+            const child = cp.spawn(this.osxOpener, args);
+            child.on('error', reject);
+            child.on('exit', () => resolve());
+        });
+    }
+
+    /**
+     * Get the default terminal app on OSX.
+     */
+    protected getDefaultTerminalOSX(): string {
+        return this.defaultTerminalApp;
+    }
+}