@theia/debug 1.19.0 → 1.21.0-next.14

package/lib/node/{stream-communication-provider.d.ts → stream-debug-adapter.d.ts}

@@ -16,9 +16,11 @@
 /// <reference types="node" />
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Event } from '@theia/core/lib/common/event';
+import { ChildProcess } from 'child_process';
 import * as stream from 'stream';
-import { CommunicationProvider } from './debug-model';
-export declare class StreamCommunicationProvider extends DisposableCollection implements CommunicationProvider {
+import * as net from 'net';
+import { DebugAdapter } from './debug-model';
+declare abstract class StreamDebugAdapter extends DisposableCollection {
     private fromAdapter;
     private toAdapter;
     private messageReceivedEmitter;
@@ -32,7 +34,19 @@ export declare class StreamCommunicationProvider extends DisposableCollection im
     private contentLength;
     private buffer;
     constructor(fromAdapter: stream.Readable, toAdapter: stream.Writable);
+    handleClosed(): void;
     send(message: string): void;
     protected handleData(data: Buffer): void;
 }
-//# sourceMappingURL=stream-communication-provider.d.ts.map
+export declare class ProcessDebugAdapter extends StreamDebugAdapter implements DebugAdapter {
+    protected readonly process: ChildProcess;
+    constructor(process: ChildProcess);
+    stop(): Promise<void>;
+}
+export declare class SocketDebugAdapter extends StreamDebugAdapter implements DebugAdapter {
+    private readonly socket;
+    constructor(socket: net.Socket);
+    stop(): Promise<void>;
+}
+export {};
+//# sourceMappingURL=stream-debug-adapter.d.ts.map

package/lib/node/stream-debug-adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-debug-adapter.d.ts","sourceRoot":"","sources":["../../src/node/stream-debug-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAW,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,uBAAe,kBAAmB,SAAQ,oBAAoB;IAc9C,OAAO,CAAC,WAAW;IAAmB,OAAO,CAAC,SAAS;IAbnE,OAAO,CAAC,sBAAsB,CAAyB;IACvD,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAqC;IACrE,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAA2B;IAChD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAA2B;IAG/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAoB;IACjD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,MAAM,CAA2B;gBAErB,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAU,SAAS,EAAE,MAAM,CAAC,QAAQ;IASpF,YAAY,IAAI,IAAI;IAIpB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM3B,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CA0C3C;AAED,qBAAa,mBAAoB,SAAQ,kBAAmB,YAAW,YAAY;IAC/E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAC7B,OAAO,EAAE,YAAY;IAK3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAI9B;AAED,qBAAa,kBAAmB,SAAQ,kBAAmB,YAAW,YAAY;IAC9E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;gBACxB,MAAM,EAAE,GAAG,CAAC,MAAM;IAK9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAKxB"}

package/lib/node/{stream-communication-provider.js → stream-debug-adapter.js}

@@ -15,10 +15,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StreamCommunicationProvider = void 0;
+exports.SocketDebugAdapter = exports.ProcessDebugAdapter = void 0;
 const disposable_1 = require("@theia/core/lib/common/disposable");
 const event_1 = require("@theia/core/lib/common/event");
-class StreamCommunicationProvider extends disposable_1.DisposableCollection {
+class StreamDebugAdapter extends disposable_1.DisposableCollection {
     constructor(fromAdapter, toAdapter) {
         super();
         this.fromAdapter = fromAdapter;
@@ -32,13 +32,15 @@ class StreamCommunicationProvider extends disposable_1.DisposableCollection {
         this.contentLength = -1;
         this.buffer = Buffer.alloc(0);
         this.fromAdapter.on('data', (data) => this.handleData(data));
-        this.fromAdapter.on('close', () => this.closeEmitter.fire()); // FIXME pass a proper exit code
+        this.fromAdapter.on('close', () => this.handleClosed()); // FIXME pass a proper exit code
         this.fromAdapter.on('error', error => this.errorEmitter.fire(error));
         this.toAdapter.on('error', error => this.errorEmitter.fire(error));
     }
-    ;
+    handleClosed() {
+        this.closeEmitter.fire();
+    }
     send(message) {
-        const msg = `${StreamCommunicationProvider.CONTENT_LENGTH}: ${Buffer.byteLength(message, 'utf8')}${StreamCommunicationProvider.TWO_CRLF}${message}`;
+        const msg = `${StreamDebugAdapter.CONTENT_LENGTH}: ${Buffer.byteLength(message, 'utf8')}${StreamDebugAdapter.TWO_CRLF}${message}`;
         this.toAdapter.write(msg, 'utf8');
     }
     handleData(data) {
@@ -56,24 +58,24 @@ class StreamCommunicationProvider extends disposable_1.DisposableCollection {
                 }
             }
             else {
-                let idx = this.buffer.indexOf(StreamCommunicationProvider.CONTENT_LENGTH);
+                let idx = this.buffer.indexOf(StreamDebugAdapter.CONTENT_LENGTH);
                 if (idx > 0) {
                     // log unrecognized output
                     const output = this.buffer.slice(0, idx);
                     console.log(output.toString('utf-8'));
                     this.buffer = this.buffer.slice(idx);
                 }
-                idx = this.buffer.indexOf(StreamCommunicationProvider.TWO_CRLF);
+                idx = this.buffer.indexOf(StreamDebugAdapter.TWO_CRLF);
                 if (idx !== -1) {
                     const header = this.buffer.toString('utf8', 0, idx);
                     const lines = header.split('\r\n');
                     for (let i = 0; i < lines.length; i++) {
                         const pair = lines[i].split(/: +/);
-                        if (pair[0] === StreamCommunicationProvider.CONTENT_LENGTH) {
+                        if (pair[0] === StreamDebugAdapter.CONTENT_LENGTH) {
                             this.contentLength = +pair[1];
                         }
                     }
-                    this.buffer = this.buffer.slice(idx + StreamCommunicationProvider.TWO_CRLF.length);
+                    this.buffer = this.buffer.slice(idx + StreamDebugAdapter.TWO_CRLF.length);
                     continue;
                 }
             }
@@ -81,8 +83,31 @@ class StreamCommunicationProvider extends disposable_1.DisposableCollection {
         }
     }
 }
-exports.StreamCommunicationProvider = StreamCommunicationProvider;
 // these constants are for the message header, see: https://microsoft.github.io/debug-adapter-protocol/overview#header-part
-StreamCommunicationProvider.TWO_CRLF = '\r\n\r\n';
-StreamCommunicationProvider.CONTENT_LENGTH = 'Content-Length';
-//# sourceMappingURL=stream-communication-provider.js.map
+StreamDebugAdapter.TWO_CRLF = '\r\n\r\n';
+StreamDebugAdapter.CONTENT_LENGTH = 'Content-Length';
+class ProcessDebugAdapter extends StreamDebugAdapter {
+    constructor(process) {
+        super(process.stdout, process.stdin);
+        this.process = process;
+    }
+    async stop() {
+        var _a;
+        this.process.kill();
+        (_a = this.process.stdin) === null || _a === void 0 ? void 0 : _a.end();
+    }
+}
+exports.ProcessDebugAdapter = ProcessDebugAdapter;
+class SocketDebugAdapter extends StreamDebugAdapter {
+    constructor(socket) {
+        super(socket, socket);
+        this.socket = socket;
+    }
+    stop() {
+        return new Promise(resolve => {
+            this.socket.end(() => resolve());
+        });
+    }
+}
+exports.SocketDebugAdapter = SocketDebugAdapter;
+//# sourceMappingURL=stream-debug-adapter.js.map

package/lib/node/stream-debug-adapter.js.map

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

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@theia/debug",
-  "version": "1.19.0",
+  "version": "1.21.0-next.14+afd980a4d4f",
   "description": "Theia - Debug Extension",
   "dependencies": {
-    "@theia/console": "1.19.0",
-    "@theia/core": "1.19.0",
-    "@theia/editor": "1.19.0",
-    "@theia/filesystem": "1.19.0",
-    "@theia/markers": "1.19.0",
-    "@theia/monaco": "1.19.0",
-    "@theia/output": "1.19.0",
-    "@theia/preferences": "1.19.0",
-    "@theia/process": "1.19.0",
-    "@theia/task": "1.19.0",
-    "@theia/terminal": "1.19.0",
-    "@theia/userstorage": "1.19.0",
-    "@theia/variable-resolver": "1.19.0",
-    "@theia/workspace": "1.19.0",
+    "@theia/console": "1.21.0-next.14+afd980a4d4f",
+    "@theia/core": "1.21.0-next.14+afd980a4d4f",
+    "@theia/editor": "1.21.0-next.14+afd980a4d4f",
+    "@theia/filesystem": "1.21.0-next.14+afd980a4d4f",
+    "@theia/markers": "1.21.0-next.14+afd980a4d4f",
+    "@theia/monaco": "1.21.0-next.14+afd980a4d4f",
+    "@theia/output": "1.21.0-next.14+afd980a4d4f",
+    "@theia/preferences": "1.21.0-next.14+afd980a4d4f",
+    "@theia/process": "1.21.0-next.14+afd980a4d4f",
+    "@theia/task": "1.21.0-next.14+afd980a4d4f",
+    "@theia/terminal": "1.21.0-next.14+afd980a4d4f",
+    "@theia/userstorage": "1.21.0-next.14+afd980a4d4f",
+    "@theia/variable-resolver": "1.21.0-next.14+afd980a4d4f",
+    "@theia/workspace": "1.21.0-next.14+afd980a4d4f",
     "jsonc-parser": "^2.2.0",
     "mkdirp": "^0.5.0",
     "p-debounce": "^2.1.0",
@@ -64,10 +64,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.19.0"
+    "@theia/ext-scripts": "1.20.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "cebb5417bb40e320178e3a4e66070af514f0525f"
+  "gitHead": "afd980a4d4ff6b48d70fc0ce1e459f6496c62624"
 }

package/src/browser/console/debug-console-contribution.tsx

@@ -34,15 +34,14 @@ export const InDebugReplContextKey = Symbol('inDebugReplContextKey');
 
 export namespace DebugConsoleCommands {
 
-    export const DEBUG_CATEGORY_KEY = 'vscode/debugCommands/debug';
     export const DEBUG_CATEGORY = 'Debug';
 
-    export const CLEAR = Command.toLocalizedCommand({
+    export const CLEAR = Command.toDefaultLocalizedCommand({
         id: 'debug.console.clear',
         category: DEBUG_CATEGORY,
         label: 'Clear Console',
         iconClass: codicon('clear-all')
-    }, 'vscode/repl/clearRepl', DEBUG_CATEGORY_KEY);
+    });
 }
 
 @injectable()
@@ -136,7 +135,7 @@ export class DebugConsoleContribution extends AbstractViewContribution<ConsoleWi
     static options: ConsoleOptions = {
         id: 'debug-console',
         title: {
-            label: nls.localize('vscode/repl/debugConsole', 'Debug Console'),
+            label: nls.localizeByDefault('Debug Console'),
             iconClass: codicon('debug-console')
         },
         input: {

package/src/browser/console/debug-console-session.ts

@@ -72,13 +72,13 @@ export class DebugConsoleSession extends ConsoleSession {
         this.completionKinds.set('file', monaco.languages.CompletionItemKind.File);
         this.completionKinds.set('reference', monaco.languages.CompletionItemKind.Reference);
         this.completionKinds.set('customcolor', monaco.languages.CompletionItemKind.Color);
-        monaco.languages.registerCompletionItemProvider({
+        this.toDispose.push(monaco.languages.registerCompletionItemProvider({
             scheme: DebugConsoleSession.uri.scheme,
             hasAccessToAllModels: true
         }, {
             triggerCharacters: ['.'],
             provideCompletionItems: (model, position) => this.completions(model, position),
-        });
+        }));
     }
 
     getElements(): IterableIterator<ConsoleItem> {

package/src/browser/debug-frontend-application-contribution.ts

@@ -65,92 +65,93 @@ export namespace DebugMenus {
 }
 
 function nlsEditBreakpoint(breakpointKey: string, breakpoint: string): string {
-    return nls.localize('vscode/breakpointEditorContribution/editBreakpoint', 'Edit {0}...', nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
+    return nls.localizeByDefault('Edit {0}...', nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
 }
 
 function nlsRemoveBreakpoint(breakpointKey: string, breakpoint: string): string {
-    return nls.localize('vscode/breakpointEditorContribution/removeBreakpoint', 'Remove {0}',
+    return nls.localizeByDefault('Remove {0}',
         nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
 }
 
 function nlsEnableBreakpoint(breakpointKey: string, breakpoint: string): string {
-    return nls.localize('vscode/breakpointEditorContribution/enableBreakpoint', 'Enable {0}',
+    return nls.localizeByDefault('Enable {0}',
         nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
 }
 
 function nlsDisableBreakpoint(breakpointKey: string, breakpoint: string): string {
-    return nls.localize('vscode/breakpointEditorContribution/disableBreakpoint', 'Disable {0}',
+    return nls.localizeByDefault('Disable {0}',
         nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
 }
 
 export namespace DebugCommands {
 
-    export const DEBUG_CATEGORY_KEY = 'vscode/debugCommands/debug';
     export const DEBUG_CATEGORY = 'Debug';
+    export const DEBUG_CATEGORY_KEY = nls.getDefaultKey(DEBUG_CATEGORY);
 
-    export const START = Command.toLocalizedCommand({
+    export const START = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.start',
         category: DEBUG_CATEGORY,
         label: 'Start Debugging',
         iconClass: codicon('debug-alt')
-    }, 'vscode/debugCommands/startDebug', DEBUG_CATEGORY_KEY);
-    export const START_NO_DEBUG = Command.toLocalizedCommand({
+    });
+    export const START_NO_DEBUG = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.run',
-        label: 'Debug: Start Without Debugging'
-    }, 'vscode/debugCommands/startWithoutDebugging');
-    export const STOP = Command.toLocalizedCommand({
+        category: DEBUG_CATEGORY,
+        label: 'Start Without Debugging'
+    });
+    export const STOP = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.stop',
         category: DEBUG_CATEGORY,
         label: 'Stop',
         iconClass: codicon('debug-stop')
-    }, 'vscode/debugCommands/stop', DEBUG_CATEGORY_KEY);
-    export const RESTART = Command.toLocalizedCommand({
+    });
+    export const RESTART = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.restart',
         category: DEBUG_CATEGORY,
         label: 'Restart',
-    }, 'vscode/debugCommands/restartDebug', DEBUG_CATEGORY_KEY);
+    });
 
-    export const OPEN_CONFIGURATIONS = Command.toLocalizedCommand({
+    export const OPEN_CONFIGURATIONS = Command.toDefaultLocalizedCommand({
         id: 'debug.configurations.open',
         category: DEBUG_CATEGORY,
         label: 'Open Configurations'
-    }, 'vscode/debugViewlet/miOpenConfigurations', DEBUG_CATEGORY_KEY);
-    export const ADD_CONFIGURATION = Command.toLocalizedCommand({
+    });
+    export const ADD_CONFIGURATION = Command.toDefaultLocalizedCommand({
         id: 'debug.configurations.add',
         category: DEBUG_CATEGORY,
         label: 'Add Configuration...'
-    }, 'vscode/debugActionViewItems/addConfiguration', DEBUG_CATEGORY_KEY);
+    });
 
-    export const STEP_OVER = Command.toLocalizedCommand({
+    export const STEP_OVER = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.stepOver',
         category: DEBUG_CATEGORY,
         label: 'Step Over',
         iconClass: codicon('debug-step-over')
-    }, 'vscode/debugCommands/stepOverDebug', DEBUG_CATEGORY_KEY);
-    export const STEP_INTO = Command.toLocalizedCommand({
+    });
+    export const STEP_INTO = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.stepInto',
         category: DEBUG_CATEGORY,
         label: 'Step Into',
         iconClass: codicon('debug-step-into')
-    }, 'vscode/debugCommands/stepIntoDebug', DEBUG_CATEGORY_KEY);
-    export const STEP_OUT = Command.toLocalizedCommand({
+    });
+    export const STEP_OUT = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.stepOut',
         category: DEBUG_CATEGORY,
         label: 'Step Out',
         iconClass: codicon('debug-step-out')
-    }, 'vscode/debugCommands/stepOutDebug', DEBUG_CATEGORY_KEY);
-    export const CONTINUE = Command.toLocalizedCommand({
+    });
+    export const CONTINUE = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.continue',
         category: DEBUG_CATEGORY,
         label: 'Continue',
         iconClass: codicon('debug-continue')
-    }, 'vscode/debugCommands/continueDebug', DEBUG_CATEGORY_KEY);
-    export const PAUSE = Command.toLocalizedCommand({
+    });
+    export const PAUSE = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.pause',
         category: DEBUG_CATEGORY,
         label: 'Pause',
         iconClass: codicon('debug-pause')
-    }, 'vscode/debugCommands/pauseDebug', DEBUG_CATEGORY_KEY);
+    });
     export const CONTINUE_ALL = Command.toLocalizedCommand({
         id: 'debug.thread.continue.all',
         category: DEBUG_CATEGORY,
@@ -164,41 +165,41 @@ export namespace DebugCommands {
         iconClass: codicon('debug-pause')
     }, 'theia/debug/pauseAll', DEBUG_CATEGORY_KEY);
 
-    export const TOGGLE_BREAKPOINT = Command.toLocalizedCommand({
+    export const TOGGLE_BREAKPOINT = Command.toDefaultLocalizedCommand({
         id: 'editor.debug.action.toggleBreakpoint',
         category: DEBUG_CATEGORY,
         label: 'Toggle Breakpoint',
-    }, 'vscode/debugEditorActions/miToggleBreakpoint', DEBUG_CATEGORY_KEY);
-    export const INLINE_BREAKPOINT = Command.toLocalizedCommand({
+    });
+    export const INLINE_BREAKPOINT = Command.toDefaultLocalizedCommand({
         id: 'editor.debug.action.inlineBreakpoint',
         category: DEBUG_CATEGORY,
         label: 'Inline Breakpoint',
-    }, 'vscode/debug.contribution/inlineBreakpoint', DEBUG_CATEGORY_KEY);
-    export const ADD_CONDITIONAL_BREAKPOINT = Command.toLocalizedCommand({
+    });
+    export const ADD_CONDITIONAL_BREAKPOINT = Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.add.conditional',
         category: DEBUG_CATEGORY,
         label: 'Add Conditional Breakpoint...',
-    }, 'vscode/breakpointEditorContribution/addConditionalBreakpoint', DEBUG_CATEGORY_KEY);
-    export const ADD_LOGPOINT = Command.toLocalizedCommand({
+    });
+    export const ADD_LOGPOINT = Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.add.logpoint',
         category: DEBUG_CATEGORY,
         label: 'Add Logpoint...',
-    }, 'vscode/breakpointEditorContribution/addLogPoint', DEBUG_CATEGORY_KEY);
-    export const ADD_FUNCTION_BREAKPOINT = Command.toLocalizedCommand({
+    });
+    export const ADD_FUNCTION_BREAKPOINT = Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.add.function',
         category: DEBUG_CATEGORY,
