@theia/debug 1.18.0 → 1.21.0-next.12

package/lib/browser/debug-frontend-application-contribution.js

@@ -57,6 +57,7 @@ const debug_watch_expression_1 = require("./view/debug-watch-expression");
 const debug_watch_manager_1 = require("./debug-watch-manager");
 const debug_function_breakpoint_1 = require("./model/debug-function-breakpoint");
 const debug_breakpoint_1 = require("./model/debug-breakpoint");
+const nls_1 = require("@theia/core/lib/common/nls");
 var DebugMenus;
 (function (DebugMenus) {
     DebugMenus.DEBUG = [...common_1.MAIN_MENU_BAR, '6_debug'];
@@ -68,207 +69,228 @@ var DebugMenus;
     DebugMenus.DEBUG_NEW_BREAKPOINT = [...DebugMenus.DEBUG_BREAKPOINT, 'a_new_breakpoint'];
     DebugMenus.DEBUG_BREAKPOINTS = [...DebugMenus.DEBUG, 'f_breakpoints'];
 })(DebugMenus = exports.DebugMenus || (exports.DebugMenus = {}));
+function nlsEditBreakpoint(breakpointKey, breakpoint) {
+    return nls_1.nls.localizeByDefault('Edit {0}...', nls_1.nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
+}
+function nlsRemoveBreakpoint(breakpointKey, breakpoint) {
+    return nls_1.nls.localizeByDefault('Remove {0}', nls_1.nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
+}
+function nlsEnableBreakpoint(breakpointKey, breakpoint) {
+    return nls_1.nls.localizeByDefault('Enable {0}', nls_1.nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
+}
+function nlsDisableBreakpoint(breakpointKey, breakpoint) {
+    return nls_1.nls.localizeByDefault('Disable {0}', nls_1.nls.localize(`vscode/breakpointEditorContribution/${breakpointKey}`, breakpoint));
+}
 var DebugCommands;
 (function (DebugCommands) {
     DebugCommands.DEBUG_CATEGORY = 'Debug';
-    DebugCommands.START = {
+    DebugCommands.DEBUG_CATEGORY_KEY = nls_1.nls.getDefaultKey(DebugCommands.DEBUG_CATEGORY);
+    DebugCommands.START = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.start',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Start Debugging',
         iconClass: browser_1.codicon('debug-alt')
-    };
-    DebugCommands.START_NO_DEBUG = {
+    });
+    DebugCommands.START_NO_DEBUG = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.run',
-        label: 'Debug: Start Without Debugging'
-    };
-    DebugCommands.STOP = {
+        category: DebugCommands.DEBUG_CATEGORY,
+        label: 'Start Without Debugging'
+    });
+    DebugCommands.STOP = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.stop',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Stop Debugging',
+        label: 'Stop',
         iconClass: browser_1.codicon('debug-stop')
-    };
-    DebugCommands.RESTART = {
+    });
+    DebugCommands.RESTART = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.restart',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Restart Debugging',
-    };
-    DebugCommands.OPEN_CONFIGURATIONS = {
+        label: 'Restart',
+    });
+    DebugCommands.OPEN_CONFIGURATIONS = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.configurations.open',
-        label: 'Debug: Open Configurations'
-    };
-    DebugCommands.ADD_CONFIGURATION = {
+        category: DebugCommands.DEBUG_CATEGORY,
+        label: 'Open Configurations'
+    });
+    DebugCommands.ADD_CONFIGURATION = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.configurations.add',
-        label: 'Debug: Add Configuration...'
-    };
-    DebugCommands.STEP_OVER = {
+        category: DebugCommands.DEBUG_CATEGORY,
+        label: 'Add Configuration...'
+    });
+    DebugCommands.STEP_OVER = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.stepOver',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Step Over',
         iconClass: browser_1.codicon('debug-step-over')
-    };
-    DebugCommands.STEP_INTO = {
+    });
+    DebugCommands.STEP_INTO = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.stepInto',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Step Into',
         iconClass: browser_1.codicon('debug-step-into')
-    };
-    DebugCommands.STEP_OUT = {
+    });
+    DebugCommands.STEP_OUT = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.stepOut',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Step Out',
         iconClass: browser_1.codicon('debug-step-out')
