@codingame/monaco-vscode-debug-service-override 7.1.0 → 8.0.0

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

@@ -24,7 +24,7 @@ import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/service
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ITextResourcePropertiesService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
 import { SuggestController } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggestController';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -64,7 +64,7 @@ import { FocusSessionActionViewItem } from './debugActionViewItems.js';
 import { debugConsoleEvaluationPrompt, debugConsoleClearAll } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { LinkDetector } from './linkDetector.js';
 import { ReplFilter } from './replFilter.js';
-import { ReplDelegate, ReplVariablesRenderer, ReplOutputElementRenderer, ReplEvaluationInputsRenderer, ReplGroupRenderer, ReplEvaluationResultsRenderer, ReplRawObjectsRenderer, ReplDataSource, ReplAccessibilityProvider } from './replViewer.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';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
@@ -74,9 +74,10 @@ import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/a
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 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';
 
 var Repl_1, ReplOptions_1;
-const _moduleId = "vs/workbench/contrib/debug/browser/repl";
 const $ = $$1;
 const HISTORY_STORAGE_KEY = 'debug.repl.history';
 const FILTER_HISTORY_STORAGE_KEY = 'debug.repl.filterHistory';
@@ -96,7 +97,7 @@ let Repl = class Repl extends FilterViewPane {
         super({
             ...options,
             filterOptions: {
-                placeholder: ( localizeWithPath(_moduleId, 0, "Filter (e.g. text, !exclude, \\escape)")),
+                placeholder: ( localize(6027, "Filter (e.g. text, !exclude, \\escape)")),
                 text: filterText,
                 history: JSON.parse(storageService.get(FILTER_HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')),
             }
@@ -104,8 +105,10 @@ let Repl = class Repl extends FilterViewPane {
         this.debugService = debugService;
         this.storageService = storageService;
         this.modelService = modelService;
+        this.configurationService = configurationService;
         this.textResourcePropertiesService = textResourcePropertiesService;
         this.editorService = editorService;
+        this.keybindingService = keybindingService;
         this.languageFeaturesService = languageFeaturesService;
         this.logService = logService;
         this.previousTreeScrollHeight = 0;
@@ -441,6 +444,15 @@ let Repl = class Repl extends FilterViewPane {
     getReplInput() {
         return this.replInput;
     }
+    getReplDataSource() {
+        return this.replDataSource;
+    }
+    getFocusedElement() {
+        return this.tree?.getFocus()?.[0];
+    }
+    focusTree() {
+        this.tree?.domFocus();
+    }
     focus() {
         super.focus();
         setTimeout(() => this.replInput.focus(), 0);
@@ -484,7 +496,7 @@ let Repl = class Repl extends FilterViewPane {
                     await autoExpandElements(session.getReplElements());
                 }
                 const { total, filtered } = this.getFilterStats();
-                this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(_moduleId, 1, "Showing {0} of {1}", filtered, total)));
+                this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(6028, "Showing {0} of {1}", filtered, total)));
             }, Repl_1.REFRESH_DELAY))
         );
     }
