@theia/plugin-ext 1.34.2 → 1.34.3

package/src/plugin/node/debug/plugin-node-debug-adapter-creator.ts

@@ -1,167 +1,167 @@
-// *****************************************************************************
-// Copyright (C) 2022 Arm 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { PluginDebugAdapterCreator } from '../../debug/plugin-debug-adapter-creator';
-import * as path from 'path';
-import * as theia from '@theia/plugin';
-import { PlatformSpecificAdapterContribution, PluginPackageDebuggersContribution } from '../../../common';
-import { isWindows, isOSX } from '@theia/core/lib/common/os';
-import * as net from 'net';
-import { ChildProcess, spawn, fork, ForkOptions } from 'child_process';
-import { DebugAdapter } from '@theia/debug/lib/common/debug-model';
-import { DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer } from '../../types-impl';
-import { ProcessDebugAdapter, SocketDebugAdapter } from '@theia/debug/lib/node/stream-debug-adapter';
-const isElectron = require('is-electron');
-
-export class NodeDebugAdapterCreator extends PluginDebugAdapterCreator {
-    public override async resolveDebugAdapterExecutable(
-        pluginPath: string,
-        debuggerContribution: PluginPackageDebuggersContribution
-    ): Promise<theia.DebugAdapterExecutable | undefined> {
-        const info = this.toPlatformInfo(debuggerContribution);
-        let program = (info && info.program || debuggerContribution.program);
-        if (!program) {
-            return undefined;
-        }
-        program = path.join(pluginPath, program);
-        const programArgs = info && info.args || debuggerContribution.args || [];
-        let runtime = info && info.runtime || debuggerContribution.runtime;
-        if (runtime && runtime.indexOf('./') === 0) {
-            runtime = path.join(pluginPath, runtime);
-        }
-        const runtimeArgs = info && info.runtimeArgs || debuggerContribution.runtimeArgs || [];
-        const command = runtime ? runtime : program;
-        const args = runtime ? [...runtimeArgs, program, ...programArgs] : programArgs;
-        return {
-            command,
-            args
-        };
-    }
-
-    public override async createDebugAdapter(
-        session: theia.DebugSession,
-        debugConfiguration: theia.DebugConfiguration,
-        executable: theia.DebugAdapterExecutable | undefined,
-        descriptorFactory: theia.DebugAdapterDescriptorFactory | undefined
-    ): Promise<DebugAdapter> {
-        if (descriptorFactory) {
-            // 'createDebugAdapterDescriptor' is called at the start of a debug session to provide details about the debug adapter to use.
-            // These details must be returned as objects of type [DebugAdapterDescriptor](#DebugAdapterDescriptor).
-            // Currently two types of debug adapters are supported:
-            // - a debug adapter executable is specified as a command path and arguments (see [DebugAdapterExecutable](#DebugAdapterExecutable)),
-            // - a debug adapter server reachable via a communication port (see [DebugAdapterServer](#DebugAdapterServer)).
-            // If the method is not implemented the default behavior is this:
-            //   createDebugAdapter(session: DebugSession, executable: DebugAdapterExecutable) {
-            //      if (typeof session.configuration.debugServer === 'number') {
-            //         return new DebugAdapterServer(session.configuration.debugServer);
-            //      }
-            //      return executable;
-            //   }
-            //  @param session The [debug session](#DebugSession) for which the debug adapter will be used.
-            //  @param executable The debug adapter's executable information as specified in the package.json (or undefined if no such information exists).
-            const descriptor = await descriptorFactory.createDebugAdapterDescriptor(session, executable);
-            if (descriptor) {
-                if (DebugAdapterServer.is(descriptor)) {
-                    return this.connectSocketDebugAdapter(descriptor);
-                } else if (DebugAdapterExecutable.is(descriptor)) {
-                    return this.startDebugAdapter(descriptor);
-                } else if (DebugAdapterNamedPipeServer.is(descriptor)) {
-                    return this.connectPipeDebugAdapter(descriptor);
-                } else if (DebugAdapterInlineImplementation.is(descriptor)) {
-                    return this.connectInlineDebugAdapter(descriptor);
-                }
-            }
-        }
-
-        if ('debugServer' in debugConfiguration) {
-            return this.connectSocketDebugAdapter({ port: debugConfiguration.debugServer });
-        } else {
-            if (!executable) {
-                throw new Error('It is not possible to provide debug adapter executable.');
-            }
-            return this.startDebugAdapter(executable);
-        }
-    }
-
-    protected toPlatformInfo(executable: PluginPackageDebuggersContribution): PlatformSpecificAdapterContribution | undefined {
-        if (isWindows && !process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432')) {
-            return executable.winx86 || executable.win || executable.windows;
-        }
-        if (isWindows) {
-            return executable.win || executable.windows;
-        }
-        if (isOSX) {
-            return executable.osx;
-        }
-        return executable.linux;
-    }
-
-    public startDebugAdapter(executable: DebugAdapterExecutable): DebugAdapter {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const options: any = { stdio: ['pipe', 'pipe', 2] };
-
-        if (executable.options) {
-            options.cwd = executable.options.cwd;
-
-            // The additional environment of the executed program or shell. If omitted
-            // the parent process' environment is used. If provided it is merged with
-            // the parent process' environment.
-            options.env = Object.assign({}, process.env);
-            Object.assign(options.env, executable.options.env);
-        }
-
-        let childProcess: ChildProcess;
-        const { command, args } = executable;
-        if (command === 'node') {
-            if (Array.isArray(args) && args.length > 0) {
-                const forkOptions: ForkOptions = {
-                    env: options.env,
-                    // When running in Electron, fork will automatically add ELECTRON_RUN_AS_NODE=1 to the env,
-                    // but this will cause issues when debugging Electron apps, so we'll remove it.
-                    execArgv: isElectron()
-                        ? ['-e', 'delete process.env.ELECTRON_RUN_AS_NODE;require(process.argv[1])']
-                        : [],
-                    silent: true
-                };
-                if (options.cwd) {
-                    forkOptions.cwd = options.cwd;
-                }
-                options.stdio.push('ipc');
-                forkOptions.stdio = options.stdio;
-                childProcess = fork(args[0], args.slice(1), forkOptions);
-            } else {
-                throw new Error(`It is not possible to launch debug adapter with the command: ${JSON.stringify(executable)}`);
-            }
-        } else {
-            childProcess = spawn(command, args, options);
-        }
-
-        return new ProcessDebugAdapter(childProcess);
-    }
-
-    /**
-     * Connects to a remote debug server.
-     */
-    public connectSocketDebugAdapter(server: DebugAdapterServer): SocketDebugAdapter {
-        const socket = net.createConnection(server.port, server.host);
-        return new SocketDebugAdapter(socket);
-    }
-
-    public connectPipeDebugAdapter(adapter: DebugAdapterNamedPipeServer): SocketDebugAdapter {
-        const socket = net.createConnection(adapter.path);
-        return new SocketDebugAdapter(socket);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2022 Arm 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { PluginDebugAdapterCreator } from '../../debug/plugin-debug-adapter-creator';
+import * as path from 'path';
+import * as theia from '@theia/plugin';
+import { PlatformSpecificAdapterContribution, PluginPackageDebuggersContribution } from '../../../common';
+import { isWindows, isOSX } from '@theia/core/lib/common/os';
+import * as net from 'net';
+import { ChildProcess, spawn, fork, ForkOptions } from 'child_process';
+import { DebugAdapter } from '@theia/debug/lib/common/debug-model';
+import { DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer } from '../../types-impl';
+import { ProcessDebugAdapter, SocketDebugAdapter } from '@theia/debug/lib/node/stream-debug-adapter';
+const isElectron = require('is-electron');
+
+export class NodeDebugAdapterCreator extends PluginDebugAdapterCreator {
+    public override async resolveDebugAdapterExecutable(
+        pluginPath: string,
+        debuggerContribution: PluginPackageDebuggersContribution
+    ): Promise<theia.DebugAdapterExecutable | undefined> {
+        const info = this.toPlatformInfo(debuggerContribution);
+        let program = (info && info.program || debuggerContribution.program);
+        if (!program) {
+            return undefined;
+        }
+        program = path.join(pluginPath, program);
+        const programArgs = info && info.args || debuggerContribution.args || [];
+        let runtime = info && info.runtime || debuggerContribution.runtime;
+        if (runtime && runtime.indexOf('./') === 0) {
+            runtime = path.join(pluginPath, runtime);
+        }
+        const runtimeArgs = info && info.runtimeArgs || debuggerContribution.runtimeArgs || [];
+        const command = runtime ? runtime : program;
+        const args = runtime ? [...runtimeArgs, program, ...programArgs] : programArgs;
+        return {
+            command,
+            args
+        };
+    }
+
+    public override async createDebugAdapter(
+        session: theia.DebugSession,
+        debugConfiguration: theia.DebugConfiguration,
+        executable: theia.DebugAdapterExecutable | undefined,
+        descriptorFactory: theia.DebugAdapterDescriptorFactory | undefined
+    ): Promise<DebugAdapter> {
+        if (descriptorFactory) {
+            // 'createDebugAdapterDescriptor' is called at the start of a debug session to provide details about the debug adapter to use.
+            // These details must be returned as objects of type [DebugAdapterDescriptor](#DebugAdapterDescriptor).
+            // Currently two types of debug adapters are supported:
+            // - a debug adapter executable is specified as a command path and arguments (see [DebugAdapterExecutable](#DebugAdapterExecutable)),
+            // - a debug adapter server reachable via a communication port (see [DebugAdapterServer](#DebugAdapterServer)).
+            // If the method is not implemented the default behavior is this:
+            //   createDebugAdapter(session: DebugSession, executable: DebugAdapterExecutable) {
+            //      if (typeof session.configuration.debugServer === 'number') {
+            //         return new DebugAdapterServer(session.configuration.debugServer);
+            //      }
+            //      return executable;
+            //   }
+            //  @param session The [debug session](#DebugSession) for which the debug adapter will be used.
+            //  @param executable The debug adapter's executable information as specified in the package.json (or undefined if no such information exists).
+            const descriptor = await descriptorFactory.createDebugAdapterDescriptor(session, executable);
+            if (descriptor) {
+                if (DebugAdapterServer.is(descriptor)) {
+                    return this.connectSocketDebugAdapter(descriptor);
+                } else if (DebugAdapterExecutable.is(descriptor)) {
+                    return this.startDebugAdapter(descriptor);
+                } else if (DebugAdapterNamedPipeServer.is(descriptor)) {
+                    return this.connectPipeDebugAdapter(descriptor);
+                } else if (DebugAdapterInlineImplementation.is(descriptor)) {
+                    return this.connectInlineDebugAdapter(descriptor);
+                }
+            }
+        }
+
+        if ('debugServer' in debugConfiguration) {
+            return this.connectSocketDebugAdapter({ port: debugConfiguration.debugServer });
+        } else {
+            if (!executable) {
+                throw new Error('It is not possible to provide debug adapter executable.');
+            }
+            return this.startDebugAdapter(executable);
+        }
+    }
+
+    protected toPlatformInfo(executable: PluginPackageDebuggersContribution): PlatformSpecificAdapterContribution | undefined {
+        if (isWindows && !process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432')) {
+            return executable.winx86 || executable.win || executable.windows;
+        }
+        if (isWindows) {
+            return executable.win || executable.windows;
+        }
+        if (isOSX) {
+            return executable.osx;
+        }
+        return executable.linux;
+    }
+
+    public startDebugAdapter(executable: DebugAdapterExecutable): DebugAdapter {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const options: any = { stdio: ['pipe', 'pipe', 2] };
+
+        if (executable.options) {
+            options.cwd = executable.options.cwd;
+
+            // The additional environment of the executed program or shell. If omitted
+            // the parent process' environment is used. If provided it is merged with
+            // the parent process' environment.
+            options.env = Object.assign({}, process.env);
+            Object.assign(options.env, executable.options.env);
+        }
+
+        let childProcess: ChildProcess;
+        const { command, args } = executable;
+        if (command === 'node') {
+            if (Array.isArray(args) && args.length > 0) {
+                const forkOptions: ForkOptions = {
+                    env: options.env,
+                    // When running in Electron, fork will automatically add ELECTRON_RUN_AS_NODE=1 to the env,
+                    // but this will cause issues when debugging Electron apps, so we'll remove it.
+                    execArgv: isElectron()
+                        ? ['-e', 'delete process.env.ELECTRON_RUN_AS_NODE;require(process.argv[1])']
+                        : [],
+                    silent: true
+                };
+                if (options.cwd) {
+                    forkOptions.cwd = options.cwd;
+                }
+                options.stdio.push('ipc');
+                forkOptions.stdio = options.stdio;
+                childProcess = fork(args[0], args.slice(1), forkOptions);
+            } else {
+                throw new Error(`It is not possible to launch debug adapter with the command: ${JSON.stringify(executable)}`);
+            }
+        } else {
+            childProcess = spawn(command, args, options);
+        }
+
+        return new ProcessDebugAdapter(childProcess);
+    }
+
+    /**
+     * Connects to a remote debug server.
+     */
+    public connectSocketDebugAdapter(server: DebugAdapterServer): SocketDebugAdapter {
+        const socket = net.createConnection(server.port, server.host);
+        return new SocketDebugAdapter(socket);
+    }
+
+    public connectPipeDebugAdapter(adapter: DebugAdapterNamedPipeServer): SocketDebugAdapter {
+        const socket = net.createConnection(adapter.path);
+        return new SocketDebugAdapter(socket);
+    }
+}

package/src/plugin/node/env-node-ext.ts

@@ -1,69 +1,69 @@
-// *****************************************************************************
-// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as mac from 'macaddress';
-import { EnvExtImpl } from '../env';
-import { RPCProtocol } from '../../common/rpc-protocol';
-import { createHash } from 'crypto';
-import { v4 } from 'uuid';
-import fs = require('fs');
-
-/**
- * Provides machineId using mac address. It's only possible on node side
- * Extending the common class
- */
-export class EnvNodeExtImpl extends EnvExtImpl {
-
-    private macMachineId: string;
-    private _isNewAppInstall: boolean;
-
-    constructor(rpc: RPCProtocol) {
-        super(rpc);
-        mac.one((err, macAddress) => {
-            if (err) {
-                this.macMachineId = v4();
-            } else {
-                this.macMachineId = createHash('sha256').update(macAddress, 'utf8').digest('hex');
-            }
-        });
-        this._isNewAppInstall = this.computeIsNewAppInstall();
-    }
-
-    /**
-     * override machineID
-     */
-    override get machineId(): string {
-        return this.macMachineId;
-    }
-
-    /**
-     * Provides application root.
-     */
-    get appRoot(): string {
-        return __dirname;
-    }
-
-    get isNewAppInstall(): boolean {
-        return this._isNewAppInstall;
-    }
-
-    private computeIsNewAppInstall(): boolean {
-        const creation = fs.statSync(__filename).birthtimeMs;
-        const current = Date.now();
-        const dayMs = 24 * 3600 * 1000;
-        return (current - creation) < dayMs;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as mac from 'macaddress';
+import { EnvExtImpl } from '../env';
+import { RPCProtocol } from '../../common/rpc-protocol';
+import { createHash } from 'crypto';
+import { v4 } from 'uuid';
+import fs = require('fs');
+
+/**
+ * Provides machineId using mac address. It's only possible on node side
+ * Extending the common class
+ */
+export class EnvNodeExtImpl extends EnvExtImpl {
+
+    private macMachineId: string;
+    private _isNewAppInstall: boolean;
+
+    constructor(rpc: RPCProtocol) {
+        super(rpc);
+        mac.one((err, macAddress) => {
+            if (err) {
+                this.macMachineId = v4();
+            } else {
+                this.macMachineId = createHash('sha256').update(macAddress, 'utf8').digest('hex');
+            }
+        });
+        this._isNewAppInstall = this.computeIsNewAppInstall();
+    }
+
+    /**
+     * override machineID
+     */
+    override get machineId(): string {
+        return this.macMachineId;
+    }
+
+    /**
+     * Provides application root.
+     */
+    get appRoot(): string {
+        return __dirname;
+    }
+
+    get isNewAppInstall(): boolean {
+        return this._isNewAppInstall;
+    }
+
+    private computeIsNewAppInstall(): boolean {
+        const creation = fs.statSync(__filename).birthtimeMs;
+        const current = Date.now();
+        const dayMs = 24 * 3600 * 1000;
+        return (current - creation) < dayMs;
+    }
+}

package/src/plugin/notification.ts

@@ -1,80 +1,80 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { PLUGIN_RPC_CONTEXT, NotificationExt, NotificationMain } from '../common/plugin-api-rpc';
-import { CancellationToken, Progress, ProgressOptions } from '@theia/plugin';
-import { RPCProtocol } from '../common/rpc-protocol';
-import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
-import { ProgressLocation } from './types-impl';
-import { Deferred } from '@theia/core/lib/common/promise-util';
-
-export class NotificationExtImpl implements NotificationExt {
-    private readonly proxy: NotificationMain;
-    private mapProgressIdToCancellationSource: Map<string, CancellationTokenSource> = new Map();
-
-    constructor(rpc: RPCProtocol) {
-        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.NOTIFICATION_MAIN);
-    }
-
-    async withProgress<R>(
-        options: ProgressOptions,
-        task: (progress: Progress<{ message?: string; increment?: number }>, token: CancellationToken) => PromiseLike<R>
-    ): Promise<R> {
-        const source = new CancellationTokenSource();
-        const id = new Deferred<string>();
-        const progress = task({ report: async item => this.proxy.$updateProgress(await id.promise, item)}, source.token);
-        const title = options.title ? options.title : '';
-        const location = this.mapLocation(options.location);
-        const cancellable = options.cancellable;
-
-        id.resolve(await this.proxy.$startProgress({ title, location, cancellable }));
-
-        if (cancellable) {
-            const progressId = await id.promise;
-            this.mapProgressIdToCancellationSource.set(progressId, source);
-        }
-
-        const stop = async () => this.proxy.$stopProgress(await id.promise);
-        const promise = Promise.all([
-            progress,
-            new Promise(resolve => setTimeout(resolve, 250)) // try to show even if it's done immediately
-        ]);
-        promise.then(stop, stop);
-        return progress;
-    }
-
-    public $acceptProgressCanceled(id: string): void {
-        const source = this.mapProgressIdToCancellationSource.get(id);
-        if (source) {
-            source.cancel();
-            this.mapProgressIdToCancellationSource.delete(id);
-        }
-    }
-
-    protected mapLocation(location: ProgressLocation | { viewId: string }): string | undefined {
-        if (typeof location === 'object') {
-            return location.viewId;
-        }
-
-        switch (location) {
-            case ProgressLocation.Notification: return 'notification';
-            case ProgressLocation.SourceControl: return 'scm';
-            case ProgressLocation.Window: return 'window';
-            default: return undefined;
-        }
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { PLUGIN_RPC_CONTEXT, NotificationExt, NotificationMain } from '../common/plugin-api-rpc';
+import { CancellationToken, Progress, ProgressOptions } from '@theia/plugin';
+import { RPCProtocol } from '../common/rpc-protocol';
+import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
+import { ProgressLocation } from './types-impl';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+
+export class NotificationExtImpl implements NotificationExt {
+    private readonly proxy: NotificationMain;
+    private mapProgressIdToCancellationSource: Map<string, CancellationTokenSource> = new Map();
+
+    constructor(rpc: RPCProtocol) {
+        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.NOTIFICATION_MAIN);
+    }
+
+    async withProgress<R>(
+        options: ProgressOptions,
+        task: (progress: Progress<{ message?: string; increment?: number }>, token: CancellationToken) => PromiseLike<R>
+    ): Promise<R> {
+        const source = new CancellationTokenSource();
+        const id = new Deferred<string>();
+        const progress = task({ report: async item => this.proxy.$updateProgress(await id.promise, item)}, source.token);
+        const title = options.title ? options.title : '';
+        const location = this.mapLocation(options.location);
+        const cancellable = options.cancellable;
+
+        id.resolve(await this.proxy.$startProgress({ title, location, cancellable }));
+
+        if (cancellable) {
+            const progressId = await id.promise;
+            this.mapProgressIdToCancellationSource.set(progressId, source);
+        }
+
+        const stop = async () => this.proxy.$stopProgress(await id.promise);
+        const promise = Promise.all([
+            progress,
+            new Promise(resolve => setTimeout(resolve, 250)) // try to show even if it's done immediately
+        ]);
+        promise.then(stop, stop);
+        return progress;
+    }
+
+    public $acceptProgressCanceled(id: string): void {
+        const source = this.mapProgressIdToCancellationSource.get(id);
+        if (source) {
+            source.cancel();
+            this.mapProgressIdToCancellationSource.delete(id);
+        }
+    }
+
+    protected mapLocation(location: ProgressLocation | { viewId: string }): string | undefined {
+        if (typeof location === 'object') {
+            return location.viewId;
+        }
+
+        switch (location) {
+            case ProgressLocation.Notification: return 'notification';
+            case ProgressLocation.SourceControl: return 'scm';
+            case ProgressLocation.Window: return 'window';
+            default: return undefined;
+        }
+    }
+
+}