-    };
-    DebugCommands.CONTINUE = {
+    });
+    DebugCommands.CONTINUE = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.continue',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Continue',
         iconClass: browser_1.codicon('debug-continue')
-    };
-    DebugCommands.PAUSE = {
+    });
+    DebugCommands.PAUSE = common_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.debug.pause',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Pause',
         iconClass: browser_1.codicon('debug-pause')
-    };
-    DebugCommands.CONTINUE_ALL = {
+    });
+    DebugCommands.CONTINUE_ALL = common_1.Command.toLocalizedCommand({
         id: 'debug.thread.continue.all',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Continue All',
         iconClass: browser_1.codicon('debug-continue')
-    };
-    DebugCommands.PAUSE_ALL = {
+    }, 'theia/debug/continueAll', DebugCommands.DEBUG_CATEGORY_KEY);
+    DebugCommands.PAUSE_ALL = common_1.Command.toLocalizedCommand({
         id: 'debug.thread.pause.all',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Pause All',
         iconClass: browser_1.codicon('debug-pause')
-    };
-    DebugCommands.TOGGLE_BREAKPOINT = {
+    }, 'theia/debug/pauseAll', DebugCommands.DEBUG_CATEGORY_KEY);
+    DebugCommands.TOGGLE_BREAKPOINT = common_1.Command.toDefaultLocalizedCommand({
         id: 'editor.debug.action.toggleBreakpoint',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Toggle Breakpoint',
-    };
-    DebugCommands.INLINE_BREAKPOINT = {
+    });
+    DebugCommands.INLINE_BREAKPOINT = common_1.Command.toDefaultLocalizedCommand({
         id: 'editor.debug.action.inlineBreakpoint',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Inline Breakpoint',
-    };
-    DebugCommands.ADD_CONDITIONAL_BREAKPOINT = {
+    });
+    DebugCommands.ADD_CONDITIONAL_BREAKPOINT = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.add.conditional',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Add Conditional Breakpoint...',
-    };
-    DebugCommands.ADD_LOGPOINT = {
+    });
+    DebugCommands.ADD_LOGPOINT = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.add.logpoint',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Add Logpoint...',
-    };
-    DebugCommands.ADD_FUNCTION_BREAKPOINT = {
+    });
+    DebugCommands.ADD_FUNCTION_BREAKPOINT = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.add.function',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Add Function Breakpoint...',
-    };
-    DebugCommands.ENABLE_ALL_BREAKPOINTS = {
+        label: 'Add Function Breakpoint',
+    });
+    DebugCommands.ENABLE_ALL_BREAKPOINTS = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.enableAll',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Enable All Breakpoints',
-    };
-    DebugCommands.DISABLE_ALL_BREAKPOINTS = {
+    });
+    DebugCommands.DISABLE_ALL_BREAKPOINTS = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.disableAll',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Disable All Breakpoints',
-    };
-    DebugCommands.EDIT_BREAKPOINT = {
+    });
+    DebugCommands.EDIT_BREAKPOINT = common_1.Command.toLocalizedCommand({
         id: 'debug.breakpoint.edit',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Edit Breakpoint...',
-    };
-    DebugCommands.EDIT_LOGPOINT = {
+        originalLabel: 'Edit Breakpoint...',
+        label: nlsEditBreakpoint('breakpoint', 'Breakpoint')
+    }, '', DebugCommands.DEBUG_CATEGORY_KEY);
+    DebugCommands.EDIT_LOGPOINT = common_1.Command.toLocalizedCommand({
         id: 'debug.logpoint.edit',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Edit Logpoint...',
-    };
-    DebugCommands.REMOVE_BREAKPOINT = {
+        originalLabel: 'Edit Logpoint...',
+        label: nlsEditBreakpoint('logPoint', 'Logpoint')
+    }, '', DebugCommands.DEBUG_CATEGORY_KEY);
+    DebugCommands.REMOVE_BREAKPOINT = common_1.Command.toLocalizedCommand({
         id: 'debug.breakpoint.remove',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Remove Breakpoint',
-    };
-    DebugCommands.REMOVE_LOGPOINT = {
+        originalLabel: 'Remove Breakpoint',
+        label: nlsRemoveBreakpoint('breakpoint', 'Breakpoint')
+    }, '', DebugCommands.DEBUG_CATEGORY_KEY);
+    DebugCommands.REMOVE_LOGPOINT = common_1.Command.toLocalizedCommand({
         id: 'debug.logpoint.remove',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Remove Logpoint',
-    };
-    DebugCommands.REMOVE_ALL_BREAKPOINTS = {
+        originalLabel: 'Remove Logpoint',
+        label: nlsRemoveBreakpoint('logPoint', 'Logpoint')
+    }, '', DebugCommands.DEBUG_CATEGORY_KEY);
+    DebugCommands.REMOVE_ALL_BREAKPOINTS = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.breakpoint.removeAll',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Remove All Breakpoints',
-    };
-    DebugCommands.TOGGLE_BREAKPOINTS_ENABLED = {
+    });
+    DebugCommands.TOGGLE_BREAKPOINTS_ENABLED = common_1.Command.toLocalizedCommand({
         id: 'debug.breakpoint.toggleEnabled'
-    };
-    DebugCommands.SHOW_HOVER = {
+    });
+    DebugCommands.SHOW_HOVER = common_1.Command.toDefaultLocalizedCommand({
         id: 'editor.debug.action.showDebugHover',
-        label: 'Debug: Show Hover'
-    };
-    DebugCommands.RESTART_FRAME = {
+        category: DebugCommands.DEBUG_CATEGORY,
+        label: 'Show Hover'
+    });
+    DebugCommands.RESTART_FRAME = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.frame.restart',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Restart Frame',
-    };
-    DebugCommands.COPY_CALL_STACK = {
+    });
+    DebugCommands.COPY_CALL_STACK = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.callStack.copy',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Copy Call Stack',
-    };
-    DebugCommands.SET_VARIABLE_VALUE = {
+    });
+    DebugCommands.SET_VARIABLE_VALUE = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.variable.setValue',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Set Value',
-    };
-    DebugCommands.COPY_VARIABLE_VALUE = {
+    });
+    DebugCommands.COPY_VARIABLE_VALUE = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.variable.copyValue',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Copy Value',
-    };
-    DebugCommands.COPY_VARIABLE_AS_EXPRESSION = {
+    });
+    DebugCommands.COPY_VARIABLE_AS_EXPRESSION = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.variable.copyAsExpression',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Copy As Expression',
-    };
-    DebugCommands.WATCH_VARIABLE = {
+        label: 'Copy as Expression',
+    });
+    DebugCommands.WATCH_VARIABLE = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.variable.watch',
         category: DebugCommands.DEBUG_CATEGORY,
         label: 'Add to Watch',
