@codingame/monaco-vscode-debug-service-override 13.1.7 → 14.0.0

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

@@ -194,7 +194,7 @@ let RawDebugSession = class RawDebugSession {
     }
     async start() {
         if (!this.debugAdapter) {
-            return Promise.reject(( new Error(( localize(5442, "No debug adapter, can not start debug session.")))));
+            return Promise.reject(( new Error(( localize(5584, "No debug adapter, can not start debug session.")))));
         }
         await this.debugAdapter.startSession();
         this.startTime = ( new Date()).getTime();
@@ -518,10 +518,10 @@ let RawDebugSession = class RawDebugSession {
                     const { confirmed } = await this.dialogSerivce.confirm({
                         type: Severity.Warning,
                         message: ( localize(
-                            5443,
+                            5585,
                             "The debugger needs to open a new tab or window for the debuggee but the browser prevented this. You must give permission to continue."
                         )),
-                        primaryButton: ( localize(5444, "&&Continue"))
+                        primaryButton: ( localize(5586, "&&Continue"))
                     });
                     if (confirmed) {
                         result = await this.launchVsCode(request.arguments);
@@ -621,7 +621,7 @@ let RawDebugSession = class RawDebugSession {
                     completeDispatch(undefined);
                 }
                 else {
-                    errorDispatch(( new Error(( localize(5445, "No debugger available found. Can not send '{0}'.", command)))));
+                    errorDispatch(( new Error(( localize(5587, "No debugger available found. Can not send '{0}'.", command)))));
                 }
                 return;
             }
@@ -654,7 +654,7 @@ let RawDebugSession = class RawDebugSession {
         const userMessage = error ? formatPII(error.format, false, error.variables) : errorMessage;
         const url = error?.url;
         if (error && url) {
-            const label = error.urlLabel ? error.urlLabel : ( localize(5446, "More Info"));
+            const label = error.urlLabel ? error.urlLabel : ( localize(5588, "More Info"));
             const uri = ( URI.parse(url));
             const actionId = uri.scheme === Schemas.command ? 'debug.moreInfo.command' : 'debug.moreInfo';
             return createErrorWithActions(userMessage, [toAction({ id: actionId, label, run: () => this.openerService.open(uri, { allowCommands: true }) })]);

package/vscode/src/vs/workbench/contrib/debug/browser/repl.d.ts

@@ -48,7 +48,6 @@ export declare class Repl extends FilterViewPane implements IHistoryNavigationWi
     private replInput;
     private replInputContainer;
     private bodyContentDimension;
-    private replInputLineCount;
     private model;
     private setHistoryNavigationEnablement;
     private scopedInstantiationService;
@@ -89,7 +88,7 @@ export declare class Repl extends FilterViewPane implements IHistoryNavigationWi
     getReplDataSource(): IAsyncDataSource<IDebugSession, IReplElement> | undefined;
     getFocusedElement(): IReplElement | undefined;
     focusTree(): void;
-    focus(): void;
+    focus(): Promise<void>;
     getActionViewItem(action: IAction): IActionViewItem | undefined;
     private get isMultiSessionView();
     private get refreshScheduler();

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

@@ -4,7 +4,7 @@ import { $ as $$1, clearNode, Dimension, isActiveElement, append, getWindow, add
 import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/mouseCursor/mouseCursor';
-import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { timeout, RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { memoize } from '@codingame/monaco-vscode-api/vscode/vs/base/common/decorators';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -74,6 +74,7 @@ import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { Variable } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplGroup, ReplEvaluationResult } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/replModel';
 import { FocusSessionActionViewItem } from './debugActionViewItems.js';
+import { DEBUG_COMMAND_CATEGORY, FOCUS_REPL_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 import { DebugExpressionRenderer } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
 import { debugConsoleEvaluationPrompt, debugConsoleClearAll } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import './media/repl.css.js';
@@ -100,7 +101,7 @@ let Repl = class Repl extends FilterViewPane {
         super({
             ...options,
             filterOptions: {
-                placeholder: ( localize(5447, "Filter (e.g. text, !exclude, \\escape)")),
+                placeholder: ( localize(5589, "Filter (e.g. text, !exclude, \\escape)")),
                 text: filterText,
                 history: JSON.parse(storageService.get(FILTER_HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')),
             }
@@ -115,7 +116,6 @@ let Repl = class Repl extends FilterViewPane {
         this.languageFeaturesService = languageFeaturesService;
         this.logService = logService;
         this.previousTreeScrollHeight = 0;
-        this.replInputLineCount = 1;
         this.styleChangedWhenInvisible = false;
         this.modelChangeListener = Disposable.None;
         this.findIsOpen = false;
@@ -137,7 +137,11 @@ let Repl = class Repl extends FilterViewPane {
         if (this.debugService.getViewModel().focusedSession) {
             this.onDidFocusSession(this.debugService.getViewModel().focusedSession);
         }
-        this._register(this.debugService.getViewModel().onDidFocusSession(async (session) => this.onDidFocusSession(session)));
+        this._register(this.debugService.getViewModel().onDidFocusSession(session => {
+            if (this.isVisible()) {
+                this.onDidFocusSession(session);
+            }
+        }));
         this._register(this.debugService.getViewModel().onDidEvaluateLazyExpression(async (e) => {
             if (e instanceof Variable && this.tree?.hasNode(e)) {
                 await this.tree.updateChildren(e, false, true);
@@ -162,19 +166,24 @@ let Repl = class Repl extends FilterViewPane {
             }
         }));
         this._register(this.onDidChangeBodyVisibility(visible => {
-            if (visible) {
-                if (!this.model) {
-                    this.model = this.modelService.getModel(Repl_1.URI) || this.modelService.createModel('', null, Repl_1.URI, true);
-                }
-                this.setMode();
-                this.replInput.setModel(this.model);
-                this.updateInputDecoration();
-                this.refreshReplElements(true);
-                if (this.styleChangedWhenInvisible) {
-                    this.styleChangedWhenInvisible = false;
-                    this.tree?.updateChildren(undefined, true, false);
-                    this.onDidStyleChange();
-                }
+            if (!visible) {
+                return;
+            }
+            if (!this.model) {
+                this.model = this.modelService.getModel(Repl_1.URI) || this.modelService.createModel('', null, Repl_1.URI, true);
+            }
+            const focusedSession = this.debugService.getViewModel().focusedSession;
+            if (this.tree && this.tree.getInput() !== focusedSession) {
+                this.onDidFocusSession(focusedSession);
+            }
+            this.setMode();
+            this.replInput.setModel(this.model);
+            this.updateInputDecoration();
+            this.refreshReplElements(true);
+            if (this.styleChangedWhenInvisible) {
+                this.styleChangedWhenInvisible = false;
+                this.tree?.updateChildren(undefined, true, false);
+                this.onDidStyleChange();
             }
         }));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
@@ -397,9 +406,7 @@ let Repl = class Repl extends FilterViewPane {
             revealLastElement(this.tree);
             this.history.add(this.replInput.getValue());
             this.replInput.setValue('');
-            const shouldRelayout = this.replInputLineCount > 1;
-            this.replInputLineCount = 1;
-            if (shouldRelayout && this.bodyContentDimension) {
+            if (this.bodyContentDimension) {
                 this.layoutBodyContent(this.bodyContentDimension.height, this.bodyContentDimension.width);
             }
         }
@@ -463,9 +470,10 @@ let Repl = class Repl extends FilterViewPane {
     focusTree() {
         this.tree?.domFocus();
     }
-    focus() {
+    async focus() {
         super.focus();
-        setTimeout(() => this.replInput.focus(), 0);
+        await timeout(0);
+        this.replInput.focus();
     }
     getActionViewItem(action) {
         if (action.id === selectReplCommandId) {
@@ -502,7 +510,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(5448, "Showing {0} of {1}", filtered, total)));
+            this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(5590, "Showing {0} of {1}", filtered, total)));
         }, Repl_1.REFRESH_DELAY));
     }
     render() {
@@ -554,6 +562,7 @@ let Repl = class Repl extends FilterViewPane {
             filter: this.filter,
             accessibilityProvider: ( new ReplAccessibilityProvider()),
             identityProvider,
+            userSelection: true,
             mouseSupport: false,
             findWidgetEnabled: true,
             keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e) => ( e.toString(true)) },
@@ -607,12 +616,13 @@ let Repl = class Repl extends FilterViewPane {
         options.acceptSuggestionOnEnter = config.console.acceptSuggestionOnEnter === 'on' ? 'on' : 'off';
         options.ariaLabel = this.getAriaLabel();
         this.replInput = this.scopedInstantiationService.createInstance(CodeEditorWidget, this.replInputContainer, options, getSimpleCodeEditorWidgetOptions());
+        let lastContentHeight = -1;
         this._register(this.replInput.onDidChangeModelContent(() => {
             const model = this.replInput.getModel();
             this.setHistoryNavigationEnablement(!!model && model.getValue() === '');
-            const lineCount = model ? Math.min(10, model.getLineCount()) : 1;
-            if (lineCount !== this.replInputLineCount) {
-                this.replInputLineCount = lineCount;
+            const contentHeight = this.replInput.getContentHeight();
+            if (contentHeight !== lastContentHeight) {
+                lastContentHeight = contentHeight;
                 if (this.bodyContentDimension) {
                     this.layoutBodyContent(this.bodyContentDimension.height, this.bodyContentDimension.width);
                 }
@@ -624,17 +634,17 @@ let Repl = class Repl extends FilterViewPane {
         this._register(addStandardDisposableListener(this.replInputContainer, EventType.BLUR, () => this.replInputContainer.classList.remove('synthetic-focus')));
     }
     getAriaLabel() {
-        let ariaLabel = ( localize(5449, "Debug Console"));
+        let ariaLabel = ( localize(5591, "Debug Console"));
         if (!this.configurationService.getValue(AccessibilityVerbositySettingId.Debug)) {
             return ariaLabel;
         }
         const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
         if (keybinding) {
-            ariaLabel = ( localize(5450, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
+            ariaLabel = ( localize(5592, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
         }
         else {
             ariaLabel = ( localize(
-                5451,
+                5593,
                 "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
                 ariaLabel
             ));
@@ -673,7 +683,7 @@ let Repl = class Repl extends FilterViewPane {
                 },
                 renderOptions: {
                     after: {
-                        contentText: ( localize(5452, "Please start a debug session to evaluate expressions")),
+                        contentText: ( localize(5594, "Please start a debug session to evaluate expressions")),
                         color: transparentForeground ? ( transparentForeground.toString()) : undefined
                     }
                 }
@@ -786,7 +796,7 @@ class AcceptReplInputAction extends EditorAction {
     constructor() {
         super({
             id: 'repl.action.acceptInput',
-            label: ( localize2(5453, "Debug Console: Accept Input")),
+            label: ( localize2(5595, "Debug Console: Accept Input")),
             precondition: CONTEXT_IN_DEBUG_REPL,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -806,7 +816,7 @@ class FilterReplAction extends ViewAction {
         super({
             viewId: REPL_VIEW_ID,
             id: 'repl.action.filter',
-            title: ( localize(5454, "Debug Console: Focus Filter")),
+            title: ( localize(5596, "Debug Console: Focus Filter")),
             precondition: CONTEXT_IN_DEBUG_REPL,
             keybinding: [{
                     when: EditorContextKeys.textInputFocus,
@@ -824,7 +834,7 @@ class FindReplAction extends ViewAction {
         super({
             viewId: REPL_VIEW_ID,
             id: 'repl.action.find',
-            title: ( localize(5455, "Debug Console: Focus Find")),
+            title: ( localize(5597, "Debug Console: Focus Find")),
             precondition: CONTEXT_IN_DEBUG_REPL,
             keybinding: [{
                     when: ( ContextKeyExpr.or(CONTEXT_IN_DEBUG_REPL, ( ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view')))),
@@ -852,7 +862,7 @@ class ReplCopyAllAction extends EditorAction {
     constructor() {
         super({
             id: 'repl.action.copyAll',
-            label: ( localize(5456, "Debug: Console Copy All")),
+            label: ( localize(5598, "Debug: Console Copy All")),
             alias: 'Debug Console Copy All',
             precondition: CONTEXT_IN_DEBUG_REPL,
         });
@@ -889,7 +899,7 @@ registerAction2(class extends ViewAction {
         super({
             id: selectReplCommandId,
             viewId: REPL_VIEW_ID,
-            title: ( localize(5457, "Select Debug Console")),
+            title: ( localize(5599, "Select Debug Console")),
             f1: false,
             menu: {
                 id: MenuId.ViewTitle,
@@ -918,9 +928,9 @@ registerAction2(class extends ViewAction {
         super({
             id: 'workbench.debug.panel.action.clearReplAction',
             viewId: REPL_VIEW_ID,
-            title: ( localize2(5458, 'Clear Console')),
+            title: ( localize2(5600, 'Clear Console')),
             metadata: {
-                description: ( localize2(5459, 'Clears all program output from your debug REPL'))
+                description: ( localize2(5601, 'Clears all program output from your debug REPL'))
             },
             f1: true,
             icon: debugConsoleClearAll,
@@ -952,7 +962,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'debug.collapseRepl',
-            title: ( localize(5460, "Collapse All")),
+            title: ( localize(5602, "Collapse All")),
             viewId: REPL_VIEW_ID,
             menu: {
                 id: MenuId.DebugConsoleContext,
@@ -970,7 +980,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'debug.replPaste',
-            title: ( localize(5461, "Paste")),
+            title: ( localize(5603, "Paste")),
             viewId: REPL_VIEW_ID,
             precondition: ( CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Inactive))),
             menu: {
@@ -1000,7 +1010,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.debug.action.copyAll',
-            title: ( localize(5462, "Copy All")),
+            title: ( localize(5604, "Copy All")),
             viewId: REPL_VIEW_ID,
             menu: {
                 id: MenuId.DebugConsoleContext,
@@ -1018,7 +1028,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.replCopy',
-            title: ( localize(5463, "Copy")),
+            title: ( localize(5605, "Copy")),
             menu: {
                 id: MenuId.DebugConsoleContext,
                 group: '2_cutcopypaste',
@@ -1056,5 +1066,19 @@ registerAction2(class extends Action2 {
         }
     }
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: FOCUS_REPL_ID,
+            category: DEBUG_COMMAND_CATEGORY,
+            title: ( localize2(5606, "Focus on Debug Console View")),
+        });
+    }
+    async run(accessor) {
+        const viewsService = accessor.get(IViewsService);
+        const repl = await viewsService.openView(REPL_VIEW_ID);
+        await repl?.focus();
+    }
+});
 
 export { Repl, getReplView };

package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.d.ts

@@ -1,10 +1,10 @@
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView";
-import { IAccessibleViewImplentation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
+import { IAccessibleViewImplementation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { Repl } from "./repl.js";
 import { AccessibilityVerbositySettingId } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration";
-export declare class ReplAccessibilityHelp implements IAccessibleViewImplentation {
+export declare class ReplAccessibilityHelp implements IAccessibleViewImplementation {
     priority: number;
     name: string;
     when: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression;

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

@@ -42,41 +42,41 @@ class ReplAccessibilityHelpProvider extends Disposable {
     provideContent() {
         return [
             ( localize(
-            5464,
+            5607,
             "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(
-            5465,
+            5608,
             "The debug console output can be navigated to from the input field with the Focus Previous Widget command{0}.",
             '<keybinding:widgetNavigation.focusPrevious>'
         )),
             ( localize(
-            5466,
+            5609,
             "The debug console input can be navigated to from the output with the Focus Next Widget command{0}.",
             '<keybinding:widgetNavigation.focusNext>'
         )),
             ( localize(
-            5467,
+            5610,
             "The debug console output history can be navigated with the up and down arrow keys."
         )),
             ( localize(
-            5468,
+            5611,
             "The Open Accessible View command{0} will allow character by character navigation of the console output.",
             '<keybinding:editor.action.accessibleView>'
         )),
             ( localize(
-            5469,
+            5612,
             "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>'
         )),
             ( localize(
-            5470,
+            5613,
             "The Debug: Clear Console command{0} will clear the console output.",
             '<keybinding:workbench.debug.panel.action.clearReplAction>'
         )),
             ( localize(
-            5471,
+            5614,
             "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.d.ts

@@ -2,12 +2,12 @@ import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentPro
 import { IAccessibleViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView.service";
 import { AccessibilityVerbositySettingId } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration";
 import { IReplElement } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug";
-import { IAccessibleViewImplentation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
+import { IAccessibleViewImplementation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { Repl } from "./repl.js";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-export declare class ReplAccessibleView implements IAccessibleViewImplentation {
+export declare class ReplAccessibleView implements IAccessibleViewImplementation {
     priority: number;
     name: string;
     when: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression;

package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.d.ts

@@ -15,7 +15,7 @@ import { IDebugSession, IExpression, IReplElement, IReplElementSource, IReplOpti
 import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
 import { Variable } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel";
 import { RawObjectReplElement, ReplEvaluationInput, ReplEvaluationResult, ReplGroup, ReplOutputElement, ReplVariableElement } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/replModel";
-import { AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions } from "./baseDebugView.js";
+import { AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/baseDebugView";
 import { DebugExpressionRenderer } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer";
 interface IReplEvaluationInputTemplateData {
     label: HighlightedLabel;

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

@@ -20,7 +20,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Variable } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvaluationInput, ReplGroup, RawObjectReplElement } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/replModel';
-import { AbstractExpressionsRenderer } from './baseDebugView.js';
+import { AbstractExpressionsRenderer } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { debugConsoleEvaluationInput } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 
 var ReplGroupRenderer_1, ReplOutputElementRenderer_1, ReplVariablesRenderer_1;
@@ -308,20 +308,20 @@ class ReplDataSource {
 }
 class ReplAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(5472, "Debug Console");
+        return localize(5615, "Debug Console");
     }
     getAriaLabel(element) {
         if (element instanceof Variable) {
-            return localize(5473, "Variable {0}, value {1}", element.name, element.value);
+            return localize(5616, "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(5474, ", occurred {0} times", element.count)) : '');
+            return element.value + (element instanceof ReplOutputElement && element.count > 1 ? ( localize(5617, ", occurred {0} times", element.count)) : '');
         }
         if (element instanceof RawObjectReplElement) {
-            return localize(5475, "Debug console variable {0}, value {1}", element.name, element.value);
+            return localize(5618, "Debug console variable {0}, value {1}", element.name, element.value);
         }
         if (element instanceof ReplGroup) {
-            return localize(5476, "Debug console group {0}", element.name);
+            return localize(5619, "Debug console group {0}", element.name);
         }
         return '';
     }

package/vscode/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.d.ts

@@ -1,11 +1,11 @@
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView";
-import { IAccessibleViewImplentation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
+import { IAccessibleViewImplementation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { AccessibilityVerbositySettingId } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
-export declare class RunAndDebugAccessibilityHelp implements IAccessibleViewImplentation {
+export declare class RunAndDebugAccessibilityHelp implements IAccessibleViewImplementation {
     priority: number;
     name: string;
     when: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;

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

@@ -53,79 +53,79 @@ let RunAndDebugAccessibilityHelpProvider = class RunAndDebugAccessibilityHelpPro
     provideContent() {
         return [
             ( localize(
-            5477,
+            5620,
             "The Show Run and Debug view command{0} will open the current view.",
             '<keybinding:workbench.view.debug>'
         )),
             ( localize(
-            5478,
+            5621,
             "The Debug: Start Debugging command{0} will start a debug session.",
             '<keybinding:workbench.action.debug.start>'
         )),
             ( localize(
-            5479,
+            5622,
             "Access debug output and evaluate expressions in the debug console, which can be focused with{0}.",
             '<keybinding:workbench.panel.repl.view.focus>'
         )),
             AccessibilityHelpNLS.setBreakpoint,
             AccessibilityHelpNLS.addToWatch,
-            ( localize(5480, "Once debugging, the following commands will be available:")),
+            ( localize(5623, "Once debugging, the following commands will be available:")),
             ( localize(
-            5481,
+            5624,
             "- Debug: Restart Debugging command{0} will restart the current debug session.",
             '<keybinding:workbench.action.debug.restart>'
         )),
             ( localize(
-            5482,
+            5625,
             "- Debug: Stop Debugging command{0} will stop the current debugging session.",
             '<keybinding:workbench.action.debug.stop>'
         )),
             ( localize(
-            5483,
+            5626,
             "- Debug: Continue command{0} will continue execution until the next breakpoint.",
             '<keybinding:workbench.action.debug.continue>'
         )),
             ( localize(
-            5484,
+            5627,
             "- Debug: Step Into command{0} will step into the next function call.",
             '<keybinding:workbench.action.debug.stepInto>'
         )),
             ( localize(
-            5485,
+            5628,
             "- Debug: Step Over command{0} will step over the current function call.",
             '<keybinding:workbench.action.debug.stepOver>'
         )),
             ( localize(
-            5486,
+            5629,
             "- Debug: Step Out command{0} will step out of the current function call.",
             '<keybinding:workbench.action.debug.stepOut>'
         )),
             ( localize(
-            5487,
+            5630,
             '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(
-            5488,
+            5631,
             "- Debug: Focus Breakpoints View command{0} will focus the breakpoints view.",
             '<keybinding:workbench.debug.action.focusBreakpointsView>'
         )),
             ( localize(
-            5489,
+            5632,
             "- Debug: Focus Call Stack View command{0} will focus the call stack view.",
             '<keybinding:workbench.debug.action.focusCallStackView>'
         )),
             ( localize(
-            5490,
+            5633,
             "- Debug: Focus Variables View command{0} will focus the variables view.",
             '<keybinding:workbench.debug.action.focusVariablesView>'
         )),
             ( localize(
-            5491,
+            5634,
             "- Debug: Focus Watch View command{0} will focus the watch view.",
             '<keybinding:workbench.debug.action.focusWatchView>'
         )),
             ( localize(
-            5492,
+            5635,
             "The setting {0} controls whether watch variable changes are announced.",
             'accessibility.debugWatchVariableAnnouncements'
         )),

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

@@ -27,7 +27,7 @@ const STATUS_BAR_DEBUGGING_BACKGROUND = registerColor('statusBar.debuggingBackgr
     hcDark: '#BA592C',
     hcLight: '#B5200D'
 }, ( localize(
-    5493,
+    5636,
     "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', {
@@ -36,14 +36,14 @@ const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForegr
     hcDark: STATUS_BAR_FOREGROUND,
     hcLight: '#FFFFFF'
 }, ( localize(
-    5494,
+    5637,
     "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(
-    5495,
+    5638,
     "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(5496, "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(5639, "Command center background color when a program is being debugged")), true);
 let StatusBarColorProvider = class StatusBarColorProvider {
     set enabled(enabled) {
         if (enabled === !!this.disposable) {

package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.d.ts

@@ -19,12 +19,12 @@ import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
 import { IViewletViewOptions } from "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
-import { IExpression, IScope, IViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug";
+import { IDebugViewWithVariables, IExpression, IScope, IViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug";
 import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
 import { IDebugVisualizerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debugVisualizers.service";
-import { AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions } from "./baseDebugView.js";
+import { AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/baseDebugView";
 import { DebugExpressionRenderer } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer";
-export declare class VariablesView extends ViewPane {
+export declare class VariablesView extends ViewPane implements IDebugViewWithVariables {
     private readonly debugService;
     private readonly menuService;
     private updateTreeScheduler;
@@ -32,6 +32,7 @@ export declare class VariablesView extends ViewPane {
     private tree;
     private savedViewState;
     private autoExpandedScopes;
+    get treeSelection(): (IExpression | IScope)[];
     constructor(options: IViewletViewOptions, contextMenuService: IContextMenuService, debugService: IDebugService, keybindingService: IKeybindingService, configurationService: IConfigurationService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, openerService: IOpenerService, themeService: IThemeService, telemetryService: ITelemetryService, hoverService: IHoverService, menuService: IMenuService);
     protected renderBody(container: HTMLElement): void;
     protected layoutBody(width: number, height: number): void;