@theia/terminal 1.42.1 → 1.43.1

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

@@ -1 +1 @@
-{"version":3,"file":"shell-terminal-server.js","sourceRoot":"","sources":["../../src/node/shell-terminal-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shell-terminal-server.js","sourceRoot":"","sources":["../../src/node/shell-terminal-server.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@theia/terminal",
-  "version": "1.42.1",
+  "version": "1.43.1",
   "description": "Theia - Terminal Extension",
   "dependencies": {
-    "@theia/core": "1.42.1",
-    "@theia/editor": "1.42.1",
-    "@theia/filesystem": "1.42.1",
-    "@theia/process": "1.42.1",
-    "@theia/variable-resolver": "1.42.1",
-    "@theia/workspace": "1.42.1",
+    "@theia/core": "1.43.1",
+    "@theia/editor": "1.43.1",
+    "@theia/filesystem": "1.43.1",
+    "@theia/process": "1.43.1",
+    "@theia/variable-resolver": "1.43.1",
+    "@theia/workspace": "1.43.1",
     "xterm": "^4.16.0",
     "xterm-addon-fit": "^0.5.0",
     "xterm-addon-search": "^0.8.2"
@@ -48,10 +48,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.42.1"
+    "@theia/ext-scripts": "1.43.1"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "07502c238094ccd80bcdf3f74f7eec973fd7a4fc"
+  "gitHead": "df48285b7d3340e0109e89ffdb0f437ba6710378"
 }

package/src/browser/base/terminal-widget.ts

@@ -60,7 +60,7 @@ export abstract class TerminalWidget extends BaseWidget {
     abstract processInfo: Promise<TerminalProcessInfo>;
 
     /** The ids of extensions contributing to the environment of this terminal mapped to the provided description for their changes. */
-    abstract envVarCollectionDescriptionsByExtension: Promise<Map<string, string | MarkdownString | undefined>>;
+    abstract envVarCollectionDescriptionsByExtension: Promise<Map<string, (string | MarkdownString | undefined)[]>>;
 
     /** Terminal kind that indicates whether a terminal is created by a user or by some extension for a user */
     abstract readonly kind: 'user' | string;

package/src/browser/terminal-frontend-contribution.ts

@@ -51,10 +51,6 @@ import { terminalAnsiColorMap } from './terminal-theme-service';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileStat } from '@theia/filesystem/lib/common/files';
 import { TerminalWatcher } from '../common/terminal-watcher';
-import {
-    ENVIRONMENT_VARIABLE_COLLECTIONS_KEY,
-    SerializableExtensionEnvironmentVariableCollection
-} from '../common/base-terminal-protocol';
 import { nls } from '@theia/core/lib/common/nls';
 import { Profiles, TerminalPreferences } from './terminal-preferences';
 import { ShellTerminalProfile } from './shell-terminal-profile';
@@ -172,6 +168,7 @@ export namespace TerminalCommands {
     });
 }
 
+const ENVIRONMENT_VARIABLE_COLLECTIONS_KEY = 'terminal.integrated.environmentVariableCollections';
 @injectable()
 export class TerminalFrontendContribution implements FrontendApplicationContribution, TerminalService, CommandContribution, MenuContribution,
     KeybindingContribution, TabBarToolbarContribution, ColorContribution {
@@ -252,8 +249,7 @@ export class TerminalFrontendContribution implements FrontendApplicationContribu
         this.terminalWatcher.onUpdateTerminalEnvVariablesRequested(() => {
             this.storageService.getData<string>(ENVIRONMENT_VARIABLE_COLLECTIONS_KEY).then(data => {
                 if (data) {
-                    const collectionsJson: SerializableExtensionEnvironmentVariableCollection[] = JSON.parse(data);
-                    collectionsJson.forEach(c => this.shellTerminalServer.setCollection(c.extensionIdentifier, true, c.collection ? c.collection : [], c.description));
+                    this.shellTerminalServer.restorePersisted(data);
                 }
             });
         });

package/src/browser/terminal-preferences.ts

@@ -147,7 +147,7 @@ export const TerminalConfigSchema: PreferenceSchema = {
             default: false
         },
         'terminal.integrated.cursorStyle': {
-            description: nls.localizeByDefault('Controls the style of terminal cursor.'),
+            description: nls.localizeByDefault('Controls the style of terminal cursor when the terminal is focused.'),
             enum: ['block', 'underline', 'line'],
             default: 'block'
         },

package/src/browser/terminal-widget-impl.ts

@@ -437,7 +437,7 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
         return this.shellTerminalServer.getProcessInfo(this.terminalId);
     }
 
-    get envVarCollectionDescriptionsByExtension(): Promise<Map<string, string | MarkdownString | undefined>> {
+    get envVarCollectionDescriptionsByExtension(): Promise<Map<string, (string | MarkdownString | undefined)[]>> {
         if (!IBaseTerminalServer.validateId(this.terminalId)) {
             return Promise.reject(new Error('terminal is not started'));
         }
@@ -898,7 +898,7 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
         this.enhancedPreviewNode = document.createElement('div');
 
         Promise.all([this.envVarCollectionDescriptionsByExtension, this.processId, this.processInfo])
-            .then((values: [Map<string, string | MarkdownString | undefined>, number, TerminalProcessInfo]) => {
+            .then((values: [Map<string, (string | MarkdownString | undefined)[]>, number, TerminalProcessInfo]) => {
                 const extensions = values[0];
                 const processId = values[1];
                 const processInfo = values[2];
@@ -911,14 +911,16 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
                     processInfo.arguments.join(' ') +
                     '\n\n---\n\n');
                 markdown.appendMarkdown('The following extensions have contributed to this terminal\'s environment:\n');
-                extensions.forEach((value, key) => {
-                    if (value === undefined) {
-                        markdown.appendMarkdown('* ' + key + '\n');
-                    } else if (typeof value === 'string') {
-                        markdown.appendMarkdown('* ' + key + ': ' + value + '\n');
-                    } else {
-                        markdown.appendMarkdown('* ' + key + ': ' + value.value + '\n');
-                    }
+                extensions.forEach((arr, key) => {
+                    arr.forEach(value => {
+                        if (value === undefined) {
+                            markdown.appendMarkdown('* ' + key + '\n');
+                        } else if (typeof value === 'string') {
+                            markdown.appendMarkdown('* ' + key + ': ' + value + '\n');
+                        } else {
+                            markdown.appendMarkdown('* ' + key + ': ' + value.value + '\n');
+                        }
+                    });
                 });
 
                 const enhancedPreviewNode = this.enhancedPreviewNode;

package/src/common/base-terminal-protocol.ts

@@ -16,7 +16,6 @@
 
 import { RpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
 import { Disposable } from '@theia/core';
-import { MarkdownString } from '@theia/core/lib/common/markdown-rendering/markdown-string';
 
 export interface TerminalProcessInfo {
     executable: string
@@ -29,32 +28,12 @@ export interface IBaseTerminalServer extends RpcServer<IBaseTerminalClient> {
     create(IBaseTerminalServerOptions: object): Promise<number>;
     getProcessId(id: number): Promise<number>;
     getProcessInfo(id: number): Promise<TerminalProcessInfo>;
-    getEnvVarCollectionDescriptionsByExtension(id: number): Promise<Map<string, string | MarkdownString | undefined>>;
     getCwdURI(id: number): Promise<string>;
     resize(id: number, cols: number, rows: number): Promise<void>;
     attach(id: number): Promise<number>;
     onAttachAttempted(id: number): Promise<void>;
     close(id: number): Promise<void>;
     getDefaultShell(): Promise<string>;
-
-    /**
-     * Gets a single collection constructed by merging all environment variable collections into
-     * one.
-     */
-    readonly collections: ReadonlyMap<string, EnvironmentVariableCollection>;
-    /**
-     * Gets a single collection constructed by merging all environment variable collections into
-     * one.
-     */
-    readonly mergedCollection: MergedEnvironmentVariableCollection;
-    /**
-     * Sets an extension's environment variable collection.
-     */
-    setCollection(extensionIdentifier: string, persistent: boolean, collection: SerializableEnvironmentVariableCollection, description: string | MarkdownString | undefined): void;
-    /**
-     * Deletes an extension's environment variable collection.
-     */
-    deleteCollection(extensionIdentifier: string): void;
 }
 export namespace IBaseTerminalServer {
     export function validateId(id?: number): boolean {
@@ -144,56 +123,3 @@ export class DispatchingBaseTerminalClient {
         });
     }
 }
-
-/*---------------------------------------------------------------------------------------------
- *  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/environmentVariable.ts
-
-export const ENVIRONMENT_VARIABLE_COLLECTIONS_KEY = 'terminal.integrated.environmentVariableCollections';
-
-export interface EnvironmentVariableCollection {
-    readonly map: ReadonlyMap<string, EnvironmentVariableMutator>;
-}
-
-export interface EnvironmentVariableCollectionWithPersistence extends EnvironmentVariableCollection {
-    readonly persistent: boolean;
-    readonly description: string | MarkdownString | undefined;
-}
-
-export enum EnvironmentVariableMutatorType {
-    Replace = 1,
-    Append = 2,
-    Prepend = 3
-}
-
-export interface EnvironmentVariableMutator {
-    readonly value: string;
-    readonly type: EnvironmentVariableMutatorType;
-}
-
-export interface ExtensionOwnedEnvironmentVariableMutator extends EnvironmentVariableMutator {
-    readonly extensionIdentifier: string;
-}
-
-/**
- * Represents an environment variable collection that results from merging several collections
- * together.
- */
-export interface MergedEnvironmentVariableCollection {
-    readonly map: ReadonlyMap<string, ExtensionOwnedEnvironmentVariableMutator[]>;
-
-    /**
-     * Applies this collection to a process environment.
-     */
-    applyToProcessEnvironment(env: { [key: string]: string | null }): void;
-}
-
-export interface SerializableExtensionEnvironmentVariableCollection {
-    extensionIdentifier: string,
-    collection: SerializableEnvironmentVariableCollection | undefined,
-    description: string | MarkdownString | undefined
-}
-
-export type SerializableEnvironmentVariableCollection = [string, EnvironmentVariableMutator][];

package/src/common/shell-terminal-protocol.ts

@@ -17,11 +17,25 @@
 import { RpcProxy } from '@theia/core';
 import { IBaseTerminalServer, IBaseTerminalServerOptions } from './base-terminal-protocol';
 import { OS } from '@theia/core/lib/common/os';
+import { MarkdownString } from '@theia/core/lib/common/markdown-rendering/markdown-string';
 
 export const IShellTerminalServer = Symbol('IShellTerminalServer');
 
 export interface IShellTerminalServer extends IBaseTerminalServer {
     hasChildProcesses(processId: number | undefined): Promise<boolean>;
+    getEnvVarCollectionDescriptionsByExtension(id: number): Promise<Map<string, (string | MarkdownString | undefined)[]>>;
+    getEnvVarCollections(): Promise<[string, string, boolean, SerializableEnvironmentVariableCollection][]>;
+
+    restorePersisted(jsonValue: string): void;
+    /**
+     * Sets an extension's environment variable collection.
+     */
+    setCollection(extensionIdentifier: string, rootUri: string, persistent: boolean,
+        collection: SerializableEnvironmentVariableCollection, description: string | MarkdownString | undefined): void;
+    /**
+     * Deletes an extension's environment variable collection.
+     */
+    deleteCollection(extensionIdentifier: string): void;
 }
 
 export const shellTerminalPath = '/services/shell-terminal';
@@ -48,3 +62,42 @@ export interface IShellTerminalServerOptions extends IBaseTerminalServerOptions
 
 export const ShellTerminalServerProxy = Symbol('ShellTerminalServerProxy');
 export type ShellTerminalServerProxy = RpcProxy<IShellTerminalServer>;
+
+/*---------------------------------------------------------------------------------------------
+ *  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/environmentVariable.ts
+
+export const NO_ROOT_URI = '<none>';
+
+export interface EnvironmentVariableCollection {
+    readonly variableMutators: ReadonlyMap<string, EnvironmentVariableMutator>;
+    readonly description: string | MarkdownString | undefined;
+}
+
+export interface EnvironmentVariableCollectionWithPersistence extends EnvironmentVariableCollection {
+    readonly persistent: boolean;
+}
+
+export enum EnvironmentVariableMutatorType {
+    Replace = 1,
+    Append = 2,
+    Prepend = 3
+}
+
+export interface EnvironmentVariableMutatorOptions {
+    applyAtProcessCreation?: boolean;
+}
+
+export interface EnvironmentVariableMutator {
+    readonly value: string;
+    readonly type: EnvironmentVariableMutatorType;
+    readonly options: EnvironmentVariableMutatorOptions;
+}
+
+export interface SerializableEnvironmentVariableCollection {
+    readonly description: string | MarkdownString | undefined;
+    readonly mutators: [string, EnvironmentVariableMutator][]
+};
+

package/src/node/base-terminal-server.ts

@@ -15,34 +15,22 @@
 // *****************************************************************************
 
 import { inject, injectable, named } from '@theia/core/shared/inversify';
-import { ILogger, DisposableCollection, isWindows } from '@theia/core/lib/common';
+import { ILogger, DisposableCollection } from '@theia/core/lib/common';
 import {
     IBaseTerminalServer,
     IBaseTerminalServerOptions,
     IBaseTerminalClient,
     TerminalProcessInfo,
-    EnvironmentVariableCollection,
-    MergedEnvironmentVariableCollection,
-    SerializableEnvironmentVariableCollection,
-    EnvironmentVariableMutator,
-    ExtensionOwnedEnvironmentVariableMutator,
-    EnvironmentVariableMutatorType,
-    EnvironmentVariableCollectionWithPersistence,
-    SerializableExtensionEnvironmentVariableCollection,
     TerminalExitReason
 } from '../common/base-terminal-protocol';
 import { TerminalProcess, ProcessManager, TaskTerminalProcess } from '@theia/process/lib/node';
 import { ShellProcess } from './shell-process';
-import { MarkdownString } from '@theia/core/lib/common/markdown-rendering/markdown-string';
 
 @injectable()
 export abstract class BaseTerminalServer implements IBaseTerminalServer {
     protected client: IBaseTerminalClient | undefined = undefined;
     protected terminalToDispose = new Map<number, DisposableCollection>();
 
-    readonly collections: Map<string, EnvironmentVariableCollectionWithPersistence> = new Map();
-    mergedCollection: MergedEnvironmentVariableCollection;
-
     constructor(
         @inject(ProcessManager) protected readonly processManager: ProcessManager,
         @inject(ILogger) @named('terminal') protected readonly logger: ILogger
@@ -54,7 +42,6 @@ export abstract class BaseTerminalServer implements IBaseTerminalServer {
                 this.terminalToDispose.delete(id);
             }
         });
-        this.mergedCollection = this.resolveMergedCollection();
     }
 
     abstract create(options: IBaseTerminalServerOptions): Promise<number>;
@@ -103,18 +90,6 @@ export abstract class BaseTerminalServer implements IBaseTerminalServer {
         };
     }
 
-    async getEnvVarCollectionDescriptionsByExtension(id: number): Promise<Map<string, string | MarkdownString | undefined>> {
-        const terminal = this.processManager.get(id);
-        if (!(terminal instanceof TerminalProcess)) {
-            throw new Error(`terminal "${id}" does not exist`);
-        }
-        const result = new Map<string, string | MarkdownString | undefined>();
-        this.collections.forEach((value, key) => {
-            result.set(key, value.description);
-        });
-        return result;
-    }
-
     async getCwdURI(id: number): Promise<string> {
         const terminal = this.processManager.get(id);
         if (!(terminal instanceof TerminalProcess)) {
@@ -195,114 +170,4 @@ export abstract class BaseTerminalServer implements IBaseTerminalServer {
         const toDispose = this.notifyClientOnExit(term);
         this.terminalToDispose.set(term.id, toDispose);
     }
-
-    /*---------------------------------------------------------------------------------------------
-     *  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: string, persistent: boolean, collection: SerializableEnvironmentVariableCollection, description: string | MarkdownString | undefined): void {
-        const translatedCollection = { persistent, description, map: new Map<string, EnvironmentVariableMutator>(collection) };
-        this.collections.set(extensionIdentifier, translatedCollection);
-        this.updateCollections();
-    }
-
-    deleteCollection(extensionIdentifier: string): void {
-        this.collections.delete(extensionIdentifier);
-        this.updateCollections();
-    }
-
-    private updateCollections(): void {
-        this.persistCollections();
-        this.mergedCollection = this.resolveMergedCollection();
-    }
-
-    protected persistCollections(): void {
-        const collectionsJson: SerializableExtensionEnvironmentVariableCollection[] = [];
-        this.collections.forEach((collection, extensionIdentifier) => {
-            if (collection.persistent) {
-                collectionsJson.push({
-                    extensionIdentifier,
-                    collection: [...this.collections.get(extensionIdentifier)!.map.entries()],
-                    description: collection.description
-                });
-            }
-        });
-        if (this.client) {
-            const stringifiedJson = JSON.stringify(collectionsJson);
-            this.client.storeTerminalEnvVariables(stringifiedJson);
-        }
-    }
-
-    private resolveMergedCollection(): MergedEnvironmentVariableCollection {
-        return new MergedEnvironmentVariableCollectionImpl(this.collections);
-    }
-
-}
-
-/*---------------------------------------------------------------------------------------------
-     *  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/environmentVariableCollection.ts
-
-export class MergedEnvironmentVariableCollectionImpl implements MergedEnvironmentVariableCollection {
-    readonly map: Map<string, ExtensionOwnedEnvironmentVariableMutator[]> = new Map();
-
-    constructor(collections: Map<string, EnvironmentVariableCollection>) {
-        collections.forEach((collection, extensionIdentifier) => {
-            const it = collection.map.entries();
-            let next = it.next();
-            while (!next.done) {
-                const variable = next.value[0];
-                let entry = this.map.get(variable);
-                if (!entry) {
-                    entry = [];
-                    this.map.set(variable, entry);
-                }
-
-                // If the first item in the entry is replace ignore any other entries as they would
-                // just get replaced by this one.
-                if (entry.length > 0 && entry[0].type === EnvironmentVariableMutatorType.Replace) {
-                    next = it.next();
-                    continue;
-                }
-
-                // Mutators get applied in the reverse order than they are created
-                const mutator = next.value[1];
-                entry.unshift({
-                    extensionIdentifier,
-                    value: mutator.value,
-                    type: mutator.type
-                });
-
-                next = it.next();
-            }
-        });
-    }
-
-    applyToProcessEnvironment(env: { [key: string]: string | null }): void {
-        let lowerToActualVariableNames: { [lowerKey: string]: string | undefined } | undefined;
-        if (isWindows) {
-            lowerToActualVariableNames = {};
-            Object.keys(env).forEach(e => lowerToActualVariableNames![e.toLowerCase()] = e);
-        }
-        this.map.forEach((mutators, variable) => {
-            const actualVariable = isWindows ? lowerToActualVariableNames![variable.toLowerCase()] || variable : variable;
-            mutators.forEach(mutator => {
-                switch (mutator.type) {
-                    case EnvironmentVariableMutatorType.Append:
-                        env[actualVariable] = (env[actualVariable] || '') + mutator.value;
-                        break;
-                    case EnvironmentVariableMutatorType.Prepend:
-                        env[actualVariable] = mutator.value + (env[actualVariable] || '');
-                        break;
-                    case EnvironmentVariableMutatorType.Replace:
-                        env[actualVariable] = mutator.value;
-                        break;
-                }
-            });
-        });
-    }
 }

package/src/node/shell-process.ts

@@ -39,7 +39,7 @@ export interface ShellProcessOptions {
     isPseudo?: boolean,
 }
 
-function getRootPath(rootURI?: string): string {
+export function getRootPath(rootURI?: string): string {
     if (rootURI) {
         const uri = new URI(rootURI);
         return FileUri.fsPath(uri);