-    };
-    DebugCommands.ADD_WATCH_EXPRESSION = {
+    });
+    DebugCommands.ADD_WATCH_EXPRESSION = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.watch.addExpression',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Add Watch Expression'
-    };
-    DebugCommands.EDIT_WATCH_EXPRESSION = {
+        label: 'Add Expression'
+    });
+    DebugCommands.EDIT_WATCH_EXPRESSION = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.watch.editExpression',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Edit Watch Expression'
-    };
-    DebugCommands.COPY_WATCH_EXPRESSION_VALUE = {
+        label: 'Edit Expression'
+    });
+    DebugCommands.COPY_WATCH_EXPRESSION_VALUE = common_1.Command.toLocalizedCommand({
         id: 'debug.watch.copyExpressionValue',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Copy Watch Expression Value'
-    };
-    DebugCommands.REMOVE_WATCH_EXPRESSION = {
+        label: 'Copy Expression Value'
+    }, 'theia/debug/copyExpressionValue', DebugCommands.DEBUG_CATEGORY_KEY);
+    DebugCommands.REMOVE_WATCH_EXPRESSION = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.watch.removeExpression',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Remove Watch Expression'
-    };
-    DebugCommands.COLLAPSE_ALL_WATCH_EXPRESSIONS = {
+        label: 'Remove Expression'
+    });
+    DebugCommands.COLLAPSE_ALL_WATCH_EXPRESSIONS = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.watch.collapseAllExpressions',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Collapse All Watch Expressions'
-    };
-    DebugCommands.REMOVE_ALL_WATCH_EXPRESSIONS = {
+        label: 'Collapse All'
+    });
+    DebugCommands.REMOVE_ALL_WATCH_EXPRESSIONS = common_1.Command.toDefaultLocalizedCommand({
         id: 'debug.watch.removeAllExpressions',
         category: DebugCommands.DEBUG_CATEGORY,
-        label: 'Remove All Watch Expressions'
-    };
+        label: 'Remove All Expressions'
+    });
 })(DebugCommands = exports.DebugCommands || (exports.DebugCommands = {}));
 var DebugThreadContextCommands;
 (function (DebugThreadContextCommands) {
@@ -432,6 +454,9 @@ let DebugFrontendApplicationContribution = class DebugFrontendApplicationContrib
         this.breakpointManager.save();
         this.watchManager.save();
     }
+    onWillStop() {
+        return this.preference['debug.confirmOnExit'] === 'always' && !!this.manager.currentSession;
+    }
     registerMenus(menus) {
         super.registerMenus(menus);
         const registerMenuActions = (menuPath, ...commands) => {
@@ -446,27 +471,27 @@ let DebugFrontendApplicationContribution = class DebugFrontendApplicationContrib
                 });
             }
         };