-        label: 'Add Function Breakpoint...',
-    }, 'vscode/breakpointsView/addFunctionBreakpoint', DEBUG_CATEGORY_KEY);
-    export const ENABLE_ALL_BREAKPOINTS = Command.toLocalizedCommand({
+        label: 'Add Function Breakpoint',
+    });
+    export const ENABLE_ALL_BREAKPOINTS = Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.enableAll',
         category: DEBUG_CATEGORY,
         label: 'Enable All Breakpoints',
-    }, 'vscode/breakpointsView/enableAllBreakpoints', DEBUG_CATEGORY_KEY);
-    export const DISABLE_ALL_BREAKPOINTS = Command.toLocalizedCommand({
+    });
+    export const DISABLE_ALL_BREAKPOINTS = Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.disableAll',
         category: DEBUG_CATEGORY,
         label: 'Disable All Breakpoints',
-    }, 'vscode/breakpointsView/disableAllBreakpoints', DEBUG_CATEGORY_KEY);
+    });
     export const EDIT_BREAKPOINT = Command.toLocalizedCommand({
         id: 'debug.breakpoint.edit',
         category: DEBUG_CATEGORY,
@@ -223,82 +224,82 @@ export namespace DebugCommands {
         originalLabel: 'Remove Logpoint',
         label: nlsRemoveBreakpoint('logPoint', 'Logpoint')
     }, '', DEBUG_CATEGORY_KEY);
-    export const REMOVE_ALL_BREAKPOINTS = Command.toLocalizedCommand({
+    export const REMOVE_ALL_BREAKPOINTS = Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.removeAll',
         category: DEBUG_CATEGORY,
         label: 'Remove All Breakpoints',
-    }, 'vscode/breakpointsView/removeAllBreakpoints', DEBUG_CATEGORY_KEY);
+    });
     export const TOGGLE_BREAKPOINTS_ENABLED = Command.toLocalizedCommand({
         id: 'debug.breakpoint.toggleEnabled'
     });