@@ -525,6 +537,7 @@ let Repl = class Repl extends FilterViewPane {
         const wordWrap = this.configurationService.getValue('debug').console.wordWrap;
         this.treeContainer.classList.toggle('word-wrap', wordWrap);
         const linkDetector = this.instantiationService.createInstance(LinkDetector);
+        this.replDataSource = ( (new ReplDataSource()));
         const tree = this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'DebugRepl', this.treeContainer, this.replDelegate, [
             this.instantiationService.createInstance(ReplVariablesRenderer, linkDetector),
             this.instantiationService.createInstance(ReplOutputElementRenderer, linkDetector),
@@ -532,9 +545,7 @@ let Repl = class Repl extends FilterViewPane {
             this.instantiationService.createInstance(ReplGroupRenderer, linkDetector),
             ( (new ReplEvaluationResultsRenderer(linkDetector, this.hoverService))),
             ( (new ReplRawObjectsRenderer(linkDetector, this.hoverService))),
-        ],
-        (
-        (new ReplDataSource())), {
+        ], this.replDataSource, {
             filter: this.filter,
             accessibilityProvider: ( (new ReplAccessibilityProvider())),
             identityProvider,
@@ -585,7 +596,7 @@ let Repl = class Repl extends FilterViewPane {
         options.suggest = { showStatusBar: true };
         const config = this.configurationService.getValue('debug');
         options.acceptSuggestionOnEnter = config.console.acceptSuggestionOnEnter === 'on' ? 'on' : 'off';
-        options.ariaLabel = ( localizeWithPath(_moduleId, 2, "Debug Console"));
+        options.ariaLabel = this.getAriaLabel();
         this.replInput = this.scopedInstantiationService.createInstance(CodeEditorWidget, this.replInputContainer, options, getSimpleCodeEditorWidgetOptions());
         this._register(this.replInput.onDidChangeModelContent(() => {
             const model = this.replInput.getModel();
@@ -603,6 +614,24 @@ let Repl = class Repl extends FilterViewPane {
         this._register(addStandardDisposableListener(this.replInputContainer, EventType.FOCUS, () => this.replInputContainer.classList.add('synthetic-focus')));
         this._register(addStandardDisposableListener(this.replInputContainer, EventType.BLUR, () => this.replInputContainer.classList.remove('synthetic-focus')));
     }
+    getAriaLabel() {
+        let ariaLabel = ( localize(6029, "Debug Console"));
+        if (!this.configurationService.getValue(AccessibilityVerbositySettingId.Debug)) {
+            return ariaLabel;
+        }
+        const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
+        if (keybinding) {
+            ariaLabel = ( localize(6030, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
+        }
+        else {
+            ariaLabel = ( localize(
+                6031,
+                "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
+                ariaLabel
+            ));
+        }
+        return ariaLabel;
+    }
     onContextMenu(e) {
         const actions = [];
         createAndFillInContextMenuActions(this.menu, { arg: e.element, shouldForwardArgs: false }, actions);
@@ -636,7 +665,7 @@ let Repl = class Repl extends FilterViewPane {
                 },
                 renderOptions: {
                     after: {
-                        contentText: ( localizeWithPath(_moduleId, 3, "Please start a debug session to evaluate expressions")),
+                        contentText: ( localize(6032, "Please start a debug session to evaluate expressions")),
                         color: transparentForeground ? ( (transparentForeground.toString())) : undefined
                     }
                 }
@@ -749,8 +778,8 @@ class AcceptReplInputAction extends EditorAction {
     constructor() {
         super({
             id: 'repl.action.acceptInput',
-            label: ( localizeWithPath(_moduleId, 4, "REPL Accept Input")),
-            alias: 'REPL Accept Input',
+            label: ( localize(6033, "Debug Console: Accept Input")),
+            alias: 'Debug Console: Accept Input',
             precondition: CONTEXT_IN_DEBUG_REPL,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -769,8 +798,8 @@ class FilterReplAction extends EditorAction {
     constructor() {
         super({
             id: 'repl.action.filter',
-            label: ( localizeWithPath(_moduleId, 5, "REPL Focus Content to Filter")),
-            alias: 'REPL Filter',
+            label: ( localize(6034, "Debug Console: Focus Filter")),
+            alias: 'Debug Console: Focus Filter',
             precondition: CONTEXT_IN_DEBUG_REPL,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -788,7 +817,7 @@ class ReplCopyAllAction extends EditorAction {
     constructor() {
         super({
             id: 'repl.action.copyAll',
-            label: ( localizeWithPath(_moduleId, 6, "Debug: Console Copy All")),
+            label: ( localize(6035, "Debug: Console Copy All")),
             alias: 'Debug Console Copy All',
             precondition: CONTEXT_IN_DEBUG_REPL,
         });
@@ -824,7 +853,7 @@ registerAction2(class extends ViewAction {
         super({
             id: selectReplCommandId,
             viewId: REPL_VIEW_ID,
-            title: ( localizeWithPath(_moduleId, 7, "Select Debug Console")),
+            title: ( localize(6036, "Select Debug Console")),
             f1: false,
             menu: {
                 id: MenuId.ViewTitle,
@@ -856,9 +885,9 @@ registerAction2(class extends ViewAction {
         super({
             id: 'workbench.debug.panel.action.clearReplAction',
             viewId: REPL_VIEW_ID,
-            title: ( localize2WithPath(_moduleId, 8, 'Clear Console')),
+            title: ( localize2(6037, 'Clear Console')),
             metadata: {
-                description: ( localize2WithPath(_moduleId, 9, 'Clears all program output from your debug REPL'))
+                description: ( localize2(6038, 'Clears all program output from your debug REPL'))
             },
             f1: true,
             icon: debugConsoleClearAll,
@@ -884,7 +913,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'debug.collapseRepl',
-            title: ( localizeWithPath(_moduleId, 10, "Collapse All")),
+            title: ( localize(6039, "Collapse All")),
             viewId: REPL_VIEW_ID,
             menu: {
                 id: MenuId.DebugConsoleContext,
@@ -902,7 +931,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'debug.replPaste',
-            title: ( localizeWithPath(_moduleId, 11, "Paste")),
+            title: ( localize(6040, "Paste")),
             viewId: REPL_VIEW_ID,
             precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Inactive)))),
             menu: {
@@ -932,7 +961,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.debug.action.copyAll',
-            title: ( localizeWithPath(_moduleId, 12, "Copy All")),
+            title: ( localize(6041, "Copy All")),
             viewId: REPL_VIEW_ID,
             menu: {
                 id: MenuId.DebugConsoleContext,
@@ -950,7 +979,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.replCopy',
-            title: ( localizeWithPath(_moduleId, 13, "Copy")),
+            title: ( localize(6042, "Copy")),
             menu: {
                 id: MenuId.DebugConsoleContext,
                 group: '2_cutcopypaste',
@@ -989,4 +1018,4 @@ registerAction2(class extends Action2 {
     }
 });
 
-export { Repl };
+export { Repl, getReplView };

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

@@ -0,0 +1,104 @@
+import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+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() {
+        this.priority = 120;
+        this.name = 'replHelp';
+        this.when = ( (ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view')));
+        this.type = AccessibleViewType.Help;
+    }
+    getProvider(accessor) {
+        const viewsService = accessor.get(IViewsService);
+        const replView = getReplView(viewsService);
+        if (!replView) {
+            return undefined;
+        }
+        return (
+             (new ReplAccessibilityHelpProvider(replView))
+        );
+    }
+}
+class ReplAccessibilityHelpProvider extends Disposable {
+    constructor(_replView) {
+        super();
+        this._replView = _replView;
+        this.id = AccessibleViewProviderId.ReplHelp;
+        this.verbositySettingKey = AccessibilityVerbositySettingId.Debug;
+        this.options = { type: AccessibleViewType.Help };
+        this._treeHadFocus = false;
+        this._treeHadFocus = !!_replView.getFocusedElement();
+    }
+    onClose() {
+        if (this._treeHadFocus) {
+            return this._replView.focusTree();
+        }
+        this._replView.getReplInput().focus();
+    }
+    provideContent() {
+        return [
+            ( localize(
+                6079,
+                "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(
+                6080,
+                "The debug console output can be navigated to from the input field with the Focus Previous Widget command{0}.",
+                '<keybinding:widgetNavigation.focusPrevious>'
+            )),
+            ( localize(
+                6081,
+                "The debug console input can be navigated to from the output with the Focus Next Widget command{0}.",
+                '<keybinding:widgetNavigation.focusNext>'
+            )),
+            ( localize(
+                6082,
+                "The debug console output history can be navigated with the up and down arrow keys."
+            )),
+            ( localize(
+                6083,
+                "The Open Accessible View command{0} will allow character by character navigation of the console output.",
+                '<keybinding:editor.action.accessibleView>'
+            )),
+            ( localize(
+                6084,
+                "The Show Run and Debug view command{0} will open the Run and Debug view.",
+                '<keybinding:workbench.view.debug>'
+            )),
+            AccessibilityHelpNLS.setBreakpoint,
+            ( localize(
+                6085,
+                "The setting `debug.expandLazyVariables` controls whether variables are evaluated automatically. This is enabled by default when using a screen reader."
+            )),
+            ( localize(
+                6086,
+                "The Debug: Continue command{0} will continue execution until the next breakpoint.",
+                '<keybinding:workbench.action.debug.continue>'
+            )),
+            ( localize(
+                6087,
+                "The Debug: Step Into command{0} will step into the next function call.",
+                '<keybinding:workbench.action.debug.stepInto>'
+            )),
+            ( localize(
+                6088,
+                "The Debug: Step Over command{0} will step over the current function call.",
+                '<keybinding:workbench.action.debug.stepOver>'
+            )),
+            ( localize(
+                6089,
+                "The Debug: Step Out command{0} will step out of the current function call.",
+                '<keybinding:workbench.action.debug.stepOut>'
+            )),
+        ].join('\n');
+    }
+}
+
+export { ReplAccessibilityHelp };

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

@@ -0,0 +1,122 @@
+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';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Position } from 'vscode/vscode/vs/editor/common/core/position';
+
+class ReplAccessibleView {
+    constructor() {
+        this.priority = 70;
+        this.name = 'debugConsole';
+        this.when = ( ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view'));
+        this.type = AccessibleViewType.View;
+    }
+    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));
+    }
+}
+let ReplOutputAccessibleViewProvider = class ReplOutputAccessibleViewProvider extends Disposable {
+    constructor(_replView, _focusedElement, _debugService, _accessibleViewService) {
+        super();
+        this._replView = _replView;
+        this._focusedElement = _focusedElement;
+        this._debugService = _debugService;
+        this._accessibleViewService = _accessibleViewService;
+        this.id = AccessibleViewProviderId.Repl;
+        this._onDidChangeContent = this._register(( new Emitter()));
+        this.onDidChangeContent = this._onDidChangeContent.event;
+        this._onDidResolveChildren = this._register(( new Emitter()));
+        this.onDidResolveChildren = this._onDidResolveChildren.event;
+        this.verbositySettingKey = AccessibilityVerbositySettingId.Debug;
+        this.options = {
+            type: AccessibleViewType.View
+        };
+        this._elementPositionMap = ( new Map());
+        this._treeHadFocus = false;
+        this._treeHadFocus = !!_focusedElement;
+    }
+    provideContent() {
+        const viewModel = this._debugService.getViewModel();
+        const focusedDebugSession = viewModel?.focusedSession;
+        if (!focusedDebugSession) {
+            return 'No debug session is active.';
+        }
+        const elements = focusedDebugSession.getReplElements();
+        if (!elements.length) {
+            return 'No output in the debug console.';
+        }
+        if (!this._content) {
+            this._updateContent(elements);
+        }
+        return this._content ?? ( elements.map(e => ( e.toString(true)))).join('\n');
+    }
+    onClose() {
+        this._content = undefined;
+        this._elementPositionMap.clear();
+        if (this._treeHadFocus) {
+            return this._replView.focusTree();
+        }
+        this._replView.getReplInput().focus();
+    }
+    onOpen() {
+        this._register(this.onDidResolveChildren(() => {
+            this._onDidChangeContent.fire();
+            queueMicrotask(() => {
+                if (this._focusedElement) {
+                    const position = this._elementPositionMap.get(this._focusedElement.getId());
+                    if (position) {
+                        this._accessibleViewService.setPosition(position, true);
+                    }
+                }
+            });
+        }));
+    }
+    async _updateContent(elements) {
+        const dataSource = this._replView.getReplDataSource();
+        if (!dataSource) {
+            return;
+        }
+        let line = 1;
+        const content = [];
+        for (const e of elements) {
+            content.push(( e.toString()).replace(/\n/g, ''));
+            this._elementPositionMap.set(e.getId(), ( new Position(line, 1)));
+            line++;
+            if (dataSource.hasChildren(e)) {
+                const childContent = [];
+                const children = await dataSource.getChildren(e);
+                for (const child of children) {
+                    const id = child.getId();
+                    if (!( this._elementPositionMap.has(id))) {
+                        this._elementPositionMap.set(id, ( new Position(line, 1)));
+                    }
+                    childContent.push('  ' + ( child.toString()));
+                    line++;
+                }
+                content.push(childContent.join('\n'));
+            }
+        }
+        this._content = content.join('\n');
+        this._onDidResolveChildren.fire();
+    }
+};
+ReplOutputAccessibleViewProvider = ( __decorate([
+    ( __param(2, IDebugService)),
+    ( __param(3, IAccessibleViewService))
+], ReplOutputAccessibleViewProvider));
+
+export { ReplAccessibleView };

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

@@ -9,7 +9,7 @@ import { 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';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
@@ -26,7 +26,6 @@ import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvalu
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 var ReplGroupRenderer_1, ReplOutputElementRenderer_1, ReplVariablesRenderer_1;
-const _moduleId = "vs/workbench/contrib/debug/browser/replViewer";
 const $ = $$1;
 class ReplEvaluationInputsRenderer {
     static { this.ID = 'replEvaluationInput'; }
@@ -301,26 +300,25 @@ class ReplDataSource {
 }
 class ReplAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Debug Console"));
+        return ( localize(10247, "Debug Console"));
     }
     getAriaLabel(element) {
         if (element instanceof Variable) {
-            return ( localizeWithPath(_moduleId, 1, "Variable {0}, value {1}", element.name, element.value));
+            return ( localize(10248, "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 ? ( localizeWithPath(_moduleId, 2, ", occurred {0} times", element.count)) : '');
+            return element.value + (element instanceof ReplOutputElement && element.count > 1 ? ( localize(10249, ", occurred {0} times", element.count)) : '');
         }
         if (element instanceof RawObjectReplElement) {
-            return ( localizeWithPath(
-                _moduleId,
-                3,
+            return ( localize(
+                10250,
                 "Debug console variable {0}, value {1}",
                 element.name,
                 element.value
             ));
         }
         if (element instanceof ReplGroup) {
-            return ( localizeWithPath(_moduleId, 4, "Debug console group {0}", element.name));
+            return ( localize(10251, "Debug console group {0}", element.name));
         }
         return '';
     }

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

@@ -0,0 +1,128 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { localize } from 'vscode/vscode/vs/nls';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { AccessibilityHelpNLS } from 'vscode/vscode/vs/editor/common/standaloneStrings';
+
+class RunAndDebugAccessibilityHelp {
+    constructor() {
+        this.priority = 120;
+        this.name = 'runAndDebugHelp';
+        this.when = ( (ContextKeyExpr.equals('activeViewlet', 'workbench.view.debug')));
+        this.type = AccessibleViewType.Help;
+    }
+    getProvider(accessor) {
+        return (
+             (new RunAndDebugAccessibilityHelpProvider(accessor.get(ICommandService), accessor.get(IViewsService)))
+        );
+    }
+}
+let RunAndDebugAccessibilityHelpProvider = class RunAndDebugAccessibilityHelpProvider extends Disposable {
+    constructor(_commandService, _viewsService) {
+        super();
+        this._commandService = _commandService;
+        this._viewsService = _viewsService;
+        this.id = AccessibleViewProviderId.RunAndDebug;
+        this.verbositySettingKey = AccessibilityVerbositySettingId.Debug;
+        this.options = { type: AccessibleViewType.Help };
+        this._focusedView = this._viewsService.getFocusedViewName();
+    }
+    onClose() {
+        switch (this._focusedView) {
+            case 'Watch':
+                this._commandService.executeCommand('workbench.debug.action.focusWatchView');
+                break;
+            case 'Variables':
+                this._commandService.executeCommand('workbench.debug.action.focusVariablesView');
+                break;
+            case 'Call Stack':
+                this._commandService.executeCommand('workbench.debug.action.focusCallStackView');
+                break;
+            case 'Breakpoints':
+                this._commandService.executeCommand('workbench.debug.action.focusBreakpointsView');
+                break;
+            default:
+                this._commandService.executeCommand('workbench.view.debug');
+        }
+    }
+    provideContent() {
+        return [
+            ( localize(
+                6090,
+                "The Show Run and Debug view command{0} will open the current view.",
+                '<keybinding:workbench.view.debug>'
+            )),
+            ( localize(
+                6091,
+                "The Debug: Start Debugging command{0} will start a debug session.",
+                '<keybinding:workbench.action.debug.start>'
+            )),
+            AccessibilityHelpNLS.setBreakpoint,
+            ( localize(6092, "Once debugging, the following commands will be available:")),
+            ( localize(
+                6093,
+                "- Debug: Continue command{0} will continue execution until the next breakpoint.",
+                '<keybinding:workbench.action.debug.continue>'
+            )),
+            ( localize(
+                6094,
+                "- Debug: Step Into command{0} will step into the next function call.",
+                '<keybinding:workbench.action.debug.stepInto>'
+            )),
+            ( localize(
+                6095,
+                "- Debug: Step Over command{0} will step over the current function call.",
+                '<keybinding:workbench.action.debug.stepOver>'
+            )),
+            ( localize(
+                6096,
+                "- Debug: Step Out command{0} will step out of the current function call.",
+                '<keybinding:workbench.action.debug.stepOut>'
+            )),
+            ( localize(
+                6097,
+                '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(
+                6098,
+                "- Debug: Focus Breakpoints View command{0} will focus the breakpoints view.",
+                '<keybinding:workbench.debug.action.focusBreakpointsView>'
+            )),
+            ( localize(
+                6099,
+                "- Debug: Focus Call Stack View command{0} will focus the call stack view.",
+                '<keybinding:workbench.debug.action.focusCallStackView>'
+            )),
+            ( localize(
+                6100,
+                "- Debug: Focus Variables View command{0} will focus the variables view.",
+                '<keybinding:workbench.debug.action.focusVariablesView>'
+            )),
+            ( localize(
+                6101,
+                "- Debug: Focus Watch View command{0} will focus the watch view.",
+                '<keybinding:workbench.debug.action.focusWatchView>'
+            )),
+            ( localize(
+                6102,
+                "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(
+                6103,
+                "The setting {0} controls whether watch variable changes are announced.",
+                'accessibility.debugWatchVariableAnnouncements'
+            )),
+        ].join('\n');
+    }
+};
+RunAndDebugAccessibilityHelpProvider = ( (__decorate([
+    ( (__param(0, ICommandService))),
+    ( (__param(1, IViewsService)))
+], RunAndDebugAccessibilityHelpProvider)));
+
+export { RunAndDebugAccessibilityHelp };