-        menus.registerSubmenu(DebugMenus.DEBUG, 'Run');
+        menus.registerSubmenu(DebugMenus.DEBUG, nls_1.nls.localizeByDefault('Run'));
         registerMenuActions(DebugMenus.DEBUG_CONTROLS, DebugCommands.START, DebugCommands.START_NO_DEBUG, DebugCommands.STOP, DebugCommands.RESTART);
         registerMenuActions(DebugMenus.DEBUG_CONFIGURATION, DebugCommands.OPEN_CONFIGURATIONS, DebugCommands.ADD_CONFIGURATION);
         registerMenuActions(DebugMenus.DEBUG_THREADS, DebugCommands.CONTINUE, DebugCommands.STEP_OVER, DebugCommands.STEP_INTO, DebugCommands.STEP_OUT, DebugCommands.PAUSE);
         registerMenuActions(DebugMenus.DEBUG_SESSIONS, DebugCommands.CONTINUE_ALL, DebugCommands.PAUSE_ALL);
         registerMenuActions(DebugMenus.DEBUG_BREAKPOINT, DebugCommands.TOGGLE_BREAKPOINT);
-        menus.registerSubmenu(DebugMenus.DEBUG_NEW_BREAKPOINT, 'New Breakpoint');
+        menus.registerSubmenu(DebugMenus.DEBUG_NEW_BREAKPOINT, nls_1.nls.localizeByDefault('New Breakpoint'));
         registerMenuActions(DebugMenus.DEBUG_NEW_BREAKPOINT, DebugCommands.ADD_CONDITIONAL_BREAKPOINT, DebugCommands.INLINE_BREAKPOINT, DebugCommands.ADD_FUNCTION_BREAKPOINT, DebugCommands.ADD_LOGPOINT);
         registerMenuActions(DebugMenus.DEBUG_BREAKPOINTS, DebugCommands.ENABLE_ALL_BREAKPOINTS, DebugCommands.DISABLE_ALL_BREAKPOINTS, DebugCommands.REMOVE_ALL_BREAKPOINTS);
         registerMenuActions(debug_threads_widget_1.DebugThreadsWidget.CONTROL_MENU, Object.assign(Object.assign({}, DebugCommands.PAUSE), DebugThreadContextCommands.PAUSE), Object.assign(Object.assign({}, DebugCommands.CONTINUE), DebugThreadContextCommands.CONTINUE), Object.assign(Object.assign({}, DebugCommands.STEP_OVER), DebugThreadContextCommands.STEP_OVER), Object.assign(Object.assign({}, DebugCommands.STEP_INTO), DebugThreadContextCommands.STEP_INTO), Object.assign(Object.assign({}, DebugCommands.STEP_OUT), DebugThreadContextCommands.STEP_OUT), Object.assign(Object.assign({}, DebugCommands.PAUSE_ALL), DebugSessionContextCommands.PAUSE_ALL), Object.assign(Object.assign({}, DebugCommands.CONTINUE_ALL), DebugSessionContextCommands.CONTINUE_ALL));