-    export const SHOW_HOVER = Command.toLocalizedCommand({
+    export const SHOW_HOVER = Command.toDefaultLocalizedCommand({
         id: 'editor.debug.action.showDebugHover',
         category: DEBUG_CATEGORY,
         label: 'Show Hover'
-    }, 'vscode/hover/showHover', DEBUG_CATEGORY_KEY);
+    });
 
-    export const RESTART_FRAME = Command.toLocalizedCommand({
+    export const RESTART_FRAME = Command.toDefaultLocalizedCommand({
         id: 'debug.frame.restart',
         category: DEBUG_CATEGORY,
         label: 'Restart Frame',
-    }, 'vscode/debug.contribution/restartFrame', DEBUG_CATEGORY_KEY);
-    export const COPY_CALL_STACK = Command.toLocalizedCommand({
+    });
+    export const COPY_CALL_STACK = Command.toDefaultLocalizedCommand({
         id: 'debug.callStack.copy',
         category: DEBUG_CATEGORY,
         label: 'Copy Call Stack',
-    }, 'vscode/debug.contribution/copyStackTrace', DEBUG_CATEGORY_KEY);
+    });
 
-    export const SET_VARIABLE_VALUE = Command.toLocalizedCommand({
+    export const SET_VARIABLE_VALUE = Command.toDefaultLocalizedCommand({
         id: 'debug.variable.setValue',
         category: DEBUG_CATEGORY,
         label: 'Set Value',
-    }, 'vscode/debug.contribution/setValue', DEBUG_CATEGORY_KEY);
-    export const COPY_VARIABLE_VALUE = Command.toLocalizedCommand({
+    });
+    export const COPY_VARIABLE_VALUE = Command.toDefaultLocalizedCommand({
         id: 'debug.variable.copyValue',
         category: DEBUG_CATEGORY,
         label: 'Copy Value',
-    }, 'vscode/debug.contribution/copyValue', DEBUG_CATEGORY_KEY);
-    export const COPY_VARIABLE_AS_EXPRESSION = Command.toLocalizedCommand({
+    });
+    export const COPY_VARIABLE_AS_EXPRESSION = Command.toDefaultLocalizedCommand({
         id: 'debug.variable.copyAsExpression',
         category: DEBUG_CATEGORY,
-        label: 'Copy As Expression',
-    }, 'vscode/debug.contribution/copyAsExpression', DEBUG_CATEGORY_KEY);
-    export const WATCH_VARIABLE = Command.toLocalizedCommand({
+        label: 'Copy as Expression',
+    });
+    export const WATCH_VARIABLE = Command.toDefaultLocalizedCommand({
         id: 'debug.variable.watch',
         category: DEBUG_CATEGORY,
         label: 'Add to Watch',
-    }, 'vscode/debug.contribution/addToWatchExpressions', DEBUG_CATEGORY_KEY);
+    });
 
