@codingame/monaco-vscode-debug-service-override 8.0.4 → 9.0.2

package/vscode/src/vs/workbench/contrib/debug/browser/repl.js

@@ -62,7 +62,7 @@ import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/
 import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { FocusSessionActionViewItem } from './debugActionViewItems.js';
 import { debugConsoleEvaluationPrompt, debugConsoleClearAll } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
-import { LinkDetector } from './linkDetector.js';
+import { LinkDetector } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
 import { ReplFilter } from './replFilter.js';
 import { ReplDelegate, ReplDataSource, ReplVariablesRenderer, ReplOutputElementRenderer, ReplEvaluationInputsRenderer, ReplGroupRenderer, ReplEvaluationResultsRenderer, ReplRawObjectsRenderer, ReplAccessibilityProvider } from './replViewer.js';
 import { DEBUG_SCHEME, CONTEXT_MULTI_SESSION_REPL, State, CONTEXT_IN_DEBUG_REPL, REPL_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -76,6 +76,7 @@ import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibi
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { AccessibilityCommandId } from 'vscode/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 
 var Repl_1, ReplOptions_1;
 const $ = $$1;
@@ -97,7 +98,7 @@ let Repl = class Repl extends FilterViewPane {
         super({
             ...options,
             filterOptions: {
-                placeholder: ( localize(6075, "Filter (e.g. text, !exclude, \\escape)")),
+                placeholder: ( localize(6041, "Filter (e.g. text, !exclude, \\escape)")),
                 text: filterText,
                 history: JSON.parse(storageService.get(FILTER_HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')),
             }
@@ -115,6 +116,7 @@ let Repl = class Repl extends FilterViewPane {
         this.replInputLineCount = 1;
         this.styleChangedWhenInvisible = false;
         this.modelChangeListener = Disposable.None;
+        this.findIsOpen = false;
         this.menu = menuService.createMenu(MenuId.DebugConsoleContext, contextKeyService);
         this._register(this.menu);
         this.history = ( (new HistoryNavigator(
@@ -288,6 +290,9 @@ let Repl = class Repl extends FilterViewPane {
     focusFilter() {
         this.filterWidget.focus();
     }
+    openFind() {
+        this.tree?.openFind();
+    }
     setMode() {
         if (!this.isVisible()) {
             return;
@@ -441,6 +446,9 @@ let Repl = class Repl extends FilterViewPane {
     collapseAll() {
         this.tree?.collapseAll();
     }
+    getDebugSession() {
+        return this.tree?.getInput();
+    }
     getReplInput() {
         return this.replInput;
     }
@@ -496,7 +504,7 @@ let Repl = class Repl extends FilterViewPane {
                     await autoExpandElements(session.getReplElements());
                 }
                 const { total, filtered } = this.getFilterStats();
-                this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(6076, "Showing {0} of {1}", filtered, total)));
+                this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(6042, "Showing {0} of {1}", filtered, total)));
             }, Repl_1.REFRESH_DELAY))
         );
     }
@@ -550,7 +558,7 @@ let Repl = class Repl extends FilterViewPane {
             accessibilityProvider: ( (new ReplAccessibilityProvider())),
             identityProvider,
             mouseSupport: false,
-            findWidgetEnabled: false,
+            findWidgetEnabled: true,
             keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e) => ( (e.toString(true))) },
             horizontalScrolling: !wordWrap,
             setRowLineHeight: false,
@@ -569,8 +577,12 @@ let Repl = class Repl extends FilterViewPane {
             this.previousTreeScrollHeight = tree.scrollHeight;
         }));
         this._register(tree.onContextMenu(e => this.onContextMenu(e)));
+        this._register(tree.onDidChangeFindOpenState((open) => this.findIsOpen = open));
         let lastSelectedString;
         this._register(tree.onMouseClick(() => {
+            if (this.findIsOpen) {
+                return;
+            }
             const selection = getWindow(this.treeContainer).getSelection();
             if (!selection || selection.type !== 'Range' || lastSelectedString === ( (selection.toString()))) {
                 this.replInput.focus();
@@ -615,17 +627,17 @@ let Repl = class Repl extends FilterViewPane {
         this._register(addStandardDisposableListener(this.replInputContainer, EventType.BLUR, () => this.replInputContainer.classList.remove('synthetic-focus')));
     }
     getAriaLabel() {
-        let ariaLabel = ( localize(6077, "Debug Console"));
+        let ariaLabel = ( localize(6043, "Debug Console"));
         if (!this.configurationService.getValue(AccessibilityVerbositySettingId.Debug)) {
             return ariaLabel;
         }
         const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
         if (keybinding) {
-            ariaLabel = ( localize(6078, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
+            ariaLabel = ( localize(6044, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
         }
         else {
             ariaLabel = ( localize(
-                6079,
+                6045,
                 "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
                 ariaLabel
             ));
@@ -665,7 +677,7 @@ let Repl = class Repl extends FilterViewPane {
                 },
                 renderOptions: {
                     after: {
-                        contentText: ( localize(6080, "Please start a debug session to evaluate expressions")),
+                        contentText: ( localize(6046, "Please start a debug session to evaluate expressions")),
                         color: transparentForeground ? ( (transparentForeground.toString())) : undefined
                     }
                 }
@@ -778,7 +790,7 @@ class AcceptReplInputAction extends EditorAction {
     constructor() {
         super({
             id: 'repl.action.acceptInput',
-            label: ( localize(6081, "Debug Console: Accept Input")),
+            label: ( localize(6047, "Debug Console: Accept Input")),
             alias: 'Debug Console: Accept Input',
             precondition: CONTEXT_IN_DEBUG_REPL,
             kbOpts: {
@@ -794,30 +806,61 @@ class AcceptReplInputAction extends EditorAction {
         repl?.acceptReplInput();
     }
 }
-class FilterReplAction extends EditorAction {
+class FilterReplAction extends ViewAction {
     constructor() {
         super({
+            viewId: REPL_VIEW_ID,
             id: 'repl.action.filter',
-            label: ( localize(6082, "Debug Console: Focus Filter")),
-            alias: 'Debug Console: Focus Filter',
+            title: ( localize(6048, "Debug Console: Focus Filter")),
             precondition: CONTEXT_IN_DEBUG_REPL,
-            kbOpts: {
-                kbExpr: EditorContextKeys.textInputFocus,
-                primary: KeyMod.CtrlCmd | KeyCode.KeyF,
-                weight: KeybindingWeight.EditorContrib
-            }
+            keybinding: [{
+                    when: EditorContextKeys.textInputFocus,
+                    primary: KeyMod.CtrlCmd | KeyCode.KeyF,
+                    weight: KeybindingWeight.EditorContrib
+                }]
         });
     }
-    run(accessor, editor) {
-        const repl = getReplView(accessor.get(IViewsService));
-        repl?.focusFilter();
+    runInView(accessor, repl) {
+        repl.focusFilter();
+    }
+}
+class FindReplAction extends ViewAction {
+    constructor() {
+        super({
+            viewId: REPL_VIEW_ID,
+            id: 'repl.action.find',
+            title: ( localize(6049, "Debug Console: Focus Find")),
+            precondition: CONTEXT_IN_DEBUG_REPL,
+            keybinding: [{
+                    when: ( (ContextKeyExpr.or(
+                        CONTEXT_IN_DEBUG_REPL,
+                         (ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view'))
+                    ))),
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyF,
+                    weight: KeybindingWeight.EditorContrib
+                }],
+            icon: Codicon.search,
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    when: ( (ContextKeyExpr.equals('view', REPL_VIEW_ID))),
+                    order: 15
+                }, {
+                    id: MenuId.DebugConsoleContext,
+                    group: 'z_commands',
+                    order: 25
+                }],
+        });
+    }
+    runInView(accessor, view) {
+        view.openFind();
     }
 }
 class ReplCopyAllAction extends EditorAction {
     constructor() {
         super({
             id: 'repl.action.copyAll',
-            label: ( localize(6083, "Debug: Console Copy All")),
+            label: ( localize(6050, "Debug: Console Copy All")),
             alias: 'Debug Console Copy All',
             precondition: CONTEXT_IN_DEBUG_REPL,
         });
@@ -832,7 +875,8 @@ class ReplCopyAllAction extends EditorAction {
 }
 registerEditorAction(AcceptReplInputAction);
 registerEditorAction(ReplCopyAllAction);
-registerEditorAction(FilterReplAction);
+registerAction2(FilterReplAction);
+registerAction2(FindReplAction);
 class SelectReplActionViewItem extends FocusSessionActionViewItem {
     getSessions() {
         return this.debugService.getModel().getSessions(true).filter(s => s.hasSeparateRepl() && !( (sessionsToIgnore.has(s))));
@@ -853,7 +897,7 @@ registerAction2(class extends ViewAction {
         super({
             id: selectReplCommandId,
             viewId: REPL_VIEW_ID,
-            title: ( localize(6084, "Select Debug Console")),
+            title: ( localize(6051, "Select Debug Console")),
             f1: false,
             menu: {
                 id: MenuId.ViewTitle,
@@ -885,9 +929,9 @@ registerAction2(class extends ViewAction {
         super({
             id: 'workbench.debug.panel.action.clearReplAction',
             viewId: REPL_VIEW_ID,
-            title: ( localize2(6085, 'Clear Console')),
+            title: ( localize2(6052, 'Clear Console')),
             metadata: {
-                description: ( localize2(6086, 'Clears all program output from your debug REPL'))
+                description: ( localize2(6053, 'Clears all program output from your debug REPL'))
             },
             f1: true,
             icon: debugConsoleClearAll,
@@ -900,7 +944,13 @@ registerAction2(class extends ViewAction {
                     id: MenuId.DebugConsoleContext,
                     group: 'z_commands',
                     order: 20
-                }]
+                }],
+            keybinding: [{
+                    primary: 0,
+                    mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyK },
+                    weight: KeybindingWeight.WorkbenchContrib + 1,
+                    when: ( (ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view')))
+                }],
         });
     }
     runInView(_accessor, view) {
@@ -913,7 +963,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'debug.collapseRepl',
-            title: ( localize(6087, "Collapse All")),
+            title: ( localize(6054, "Collapse All")),
             viewId: REPL_VIEW_ID,
             menu: {
                 id: MenuId.DebugConsoleContext,
@@ -931,7 +981,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'debug.replPaste',
-            title: ( localize(6088, "Paste")),
+            title: ( localize(6055, "Paste")),
             viewId: REPL_VIEW_ID,
             precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Inactive)))),
             menu: {
@@ -961,7 +1011,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.debug.action.copyAll',
-            title: ( localize(6089, "Copy All")),
+            title: ( localize(6056, "Copy All")),
             viewId: REPL_VIEW_ID,
             menu: {
                 id: MenuId.DebugConsoleContext,
@@ -979,7 +1029,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.replCopy',
-            title: ( localize(6090, "Copy")),
+            title: ( localize(6057, "Copy")),
             menu: {
                 id: MenuId.DebugConsoleContext,
                 group: '2_cutcopypaste',

package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.js

@@ -5,7 +5,6 @@ import { getReplView } from './repl.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { localize } from 'vscode/vscode/vs/nls';
-import { AccessibilityHelpNLS } from 'vscode/vscode/vs/editor/common/standaloneStrings';
 
 class ReplAccessibilityHelp {
     constructor() {
@@ -44,58 +43,42 @@ class ReplAccessibilityHelpProvider extends Disposable {
     provideContent() {
         return [
             ( localize(
-                6115,
+                6094,
                 "The debug console is a Read-Eval-Print-Loop that allows you to evaluate expressions and run commands and can be focused with{0}.",
                 '<keybinding:workbench.panel.repl.view.focus>'
             )),
             ( localize(
-                6116,
+                6095,
                 "The debug console output can be navigated to from the input field with the Focus Previous Widget command{0}.",
                 '<keybinding:widgetNavigation.focusPrevious>'
             )),
             ( localize(
-                6117,
+                6096,
                 "The debug console input can be navigated to from the output with the Focus Next Widget command{0}.",
                 '<keybinding:widgetNavigation.focusNext>'
             )),
             ( localize(
-                6118,
+                6097,
                 "The debug console output history can be navigated with the up and down arrow keys."
             )),
             ( localize(
-                6119,
+                6098,
                 "The Open Accessible View command{0} will allow character by character navigation of the console output.",
                 '<keybinding:editor.action.accessibleView>'
             )),
             ( localize(
-                6120,
-                "The Show Run and Debug view command{0} will open the Run and Debug view.",
+                6099,
+                "The Show Run and Debug view command{0} will open the Run and Debug view and provides more information about debugging.",
                 '<keybinding:workbench.view.debug>'
             )),
-            AccessibilityHelpNLS.setBreakpoint,
             ( localize(
-                6121,
-                "The setting `debug.expandLazyVariables` controls whether variables are evaluated automatically. This is enabled by default when using a screen reader."
-            )),
-            ( localize(
-                6122,
-                "The Debug: Continue command{0} will continue execution until the next breakpoint.",
-                '<keybinding:workbench.action.debug.continue>'
-            )),
-            ( localize(
-                6123,
-                "The Debug: Step Into command{0} will step into the next function call.",
-                '<keybinding:workbench.action.debug.stepInto>'
-            )),
-            ( localize(
-                6124,
-                "The Debug: Step Over command{0} will step over the current function call.",
-                '<keybinding:workbench.action.debug.stepOver>'
+                6100,
+                "The Debug: Clear Console command{0} will clear the console output.",
+                '<keybinding:workbench.debug.panel.action.clearReplAction>'
             )),
             ( localize(
-                6125,
-                "The Debug: Step Out command{0} will step out of the current function call.",
-                '<keybinding:workbench.action.debug.stepOut>'
+                6101,
+                "The setting `debug.expandLazyVariables` controls whether variables are evaluated automatically. This is enabled by default when using a screen reader."
             )),
         ].join('\n');
     }

package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibleView.js

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { IAccessibleViewService } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView.service';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { getReplView } from './repl.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -19,22 +18,20 @@ class ReplAccessibleView {
     }
     getProvider(accessor) {
         const viewsService = accessor.get(IViewsService);
-        const debugService = accessor.get(IDebugService);
         const accessibleViewService = accessor.get(IAccessibleViewService);
         const replView = getReplView(viewsService);
         if (!replView) {
             return undefined;
         }
         const focusedElement = replView.getFocusedElement();
-        return ( new ReplOutputAccessibleViewProvider(replView, focusedElement, debugService, accessibleViewService));
+        return ( new ReplOutputAccessibleViewProvider(replView, focusedElement, accessibleViewService));
     }
 }
 let ReplOutputAccessibleViewProvider = class ReplOutputAccessibleViewProvider extends Disposable {
-    constructor(_replView, _focusedElement, _debugService, _accessibleViewService) {
+    constructor(_replView, _focusedElement, _accessibleViewService) {
         super();
         this._replView = _replView;
         this._focusedElement = _focusedElement;
-        this._debugService = _debugService;
         this._accessibleViewService = _accessibleViewService;
         this.id = AccessibleViewProviderId.Repl;
         this._onDidChangeContent = this._register(( new Emitter()));
@@ -50,12 +47,11 @@ let ReplOutputAccessibleViewProvider = class ReplOutputAccessibleViewProvider ex
         this._treeHadFocus = !!_focusedElement;
     }
     provideContent() {
-        const viewModel = this._debugService.getViewModel();
-        const focusedDebugSession = viewModel?.focusedSession;
-        if (!focusedDebugSession) {
-            return 'No debug session is active.';
+        const debugSession = this._replView.getDebugSession();
+        if (!debugSession) {
+            return 'No debug session available.';
         }
-        const elements = focusedDebugSession.getReplElements();
+        const elements = debugSession.getReplElements();
         if (!elements.length) {
             return 'No output in the debug console.';
         }
@@ -115,8 +111,7 @@ let ReplOutputAccessibleViewProvider = class ReplOutputAccessibleViewProvider ex
     }
 };
 ReplOutputAccessibleViewProvider = ( __decorate([
-    ( __param(2, IDebugService)),
-    ( __param(3, IAccessibleViewService))
+    ( __param(2, IAccessibleViewService))
 ], ReplOutputAccessibleViewProvider));
 
 export { ReplAccessibleView };

package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js

@@ -5,7 +5,7 @@ import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedla
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { CachedListVirtualDelegate } from 'vscode/vscode/vs/base/browser/ui/list/list';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { basename } from 'vscode/vscode/vs/base/common/path';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
@@ -91,16 +91,19 @@ class ReplEvaluationResultsRenderer {
     renderTemplate(container) {
         const output = append(container, $('.evaluation-result.expression'));
         const value = append(output, $('span.value'));
-        return { value };
+        return { value, elementStore: ( (new DisposableStore())) };
     }
     renderElement(element, index, templateData) {
+        templateData.elementStore.clear();
         const expression = element.element;
-        renderExpressionValue(expression, templateData.value, {
+        renderExpressionValue(templateData.elementStore, expression, templateData.value, {
             colorize: true,
-            linkDetector: this.linkDetector
+            hover: false,
+            linkDetector: this.linkDetector,
         }, this.hoverService);
     }
     disposeTemplate(templateData) {
+        templateData.elementStore.dispose();
     }
 }
 let ReplOutputElementRenderer = class ReplOutputElementRenderer {
@@ -175,7 +178,7 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
         const isReplVariable = expression instanceof ReplVariableElement;
         if (isReplVariable || !expression.name) {
             data.label.set('');
-            renderExpressionValue(isReplVariable ? expression.expression : expression, data.value, { colorize: true, linkDetector: this.linkDetector }, this.hoverService);
+            renderExpressionValue(data.elementDisposable, isReplVariable ? expression.expression : expression, data.value, { colorize: true, linkDetector: this.linkDetector, hover: false }, this.hoverService);
             data.expression.classList.remove('nested-variable');
         }
         else {
@@ -208,9 +211,10 @@ class ReplRawObjectsRenderer {
         const name = append(expression, $('span.name'));
         const label = ( (new HighlightedLabel(name)));
         const value = append(expression, $('span.value'));
-        return { container, expression, name, label, value };
+        return { container, expression, name, label, value, elementStore: ( (new DisposableStore())) };
     }
     renderElement(node, index, templateData) {
+        templateData.elementStore.clear();
         const element = node.element;
         templateData.label.set(element.name ? `${element.name}:` : '', createMatches(node.filterData));
         if (element.name) {
@@ -219,11 +223,13 @@ class ReplRawObjectsRenderer {
         else {
             templateData.name.textContent = '';
         }
-        renderExpressionValue(element.value, templateData.value, {
-            linkDetector: this.linkDetector
+        renderExpressionValue(templateData.elementStore, element.value, templateData.value, {
+            linkDetector: this.linkDetector,
+            hover: false,
         }, this.hoverService);
     }
     disposeTemplate(templateData) {
+        templateData.elementStore.dispose();
         templateData.label.dispose();
     }
 }
@@ -300,25 +306,25 @@ class ReplDataSource {
 }
 class ReplAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(10259, "Debug Console"));
+        return ( localize(10303, "Debug Console"));
     }
     getAriaLabel(element) {
         if (element instanceof Variable) {
-            return ( localize(10260, "Variable {0}, value {1}", element.name, element.value));
+            return ( localize(10304, "Variable {0}, value {1}", element.name, element.value));
         }
         if (element instanceof ReplOutputElement || element instanceof ReplEvaluationInput || element instanceof ReplEvaluationResult) {
-            return element.value + (element instanceof ReplOutputElement && element.count > 1 ? ( localize(10261, ", occurred {0} times", element.count)) : '');
+            return element.value + (element instanceof ReplOutputElement && element.count > 1 ? ( localize(10305, ", occurred {0} times", element.count)) : '');
         }
         if (element instanceof RawObjectReplElement) {
             return ( localize(
-                10262,
+                10306,
                 "Debug console variable {0}, value {1}",
                 element.name,
                 element.value
             ));
         }
         if (element instanceof ReplGroup) {
-            return ( localize(10263, "Debug console group {0}", element.name));
+            return ( localize(10307, "Debug console group {0}", element.name));
         }
         return '';
     }

package/vscode/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.js

@@ -57,68 +57,79 @@ let RunAndDebugAccessibilityHelpProvider = class RunAndDebugAccessibilityHelpPro
     provideContent() {
         return [
             ( localize(
-                6126,
+                6102,
                 "The Show Run and Debug view command{0} will open the current view.",
                 '<keybinding:workbench.view.debug>'
             )),
             ( localize(
-                6127,
+                6103,
                 "The Debug: Start Debugging command{0} will start a debug session.",
                 '<keybinding:workbench.action.debug.start>'
             )),
+            ( localize(
+                6104,
+                "Access debug output and evaluate expressions in the debug console, which can be focused with{0}.",
+                '<keybinding:workbench.panel.repl.view.focus>'
+            )),
             AccessibilityHelpNLS.setBreakpoint,
-            ( localize(6128, "Once debugging, the following commands will be available:")),
+            AccessibilityHelpNLS.addToWatch,
+            ( localize(6105, "Once debugging, the following commands will be available:")),
+            ( localize(
+                6106,
+                "- Debug: Restart Debugging command{0} will restart the current debug session.",
+                '<keybinding:workbench.action.debug.restart>'
+            )),
             ( localize(
-                6129,
+                6107,
+                "- Debug: Stop Debugging command{0} will stop the current debugging session.",
+                '<keybinding:workbench.action.debug.stop>'
+            )),
+            ( localize(
+                6108,
                 "- Debug: Continue command{0} will continue execution until the next breakpoint.",
                 '<keybinding:workbench.action.debug.continue>'
             )),
             ( localize(
-                6130,
+                6109,
                 "- Debug: Step Into command{0} will step into the next function call.",
                 '<keybinding:workbench.action.debug.stepInto>'
             )),
             ( localize(
-                6131,
+                6110,
                 "- Debug: Step Over command{0} will step over the current function call.",
                 '<keybinding:workbench.action.debug.stepOver>'
             )),
             ( localize(
-                6132,
+                6111,
                 "- Debug: Step Out command{0} will step out of the current function call.",
                 '<keybinding:workbench.action.debug.stepOut>'
             )),
             ( localize(
-                6133,
+                6112,
                 'The debug viewlet is comprised of several views that can be focused with the following commands or navigated to via tab then arrow keys:'
             )),
             ( localize(
-                6134,
+                6113,
                 "- Debug: Focus Breakpoints View command{0} will focus the breakpoints view.",
                 '<keybinding:workbench.debug.action.focusBreakpointsView>'
             )),
             ( localize(
-                6135,
+                6114,
                 "- Debug: Focus Call Stack View command{0} will focus the call stack view.",
                 '<keybinding:workbench.debug.action.focusCallStackView>'
             )),
             ( localize(
-                6136,
+                6115,
                 "- Debug: Focus Variables View command{0} will focus the variables view.",
                 '<keybinding:workbench.debug.action.focusVariablesView>'
             )),
             ( localize(
-                6137,
+                6116,
                 "- Debug: Focus Watch View command{0} will focus the watch view.",
                 '<keybinding:workbench.debug.action.focusWatchView>'
             )),
             ( localize(
-                6138,
-                "The debug console is a Read-Eval-Print-Loop that allows you to evaluate expressions and run commands and can be focused with{0}.",
-                '<keybinding:workbench.panel.repl.view.focus>'
-            )),
-            ( localize(
-                6139,
+                6117,
                 "The setting {0} controls whether watch variable changes are announced.",
                 'accessibility.debugWatchVariableAnnouncements'
             )),

package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.js

@@ -26,7 +26,7 @@ const STATUS_BAR_DEBUGGING_BACKGROUND = registerColor('statusBar.debuggingBackgr
     hcDark: '#BA592C',
     hcLight: '#B5200D'
 }, ( localize(
-    6063,
+    6058,
     "Status bar background color when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
 const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForeground', {
@@ -35,14 +35,14 @@ const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForegr
     hcDark: STATUS_BAR_FOREGROUND,
     hcLight: '#FFFFFF'
 }, ( localize(
-    6064,
+    6059,
     "Status bar foreground color when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
 const STATUS_BAR_DEBUGGING_BORDER = registerColor('statusBar.debuggingBorder', STATUS_BAR_BORDER, ( localize(
-    6065,
+    6060,
     "Status bar border color separating to the sidebar and editor when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
-const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( (transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258))), ( localize(6066, "Command center background color when a program is being debugged")), true);
+const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( (transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258))), ( localize(6061, "Command center background color when a program is being debugged")), true);
 let StatusBarColorProvider = class StatusBarColorProvider {
     set enabled(enabled) {
         if (enabled === !!this.disposable) {