-        registerMenuActions(debug_threads_widget_1.DebugThreadsWidget.TERMINATE_MENU, Object.assign(Object.assign(Object.assign({}, DebugCommands.RESTART), DebugSessionContextCommands.RESTART), { label: 'Restart' }), Object.assign(Object.assign(Object.assign({}, DebugCommands.STOP), DebugSessionContextCommands.STOP), { label: 'Stop' }), Object.assign(Object.assign({}, DebugThreadContextCommands.TERMINATE), { label: 'Terminate Thread' }));
-        registerMenuActions(debug_threads_widget_1.DebugThreadsWidget.OPEN_MENU, Object.assign(Object.assign({}, DebugSessionContextCommands.REVEAL), { label: 'Reveal' }), Object.assign(Object.assign({}, DebugSessionContextCommands.OPEN_LEFT), { label: 'Open Left' }), Object.assign(Object.assign({}, DebugSessionContextCommands.OPEN_RIGHT), { label: 'Open Right' }), Object.assign(Object.assign({}, DebugSessionContextCommands.OPEN_BOTTOM), { label: 'Open Bottom' }));
+        registerMenuActions(debug_threads_widget_1.DebugThreadsWidget.TERMINATE_MENU, Object.assign(Object.assign({}, DebugCommands.RESTART), DebugSessionContextCommands.RESTART), Object.assign(Object.assign({}, DebugCommands.STOP), DebugSessionContextCommands.STOP), Object.assign(Object.assign({}, DebugThreadContextCommands.TERMINATE), { label: nls_1.nls.localizeByDefault('Terminate Thread') }));
+        registerMenuActions(debug_threads_widget_1.DebugThreadsWidget.OPEN_MENU, Object.assign(Object.assign({}, DebugSessionContextCommands.REVEAL), { label: nls_1.nls.localize('theia/debug/reveal', 'Reveal') }), Object.assign(Object.assign({}, DebugSessionContextCommands.OPEN_LEFT), { label: nls_1.nls.localize('theia/debug/openLeft', 'Open Left') }), Object.assign(Object.assign({}, DebugSessionContextCommands.OPEN_RIGHT), { label: nls_1.nls.localize('theia/debug/openRight', 'Open Right') }), Object.assign(Object.assign({}, DebugSessionContextCommands.OPEN_BOTTOM), { label: nls_1.nls.localize('theia/debug/openBottom', 'Open Bottom') }));
         registerMenuActions(debug_stack_frames_widget_1.DebugStackFramesWidget.CONTEXT_MENU, DebugCommands.RESTART_FRAME, DebugCommands.COPY_CALL_STACK);
         registerMenuActions(debug_variables_widget_1.DebugVariablesWidget.EDIT_MENU, DebugCommands.SET_VARIABLE_VALUE, DebugCommands.COPY_VARIABLE_VALUE, DebugCommands.COPY_VARIABLE_AS_EXPRESSION);
         registerMenuActions(debug_variables_widget_1.DebugVariablesWidget.WATCH_MENU, DebugCommands.WATCH_VARIABLE);
-        registerMenuActions(debug_watch_widget_1.DebugWatchWidget.EDIT_MENU, Object.assign(Object.assign({}, DebugCommands.EDIT_WATCH_EXPRESSION), { label: 'Edit Expression' }), Object.assign(Object.assign({}, DebugCommands.COPY_WATCH_EXPRESSION_VALUE), { label: 'Copy Value' }));
-        registerMenuActions(debug_watch_widget_1.DebugWatchWidget.REMOVE_MENU, Object.assign(Object.assign({}, DebugCommands.REMOVE_WATCH_EXPRESSION), { label: 'Remove Expression' }), Object.assign(Object.assign({}, DebugCommands.REMOVE_ALL_WATCH_EXPRESSIONS), { label: 'Remove All Expressions' }));
+        registerMenuActions(debug_watch_widget_1.DebugWatchWidget.EDIT_MENU, DebugCommands.EDIT_WATCH_EXPRESSION, DebugCommands.COPY_WATCH_EXPRESSION_VALUE);
+        registerMenuActions(debug_watch_widget_1.DebugWatchWidget.REMOVE_MENU, DebugCommands.REMOVE_WATCH_EXPRESSION, DebugCommands.REMOVE_ALL_WATCH_EXPRESSIONS);
         registerMenuActions(debug_breakpoints_widget_1.DebugBreakpointsWidget.EDIT_MENU, DebugCommands.EDIT_BREAKPOINT, DebugCommands.EDIT_LOGPOINT);
         registerMenuActions(debug_breakpoints_widget_1.DebugBreakpointsWidget.REMOVE_MENU, DebugCommands.REMOVE_BREAKPOINT, DebugCommands.REMOVE_LOGPOINT, DebugCommands.REMOVE_ALL_BREAKPOINTS);
         registerMenuActions(debug_breakpoints_widget_1.DebugBreakpointsWidget.ENABLE_MENU, DebugCommands.ENABLE_ALL_BREAKPOINTS, DebugCommands.DISABLE_ALL_BREAKPOINTS);