-    export const ADD_WATCH_EXPRESSION = Command.toLocalizedCommand({
+    export const ADD_WATCH_EXPRESSION = Command.toDefaultLocalizedCommand({
         id: 'debug.watch.addExpression',
         category: DEBUG_CATEGORY,
         label: 'Add Expression'
-    }, 'vscode/watchExpressionsView/addWatchExpression', DEBUG_CATEGORY_KEY);
-    export const EDIT_WATCH_EXPRESSION = Command.toLocalizedCommand({
+    });
+    export const EDIT_WATCH_EXPRESSION = Command.toDefaultLocalizedCommand({
         id: 'debug.watch.editExpression',
         category: DEBUG_CATEGORY,
         label: 'Edit Expression'
-    }, 'vscode/debug.contribution/editWatchExpression', DEBUG_CATEGORY_KEY);
+    });
     export const COPY_WATCH_EXPRESSION_VALUE = Command.toLocalizedCommand({
         id: 'debug.watch.copyExpressionValue',
         category: DEBUG_CATEGORY,
         label: 'Copy Expression Value'
     }, 'theia/debug/copyExpressionValue', DEBUG_CATEGORY_KEY);
-    export const REMOVE_WATCH_EXPRESSION = Command.toLocalizedCommand({
+    export const REMOVE_WATCH_EXPRESSION = Command.toDefaultLocalizedCommand({
         id: 'debug.watch.removeExpression',
         category: DEBUG_CATEGORY,
         label: 'Remove Expression'
-    }, 'vscode/debug.contribution/removeWatchExpression', DEBUG_CATEGORY_KEY);
-    export const COLLAPSE_ALL_WATCH_EXPRESSIONS = Command.toLocalizedCommand({
+    });
+    export const COLLAPSE_ALL_WATCH_EXPRESSIONS = Command.toDefaultLocalizedCommand({
         id: 'debug.watch.collapseAllExpressions',
         category: DEBUG_CATEGORY,
-        label: 'Collapse All Expressions'
-    }, 'vscode/watchExpressionsView/collapse', DEBUG_CATEGORY_KEY);
-    export const REMOVE_ALL_WATCH_EXPRESSIONS = Command.toLocalizedCommand({
+        label: 'Collapse All'
+    });
+    export const REMOVE_ALL_WATCH_EXPRESSIONS = Command.toDefaultLocalizedCommand({
         id: 'debug.watch.removeAllExpressions',
         category: DEBUG_CATEGORY,
         label: 'Remove All Expressions'
-    }, 'vscode/watchExpressionsView/removeAllWatchExpressions', DEBUG_CATEGORY_KEY);
+    });
 }
 export namespace DebugThreadContextCommands {
     export const STEP_OVER = {
@@ -525,7 +526,7 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
             }
         };
 
