@theia/terminal 1.45.0 → 1.46.0-next.72

package/lib/node/shell-terminal-server.js

@@ -1,213 +1,213 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2017 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
-// *****************************************************************************
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ShellTerminalServer = void 0;
-const inversify_1 = require("@theia/core/shared/inversify");
-const logger_1 = require("@theia/core/lib/common/logger");
-const environment_utils_1 = require("@theia/core/lib/node/environment-utils");
-const base_terminal_server_1 = require("./base-terminal-server");
-const shell_process_1 = require("./shell-process");
-const node_1 = require("@theia/process/lib/node");
-const os_1 = require("@theia/core/lib/common/os");
-const cp = require("child_process");
-const shell_terminal_protocol_1 = require("../common/shell-terminal-protocol");
-const core_1 = require("@theia/core");
-const collections_1 = require("@theia/core/lib/common/collections");
-let ShellTerminalServer = class ShellTerminalServer extends base_terminal_server_1.BaseTerminalServer {
-    constructor(shellFactory, processManager, logger) {
-        super(processManager, logger);
-        this.shellFactory = shellFactory;
-        this.collections = new collections_1.MultiKeyMap(2);
-    }
-    async create(options) {
-        try {
-            if (options.strictEnv !== true) {
-                options.env = this.environmentUtils.mergeProcessEnv(options.env);
-                this.applyToProcessEnvironment(core_1.URI.fromFilePath((0, shell_process_1.getRootPath)(options.rootURI)), options.env);
-            }
-            const term = this.shellFactory(options);
-            this.postCreate(term);
-            return term.id;
-        }
-        catch (error) {
-            this.logger.error('Error while creating terminal', error);
-            return -1;
-        }
-    }
-    // copied and modified from https://github.com/microsoft/vscode/blob/4636be2b71c87bfb0bfe3c94278b447a5efcc1f1/src/vs/workbench/contrib/debug/node/terminals.ts#L32-L75
-    spawnAsPromised(command, args) {
-        return new Promise((resolve, reject) => {
-            let stdout = '';
-            const child = cp.spawn(command, args);
-            if (child.pid) {
-                child.stdout.on('data', (data) => {
-                    stdout += data.toString();
-                });
-            }
-            child.on('error', err => {
-                reject(err);
-            });
-            child.on('close', code => {
-                resolve(stdout);
-            });
-        });
-    }
-    hasChildProcesses(processId) {
-        if (processId) {
-            // if shell has at least one child process, assume that shell is busy
-            if (os_1.isWindows) {
-                return this.spawnAsPromised('wmic', ['process', 'get', 'ParentProcessId']).then(stdout => {
-                    const pids = stdout.split('\r\n');
-                    return pids.some(p => parseInt(p) === processId);
-                }, error => true);
-            }
-            else {
-                return this.spawnAsPromised('/usr/bin/pgrep', ['-lP', String(processId)]).then(stdout => {
-                    const r = stdout.trim();
-                    if (r.length === 0 || r.indexOf(' tmux') >= 0) { // ignore 'tmux';
-                        return false;
-                    }
-                    else {
-                        return true;
-                    }
-                }, error => true);
-            }
-        }
-        // fall back to safe side
-        return Promise.resolve(true);
-    }
-    applyToProcessEnvironment(cwdUri, env) {
-        let lowerToActualVariableNames;
-        if (os_1.isWindows) {
-            lowerToActualVariableNames = {};
-            Object.keys(env).forEach(e => lowerToActualVariableNames[e.toLowerCase()] = e);
-        }
-        this.collections.forEach((mutators, [extensionIdentifier, rootUri]) => {
-            if (rootUri === shell_terminal_protocol_1.NO_ROOT_URI || this.matchesRootUri(cwdUri, rootUri)) {
-                mutators.variableMutators.forEach((mutator, variable) => {
-                    const actualVariable = os_1.isWindows ? lowerToActualVariableNames[variable.toLowerCase()] || variable : variable;
-                    switch (mutator.type) {
-                        case shell_terminal_protocol_1.EnvironmentVariableMutatorType.Append:
-                            env[actualVariable] = (env[actualVariable] || '') + mutator.value;
-                            break;
-                        case shell_terminal_protocol_1.EnvironmentVariableMutatorType.Prepend:
-                            env[actualVariable] = mutator.value + (env[actualVariable] || '');
-                            break;
-                        case shell_terminal_protocol_1.EnvironmentVariableMutatorType.Replace:
-                            env[actualVariable] = mutator.value;
-                            break;
-                    }
-                });
-            }
-        });
-    }
-    matchesRootUri(cwdUri, rootUri) {
-        return new core_1.URI(rootUri).isEqualOrParent(cwdUri);
-    }
-    /*---------------------------------------------------------------------------------------------
-  *  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.49.0/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts
-    setCollection(extensionIdentifier, baseUri, persistent, collection) {
-        this.doSetCollection(extensionIdentifier, baseUri, persistent, collection);
-        this.updateCollections();
-    }
-    doSetCollection(extensionIdentifier, baseUri, persistent, collection) {
-        this.collections.set([extensionIdentifier, baseUri], {
-            persistent: persistent,
-            description: collection.description,
-            variableMutators: new Map(collection.mutators)
-        });
-    }
-    restorePersisted(jsonValue) {
-        const collectionsJson = JSON.parse(jsonValue);
-        collectionsJson.forEach(c => { var _a; return this.doSetCollection(c.extensionIdentifier, (_a = c.rootUri) !== null && _a !== void 0 ? _a : shell_terminal_protocol_1.NO_ROOT_URI, true, c.collection); });
-    }
-    deleteCollection(extensionIdentifier) {
-        this.collections.delete([extensionIdentifier]);
-        this.updateCollections();
-    }
-    updateCollections() {
-        this.persistCollections();
-    }
-    persistCollections() {
-        const collectionsJson = [];
-        this.collections.forEach((collection, [extensionIdentifier, rootUri]) => {
-            if (collection.persistent) {
-                collectionsJson.push({
-                    extensionIdentifier,
-                    rootUri,
-                    collection: {
-                        description: collection.description,
-                        mutators: [...this.collections.get([extensionIdentifier, rootUri]).variableMutators.entries()]
-                    },
-                });
-            }
-        });
-        if (this.client) {
-            const stringifiedJson = JSON.stringify(collectionsJson);
-            this.client.storeTerminalEnvVariables(stringifiedJson);
-        }
-    }
-    async getEnvVarCollectionDescriptionsByExtension(id) {
-        const terminal = this.processManager.get(id);
-        if (!(terminal instanceof node_1.TerminalProcess)) {
-            throw new Error(`terminal "${id}" does not exist`);
-        }
-        const result = new Map();
-        this.collections.forEach((value, key) => {
-            const prev = result.get(key[0]) || [];
-            prev.push(value.description);
-            result.set(key[0], prev);
-        });
-        return result;
-    }
-    async getEnvVarCollections() {
-        const result = [];
-        this.collections.forEach((value, [extensionIdentifier, rootUri]) => {
-            result.push([extensionIdentifier, rootUri, value.persistent, { description: value.description, mutators: [...value.variableMutators.entries()] }]);
-        });
-        return result;
-    }
-};
-__decorate([
-    (0, inversify_1.inject)(environment_utils_1.EnvironmentUtils),
-    __metadata("design:type", environment_utils_1.EnvironmentUtils)
-], ShellTerminalServer.prototype, "environmentUtils", void 0);
-ShellTerminalServer = __decorate([
-    (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.inject)(shell_process_1.ShellProcessFactory)),
-    __param(1, (0, inversify_1.inject)(node_1.ProcessManager)),
-    __param(2, (0, inversify_1.inject)(logger_1.ILogger)),
-    __param(2, (0, inversify_1.named)('terminal')),
-    __metadata("design:paramtypes", [Function, node_1.ProcessManager, Object])
-], ShellTerminalServer);
-exports.ShellTerminalServer = ShellTerminalServer;
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2017 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
+// *****************************************************************************
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShellTerminalServer = void 0;
+const inversify_1 = require("@theia/core/shared/inversify");
+const logger_1 = require("@theia/core/lib/common/logger");
+const environment_utils_1 = require("@theia/core/lib/node/environment-utils");
+const base_terminal_server_1 = require("./base-terminal-server");
+const shell_process_1 = require("./shell-process");
+const node_1 = require("@theia/process/lib/node");
+const os_1 = require("@theia/core/lib/common/os");
+const cp = require("child_process");
+const shell_terminal_protocol_1 = require("../common/shell-terminal-protocol");
+const core_1 = require("@theia/core");
+const collections_1 = require("@theia/core/lib/common/collections");
+let ShellTerminalServer = class ShellTerminalServer extends base_terminal_server_1.BaseTerminalServer {
+    constructor(shellFactory, processManager, logger) {
+        super(processManager, logger);
+        this.shellFactory = shellFactory;
+        this.collections = new collections_1.MultiKeyMap(2);
+    }
+    async create(options) {
+        try {
+            if (options.strictEnv !== true) {
+                options.env = this.environmentUtils.mergeProcessEnv(options.env);
+                this.applyToProcessEnvironment(core_1.URI.fromFilePath((0, shell_process_1.getRootPath)(options.rootURI)), options.env);
+            }
+            const term = this.shellFactory(options);
+            this.postCreate(term);
+            return term.id;
+        }
+        catch (error) {
+            this.logger.error('Error while creating terminal', error);
+            return -1;
+        }
+    }
+    // copied and modified from https://github.com/microsoft/vscode/blob/4636be2b71c87bfb0bfe3c94278b447a5efcc1f1/src/vs/workbench/contrib/debug/node/terminals.ts#L32-L75
+    spawnAsPromised(command, args) {
+        return new Promise((resolve, reject) => {
+            let stdout = '';
+            const child = cp.spawn(command, args);
+            if (child.pid) {
+                child.stdout.on('data', (data) => {
+                    stdout += data.toString();
+                });
+            }
+            child.on('error', err => {
+                reject(err);
+            });
+            child.on('close', code => {
+                resolve(stdout);
+            });
+        });
+    }
+    hasChildProcesses(processId) {
+        if (processId) {
+            // if shell has at least one child process, assume that shell is busy
+            if (os_1.isWindows) {
+                return this.spawnAsPromised('wmic', ['process', 'get', 'ParentProcessId']).then(stdout => {
+                    const pids = stdout.split('\r\n');
+                    return pids.some(p => parseInt(p) === processId);
+                }, error => true);
+            }
+            else {
+                return this.spawnAsPromised('/usr/bin/pgrep', ['-lP', String(processId)]).then(stdout => {
+                    const r = stdout.trim();
+                    if (r.length === 0 || r.indexOf(' tmux') >= 0) { // ignore 'tmux';
+                        return false;
+                    }
+                    else {
+                        return true;
+                    }
+                }, error => true);
+            }
+        }
+        // fall back to safe side
+        return Promise.resolve(true);
+    }
+    applyToProcessEnvironment(cwdUri, env) {
+        let lowerToActualVariableNames;
+        if (os_1.isWindows) {
+            lowerToActualVariableNames = {};
+            Object.keys(env).forEach(e => lowerToActualVariableNames[e.toLowerCase()] = e);
+        }
+        this.collections.forEach((mutators, [extensionIdentifier, rootUri]) => {
+            if (rootUri === shell_terminal_protocol_1.NO_ROOT_URI || this.matchesRootUri(cwdUri, rootUri)) {
+                mutators.variableMutators.forEach((mutator, variable) => {
+                    const actualVariable = os_1.isWindows ? lowerToActualVariableNames[variable.toLowerCase()] || variable : variable;
+                    switch (mutator.type) {
+                        case shell_terminal_protocol_1.EnvironmentVariableMutatorType.Append:
+                            env[actualVariable] = (env[actualVariable] || '') + mutator.value;
+                            break;
+                        case shell_terminal_protocol_1.EnvironmentVariableMutatorType.Prepend:
+                            env[actualVariable] = mutator.value + (env[actualVariable] || '');
+                            break;
+                        case shell_terminal_protocol_1.EnvironmentVariableMutatorType.Replace:
+                            env[actualVariable] = mutator.value;
+                            break;
+                    }
+                });
+            }
+        });
+    }
+    matchesRootUri(cwdUri, rootUri) {
+        return new core_1.URI(rootUri).isEqualOrParent(cwdUri);
+    }
+    /*---------------------------------------------------------------------------------------------
+  *  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.49.0/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts
+    setCollection(extensionIdentifier, baseUri, persistent, collection) {
+        this.doSetCollection(extensionIdentifier, baseUri, persistent, collection);
+        this.updateCollections();
+    }
+    doSetCollection(extensionIdentifier, baseUri, persistent, collection) {
+        this.collections.set([extensionIdentifier, baseUri], {
+            persistent: persistent,
+            description: collection.description,
+            variableMutators: new Map(collection.mutators)
+        });
+    }
+    restorePersisted(jsonValue) {
+        const collectionsJson = JSON.parse(jsonValue);
+        collectionsJson.forEach(c => { var _a; return this.doSetCollection(c.extensionIdentifier, (_a = c.rootUri) !== null && _a !== void 0 ? _a : shell_terminal_protocol_1.NO_ROOT_URI, true, c.collection); });
+    }
+    deleteCollection(extensionIdentifier) {
+        this.collections.delete([extensionIdentifier]);
+        this.updateCollections();
+    }
+    updateCollections() {
+        this.persistCollections();
+    }
+    persistCollections() {
+        const collectionsJson = [];
+        this.collections.forEach((collection, [extensionIdentifier, rootUri]) => {
+            if (collection.persistent) {
+                collectionsJson.push({
+                    extensionIdentifier,
+                    rootUri,
+                    collection: {
+                        description: collection.description,
+                        mutators: [...this.collections.get([extensionIdentifier, rootUri]).variableMutators.entries()]
+                    },
+                });
+            }
+        });
+        if (this.client) {
+            const stringifiedJson = JSON.stringify(collectionsJson);
+            this.client.storeTerminalEnvVariables(stringifiedJson);
+        }
+    }
+    async getEnvVarCollectionDescriptionsByExtension(id) {
+        const terminal = this.processManager.get(id);
+        if (!(terminal instanceof node_1.TerminalProcess)) {
+            throw new Error(`terminal "${id}" does not exist`);
+        }
+        const result = new Map();
+        this.collections.forEach((value, key) => {
+            const prev = result.get(key[0]) || [];
+            prev.push(value.description);
+            result.set(key[0], prev);
+        });
+        return result;
+    }
+    async getEnvVarCollections() {
+        const result = [];
+        this.collections.forEach((value, [extensionIdentifier, rootUri]) => {
+            result.push([extensionIdentifier, rootUri, value.persistent, { description: value.description, mutators: [...value.variableMutators.entries()] }]);
+        });
+        return result;
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(environment_utils_1.EnvironmentUtils),
+    __metadata("design:type", environment_utils_1.EnvironmentUtils)
+], ShellTerminalServer.prototype, "environmentUtils", void 0);
+ShellTerminalServer = __decorate([
+    (0, inversify_1.injectable)(),
+    __param(0, (0, inversify_1.inject)(shell_process_1.ShellProcessFactory)),
+    __param(1, (0, inversify_1.inject)(node_1.ProcessManager)),
+    __param(2, (0, inversify_1.inject)(logger_1.ILogger)),
+    __param(2, (0, inversify_1.named)('terminal')),
+    __metadata("design:paramtypes", [Function, node_1.ProcessManager, Object])
+], ShellTerminalServer);
+exports.ShellTerminalServer = ShellTerminalServer;
 //# sourceMappingURL=shell-terminal-server.js.map

package/lib/node/shell-terminal-server.spec.d.ts

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=shell-terminal-server.spec.d.ts.map

package/lib/node/shell-terminal-server.spec.js

@@ -1,36 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// *****************************************************************************
-// Copyright (C) 2017 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
-// *****************************************************************************
-const chai = require("chai");
-const terminal_test_container_1 = require("./test/terminal-test-container");
-const shell_terminal_protocol_1 = require("../common/shell-terminal-protocol");
-/**
- * Globals
- */
-const expect = chai.expect;
-describe('ShellServer', function () {
-    this.timeout(5000);
-    let shellTerminalServer;
-    beforeEach(() => {
-        shellTerminalServer = (0, terminal_test_container_1.createTerminalTestContainer)().get(shell_terminal_protocol_1.IShellTerminalServer);
-    });
-    it('test shell terminal create', async function () {
-        const createResult = shellTerminalServer.create({});
-        expect(await createResult).to.be.greaterThan(-1);
-    });
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// *****************************************************************************
+// Copyright (C) 2017 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
+// *****************************************************************************
+const chai = require("chai");
+const terminal_test_container_1 = require("./test/terminal-test-container");
+const shell_terminal_protocol_1 = require("../common/shell-terminal-protocol");
+/**
+ * Globals
+ */
+const expect = chai.expect;
+describe('ShellServer', function () {
+    this.timeout(5000);
+    let shellTerminalServer;
+    beforeEach(() => {
+        shellTerminalServer = (0, terminal_test_container_1.createTerminalTestContainer)().get(shell_terminal_protocol_1.IShellTerminalServer);
+    });
+    it('test shell terminal create', async function () {
+        const createResult = shellTerminalServer.create({});
+        expect(await createResult).to.be.greaterThan(-1);
+    });
+});
 //# sourceMappingURL=shell-terminal-server.spec.js.map

package/lib/node/terminal-backend-contribution.d.ts

@@ -1,10 +1,10 @@
-import { ILogger } from '@theia/core/lib/common';
-import { ProcessManager } from '@theia/process/lib/node';
-import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
-export declare class TerminalBackendContribution implements MessagingService.Contribution {
-    protected readonly decoder: TextDecoder;
-    protected readonly processManager: ProcessManager;
-    protected readonly logger: ILogger;
-    configure(service: MessagingService): void;
-}
+import { ILogger } from '@theia/core/lib/common';
+import { ProcessManager } from '@theia/process/lib/node';
+import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
+export declare class TerminalBackendContribution implements MessagingService.Contribution {
+    protected readonly decoder: TextDecoder;
+    protected readonly processManager: ProcessManager;
+    protected readonly logger: ILogger;
+    configure(service: MessagingService): void;
+}
 //# sourceMappingURL=terminal-backend-contribution.d.ts.map