-        registerMenuActions(debug_editor_model_1.DebugEditorModel.CONTEXT_MENU, Object.assign(Object.assign({}, DebugEditorContextCommands.ADD_BREAKPOINT), { label: 'Add Breakpoint' }), Object.assign(Object.assign({}, DebugEditorContextCommands.ADD_CONDITIONAL_BREAKPOINT), { label: DebugCommands.ADD_CONDITIONAL_BREAKPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.ADD_LOGPOINT), { label: DebugCommands.ADD_LOGPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.REMOVE_BREAKPOINT), { label: DebugCommands.REMOVE_BREAKPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.EDIT_BREAKPOINT), { label: DebugCommands.EDIT_BREAKPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.ENABLE_BREAKPOINT), { label: 'Enable Breakpoint' }), Object.assign(Object.assign({}, DebugEditorContextCommands.DISABLE_BREAKPOINT), { label: 'Disable Breakpoint' }), Object.assign(Object.assign({}, DebugEditorContextCommands.REMOVE_LOGPOINT), { label: DebugCommands.REMOVE_LOGPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.EDIT_LOGPOINT), { label: DebugCommands.EDIT_LOGPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.ENABLE_LOGPOINT), { label: 'Enable Logpoint' }), Object.assign(Object.assign({}, DebugEditorContextCommands.DISABLE_LOGPOINT), { label: 'Disable Logpoint' }));
+        registerMenuActions(debug_editor_model_1.DebugEditorModel.CONTEXT_MENU, Object.assign(Object.assign({}, DebugEditorContextCommands.ADD_BREAKPOINT), { label: nls_1.nls.localizeByDefault('Add Breakpoint') }), Object.assign(Object.assign({}, DebugEditorContextCommands.ADD_CONDITIONAL_BREAKPOINT), { label: DebugCommands.ADD_CONDITIONAL_BREAKPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.ADD_LOGPOINT), { label: DebugCommands.ADD_LOGPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.REMOVE_BREAKPOINT), { label: DebugCommands.REMOVE_BREAKPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.EDIT_BREAKPOINT), { label: DebugCommands.EDIT_BREAKPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.ENABLE_BREAKPOINT), { label: nlsEnableBreakpoint('breakpoint', 'Breakpoint') }), Object.assign(Object.assign({}, DebugEditorContextCommands.DISABLE_BREAKPOINT), { label: nlsDisableBreakpoint('breakpoint', 'Breakpoint') }), Object.assign(Object.assign({}, DebugEditorContextCommands.REMOVE_LOGPOINT), { label: DebugCommands.REMOVE_LOGPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.EDIT_LOGPOINT), { label: DebugCommands.EDIT_LOGPOINT.label }), Object.assign(Object.assign({}, DebugEditorContextCommands.ENABLE_LOGPOINT), { label: nlsEnableBreakpoint('logPoint', 'Logpoint') }), Object.assign(Object.assign({}, DebugEditorContextCommands.DISABLE_LOGPOINT), { label: nlsDisableBreakpoint('logPoint', 'Logpoint') }));
     }
     registerCommands(registry) {
         super.registerCommands(registry);
@@ -477,11 +502,11 @@ let DebugFrontendApplicationContribution = class DebugFrontendApplicationContrib
             execute: (config) => this.start(true, config)
         });
         registry.registerCommand(DebugCommands.STOP, {
-            execute: () => this.manager.terminateSessions(),
+            execute: () => this.manager.terminateSession(),
             isEnabled: () => this.manager.state !== debug_session_1.DebugState.Inactive
         });
         registry.registerCommand(DebugCommands.RESTART, {
-            execute: () => this.manager.restartSessions(),
+            execute: () => this.manager.restartSession(),
             isEnabled: () => this.manager.state !== debug_session_1.DebugState.Inactive
         });
         registry.registerCommand(DebugCommands.OPEN_CONFIGURATIONS, {
@@ -549,12 +574,12 @@ let DebugFrontendApplicationContribution = class DebugFrontendApplicationContrib
             isVisible: () => !!this.selectedThread && this.selectedThread.supportsTerminate
         });
         registry.registerCommand(DebugSessionContextCommands.STOP, {
-            execute: () => this.selectedSession && this.selectedSession.terminate(),
+            execute: () => this.selectedSession && this.manager.terminateSession(this.selectedSession),
             isEnabled: () => !!this.selectedSession && this.selectedSession.state !== debug_session_1.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 !== debug_session_1.DebugState.Inactive,
             isVisible: () => !this.selectedThread
         });