-        menus.registerSubmenu(DebugMenus.DEBUG, nls.localize('vscode/debug.contribution/run', 'Run'));
+        menus.registerSubmenu(DebugMenus.DEBUG, nls.localizeByDefault('Run'));
         registerMenuActions(DebugMenus.DEBUG_CONTROLS,
             DebugCommands.START,
             DebugCommands.START_NO_DEBUG,
@@ -550,7 +551,7 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
         registerMenuActions(DebugMenus.DEBUG_BREAKPOINT,
             DebugCommands.TOGGLE_BREAKPOINT
         );
-        menus.registerSubmenu(DebugMenus.DEBUG_NEW_BREAKPOINT, nls.localize('vscode/debug.contribution/miNewBreakpoint', 'New Breakpoint'));
+        menus.registerSubmenu(DebugMenus.DEBUG_NEW_BREAKPOINT, nls.localizeByDefault('New Breakpoint'));
         registerMenuActions(DebugMenus.DEBUG_NEW_BREAKPOINT,
             DebugCommands.ADD_CONDITIONAL_BREAKPOINT,
             DebugCommands.INLINE_BREAKPOINT,
@@ -575,7 +576,7 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
         registerMenuActions(DebugThreadsWidget.TERMINATE_MENU,
             { ...DebugCommands.RESTART, ...DebugSessionContextCommands.RESTART },
             { ...DebugCommands.STOP, ...DebugSessionContextCommands.STOP },
-            { ...DebugThreadContextCommands.TERMINATE, label: nls.localize('vscode/debug.contribution/terminateThread', 'Terminate Thread') }
+            { ...DebugThreadContextCommands.TERMINATE, label: nls.localizeByDefault('Terminate Thread') }
         );
         registerMenuActions(DebugThreadsWidget.OPEN_MENU,
             { ...DebugSessionContextCommands.REVEAL, label: nls.localize('theia/debug/reveal', 'Reveal') },
@@ -622,7 +623,7 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
         );
 
         registerMenuActions(DebugEditorModel.CONTEXT_MENU,
-            { ...DebugEditorContextCommands.ADD_BREAKPOINT, label: nls.localize('vscode/breakpointEditorContribution/addBreakpoint', 'Add Breakpoint') },
+            { ...DebugEditorContextCommands.ADD_BREAKPOINT, label: nls.localizeByDefault('Add Breakpoint') },
             { ...DebugEditorContextCommands.ADD_CONDITIONAL_BREAKPOINT, label: DebugCommands.ADD_CONDITIONAL_BREAKPOINT.label },
             { ...DebugEditorContextCommands.ADD_LOGPOINT, label: DebugCommands.ADD_LOGPOINT.label },
             { ...DebugEditorContextCommands.REMOVE_BREAKPOINT, label: DebugCommands.REMOVE_BREAKPOINT.label },
@@ -645,11 +646,11 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
             execute: (config?: DebugSessionOptions) => this.start(true, config)
         });
         registry.registerCommand(DebugCommands.STOP, {
-            execute: () => this.manager.terminateSessions(),
+            execute: () => this.manager.terminateSession(),
             isEnabled: () => this.manager.state !== DebugState.Inactive
         });
         registry.registerCommand(DebugCommands.RESTART, {
-            execute: () => this.manager.restartSessions(),
+            execute: () => this.manager.restartSession(),
             isEnabled: () => this.manager.state !== DebugState.Inactive
         });
 
@@ -721,12 +722,12 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
         });
 
         registry.registerCommand(DebugSessionContextCommands.STOP, {
-            execute: () => this.selectedSession && this.selectedSession.terminate(),
+            execute: () => this.selectedSession && this.manager.terminateSession(this.selectedSession),
             isEnabled: () => !!this.selectedSession && this.selectedSession.state !== DebugState.Inactive,
             isVisible: () => !this.selectedThread
         });
         registry.registerCommand(DebugSessionContextCommands.RESTART, {
-            execute: () => this.selectedSession && this.manager.restart(this.selectedSession),
+            execute: () => this.selectedSession && this.manager.restartSession(this.selectedSession),
             isEnabled: () => !!this.selectedSession && this.selectedSession.state !== DebugState.Inactive,
             isVisible: () => !this.selectedThread
         });
@@ -1106,8 +1107,8 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
             priority: 1
         };
         const updateToggleBreakpointsEnabled = () => {
-            const activateBreakpoints = nls.localize('vscode/breakpointsView/enableAllBreakpoints', 'Enable Breakpoints');
-            const deactivateBreakpoints = nls.localize('vscode/breakpointsView/disableAllBreakpoints', 'Disable Breakpoints');
+            const activateBreakpoints = nls.localizeByDefault('Enable All Breakpoints');
+            const deactivateBreakpoints = nls.localizeByDefault('Disable All Breakpoints');
             const tooltip = this.breakpointManager.breakpointsEnabled ? deactivateBreakpoints : activateBreakpoints;
             if (toggleBreakpointsEnabled.tooltip !== tooltip) {
                 toggleBreakpointsEnabled.tooltip = tooltip;