@@ -926,7 +951,9 @@ let DebugFrontendApplicationContribution = class DebugFrontendApplicationContrib
             priority: 1
         };
         const updateToggleBreakpointsEnabled = () => {
-            const tooltip = this.breakpointManager.breakpointsEnabled ? 'Deactivate Breakpoints' : 'Activate Breakpoints';
+            const activateBreakpoints = nls_1.nls.localizeByDefault('Enable All Breakpoints');
+            const deactivateBreakpoints = nls_1.nls.localizeByDefault('Disable All Breakpoints');
+            const tooltip = this.breakpointManager.breakpointsEnabled ? deactivateBreakpoints : activateBreakpoints;
             if (toggleBreakpointsEnabled.tooltip !== tooltip) {
                 toggleBreakpointsEnabled.tooltip = tooltip;
                 onDidChangeToggleBreakpointsEnabled.fire(undefined);
@@ -936,7 +963,7 @@ let DebugFrontendApplicationContribution = class DebugFrontendApplicationContrib
             id: DebugCommands.ADD_FUNCTION_BREAKPOINT.id,
             command: DebugCommands.ADD_FUNCTION_BREAKPOINT.id,
             icon: browser_1.codicon('add'),
-            tooltip: 'Add Function Breakpoint'
+            tooltip: DebugCommands.ADD_FUNCTION_BREAKPOINT.label
         });
         updateToggleBreakpointsEnabled();
         this.breakpointManager.onDidChangeBreakpoints(updateToggleBreakpointsEnabled);
@@ -951,20 +978,20 @@ let DebugFrontendApplicationContribution = class DebugFrontendApplicationContrib
             id: DebugCommands.ADD_WATCH_EXPRESSION.id,
             command: DebugCommands.ADD_WATCH_EXPRESSION.id,
             icon: browser_1.codicon('add'),
-            tooltip: 'Add Expression'
+            tooltip: DebugCommands.ADD_WATCH_EXPRESSION.label
         });
         toolbar.registerItem({
             id: DebugCommands.COLLAPSE_ALL_WATCH_EXPRESSIONS.id,
             command: DebugCommands.COLLAPSE_ALL_WATCH_EXPRESSIONS.id,
             icon: browser_1.codicon('collapse-all'),
-            tooltip: 'Collapse All',
+            tooltip: DebugCommands.COLLAPSE_ALL_WATCH_EXPRESSIONS.label,
             priority: 1
         });
         toolbar.registerItem({
             id: DebugCommands.REMOVE_ALL_WATCH_EXPRESSIONS.id,
             command: DebugCommands.REMOVE_ALL_WATCH_EXPRESSIONS.id,
             icon: browser_1.codicon('close-all'),
-            tooltip: 'Remove All Expressions',
+            tooltip: DebugCommands.REMOVE_ALL_WATCH_EXPRESSIONS.label,
             priority: 2
         });
     }