@codingame/monaco-vscode-debug-service-override 2.0.3 → 2.1.0

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

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
-import { $, append, addDisposableListener, EventType, addDisposableGenericMouseUpListener, getWindow, addDisposableGenericMouseDownListener, getComputedStyle, show, hide } from 'vscode/vscode/vs/base/browser/dom';
+import { $, append, addDisposableGenericMouseUpListener, getWindow, addDisposableGenericMouseDownListener, addDisposableListener, EventType, show, hide } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { equals } from 'vscode/vscode/vs/base/common/arrays';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
-import { dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { dispose, DisposableStore, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import './media/debugToolBar.css.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { DropdownWithPrimaryActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
@@ -31,6 +31,7 @@ import { VIEWLET_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 
 const DEBUG_TOOLBAR_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_TOOLBAR_Y_KEY = 'debug.actionswidgety';
@@ -48,6 +49,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.isVisible = false;
         this.isBuilt = false;
         this.stopActionViewItemDisposables = this._register(( new DisposableStore()));
+        this.auxWindowCoordinates = ( new WeakMap());
         this.$el = $('div.debug-toolbar');
         this.$el.style.top = `${layoutService.mainContainerOffset.top}px`;
         this.dragArea = append(this.$el, $('div.drag-area' + ThemeIcon.asCSSSelector(debugGripper)));
@@ -107,36 +109,47 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this._register(this.debugToolBarMenu.onDidChange(() => this.updateScheduler.schedule()));
         this._register(this.actionBar.actionRunner.onDidRun((e) => {
             if (e.error && !isCancellationError(e.error)) {
-                this.notificationService.error(e.error);
+                this.notificationService.warn(e.error);
             }
             this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' });
         }));
-        this._register(addDisposableListener(mainWindow, EventType.RESIZE, () => this.setCoordinates()));
         this._register(addDisposableGenericMouseUpListener(this.dragArea, (event) => {
             const mouseClickEvent = ( new StandardMouseEvent(getWindow(this.dragArea), event));
+            const activeWindow = getWindow(this.layoutService.activeContainer);
             if (mouseClickEvent.detail === 2) {
                 const widgetWidth = this.$el.clientWidth;
-                this.setCoordinates(0.5 * mainWindow.innerWidth - 0.5 * widgetWidth, 0);
+                this.setCoordinates(0.5 * activeWindow.innerWidth - 0.5 * widgetWidth, this.yDefault);
                 this.storePosition();
             }
         }));
         this._register(addDisposableGenericMouseDownListener(this.dragArea, (event) => {
             this.dragArea.classList.add('dragged');
+            getWindow(this.layoutService.activeContainer);
         }));
         this._register(this.layoutService.onDidChangePartVisibility(() => this.setYCoordinate()));
         this._register(PixelRatio.onDidChange(() => this.setYCoordinate()));
+        const resizeListener = this._register(( new MutableDisposable()));
+        this._register(this.layoutService.onDidChangeActiveContainer(() => {
+            this._yRange = undefined;
+            this.layoutService.whenActiveContainerStylesLoaded.then(() => {
+                if (this.isBuilt) {
+                    this.layoutService.activeContainer.appendChild(this.$el);
+                    this.setCoordinates();
+                }
+                resizeListener.value = this._register(addDisposableListener(getWindow(this.layoutService.activeContainer), EventType.RESIZE, () => this.setYCoordinate()));
+            });
+        }));
     }
     storePosition() {
-        const left = getComputedStyle(this.$el).left;
-        if (left) {
-            const position = parseFloat(left) / mainWindow.innerWidth;
-            this.storageService.store(DEBUG_TOOLBAR_POSITION_KEY, position, 0 , 1 );
-        }
-        if (this.yCoordinate) {
+        const activeWindow = getWindow(this.layoutService.activeContainer);
+        const isMainWindow = this.layoutService.activeContainer === this.layoutService.mainContainer;
+        const left = this.$el.getBoundingClientRect().left / activeWindow.innerWidth;
+        if (isMainWindow) {
+            this.storageService.store(DEBUG_TOOLBAR_POSITION_KEY, left, 0 , 1 );
             this.storageService.store(DEBUG_TOOLBAR_Y_KEY, this.yCoordinate, 0 , 1 );
         }
         else {
-            this.storageService.remove(DEBUG_TOOLBAR_Y_KEY, 0 );
+            this.auxWindowCoordinates.set(activeWindow, { x: left, y: this.yCoordinate });
         }
     }
     updateStyles() {
@@ -161,16 +174,24 @@ let DebugToolBar = class DebugToolBar extends Themable {
             return;
         }
         const widgetWidth = this.$el.clientWidth;
+        const currentWindow = getWindow(this.layoutService.activeContainer);
+        const isMainWindow = currentWindow === mainWindow;
         if (x === undefined) {
-            const positionPercentage = this.storageService.get(DEBUG_TOOLBAR_POSITION_KEY, 0 );
-            x = positionPercentage !== undefined ? parseFloat(positionPercentage) * mainWindow.innerWidth : (0.5 * mainWindow.innerWidth - 0.5 * widgetWidth);
+            const positionPercentage = isMainWindow
+                ? Number(this.storageService.get(DEBUG_TOOLBAR_POSITION_KEY, 0 ))
+                : this.auxWindowCoordinates.get(currentWindow)?.x;
+            x = positionPercentage !== undefined
+                ? positionPercentage * currentWindow.innerWidth
+                : (0.5 * currentWindow.innerWidth - 0.5 * widgetWidth);
         }
-        x = Math.max(0, Math.min(x, mainWindow.innerWidth - widgetWidth));
+        x = clamp(x, 0, currentWindow.innerWidth - widgetWidth);
         this.$el.style.left = `${x}px`;
         if (y === undefined) {
-            y = this.storageService.getNumber(DEBUG_TOOLBAR_Y_KEY, 0 , 0);
+            y = isMainWindow
+                ? this.storageService.getNumber(DEBUG_TOOLBAR_Y_KEY, 0 )
+                : this.auxWindowCoordinates.get(currentWindow)?.y;
         }
-        this.setYCoordinate(y);
+        this.setYCoordinate(y ?? this.yDefault);
     }
     setYCoordinate(y = this.yCoordinate) {
         const [yMin, yMax] = this.yRange;
@@ -178,9 +199,12 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.$el.style.top = `${y}px`;
         this.yCoordinate = y;
     }
+    get yDefault() {
+        return this.layoutService.mainContainerOffset.top;
+    }
     get yRange() {
         if (!this._yRange) {
-            const isTitleBarVisible = this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow);
+            const isTitleBarVisible = this.layoutService.isVisible("workbench.parts.titlebar" , getWindow(this.layoutService.activeContainer));
             const yMin = isTitleBarVisible ? 0 : this.layoutService.mainContainerOffset.top;
             let yMax = 0;
             if (isTitleBarVisible) {
@@ -205,7 +229,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         }
         if (!this.isBuilt) {
             this.isBuilt = true;
-            this.layoutService.mainContainer.appendChild(this.$el);
+            this.layoutService.activeContainer.appendChild(this.$el);
         }
         this.isVisible = true;
         show(this.$el);

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

@@ -16,7 +16,8 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { ViewsSubMenu, ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { StartDebugActionViewItem, FocusSessionActionViewItem } from './debugActionViewItems.js';
 import { DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID } from './debugCommands.js';
 import { debugConfigure } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';

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

@@ -261,7 +261,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
     async goToInstructionAndOffset(instructionReference, offset, focus) {
         let addr = this._referenceToMemoryAddress.get(instructionReference);
         if (addr === undefined) {
-            await this.loadDisassembledInstructions(instructionReference, 0, -DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD, DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD);
+            await this.loadDisassembledInstructions(instructionReference, 0, -DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD, DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD * 2);
             addr = this._referenceToMemoryAddress.get(instructionReference);
         }
         if (addr) {

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

@@ -6,7 +6,7 @@ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/brows
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { renderViewTree } from './baseDebugView.js';
+import { renderViewTree } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -447,7 +447,7 @@ let LoadedScriptsView = class LoadedScriptsView extends ViewPane {
         };
         this._register(this.debugService.onDidNewSession(registerSessionListeners));
         this.debugService.getModel().getSessions().forEach(registerSessionListeners);
-        this._register(this.debugService.onDidEndSession(session => {
+        this._register(this.debugService.onDidEndSession(({ session }) => {
             root.remove(session.getId());
             this.changeScheduler.schedule();
         }));

package/vscode/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css.js

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".codicon-debug-hint{cursor:pointer}.codicon-debug-hint:not([class*=codicon-debug-breakpoint]):not([class*=codicon-debug-stackframe]){opacity:.4!important}.inline-breakpoint-widget.codicon{align-items:center;display:flex!important}.inline-breakpoint-widget.codicon-debug-breakpoint-disabled{opacity:.7}.monaco-editor .inline-breakpoint-widget.line-start{left:-8px!important}.monaco-editor .debug-breakpoint-placeholder{display:inline-flex;margin-top:-1px;vertical-align:middle;width:.9em}.codicon-debug-breakpoint.codicon-debug-stackframe-focused:after,.codicon-debug-breakpoint.codicon-debug-stackframe:after{content:\"\\eb8a\";position:absolute}.monaco-editor .debug-top-stack-frame-column{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;align-items:center;display:inline-flex;font:normal normal normal 16px/1 codicon;margin-left:0;margin-right:4px;margin-top:-1px;text-rendering:auto;vertical-align:middle;width:.9em}.monaco-editor .debug-top-stack-frame-column.start-of-line{margin-top:0;position:absolute;top:50%;transform:translate(-17px,-50%)}.monaco-editor .inline-breakpoint-widget{cursor:pointer}.monaco-workbench .debug-view-content .monaco-list-row .monaco-tl-contents{overflow:hidden;text-overflow:ellipsis}.monaco-workbench .monaco-list-row .expression{display:flex}.monaco-workbench .debug-hover-widget .monaco-list-row .expression,.monaco-workbench .debug-pane .monaco-list-row .expression{font-family:var(--monaco-monospace-font);font-size:13px;overflow:hidden;text-overflow:ellipsis;white-space:pre}.monaco-workbench.mac .debug-hover-widget .monaco-list-row .expression,.monaco-workbench.mac .debug-pane .monaco-list-row .expression{font-size:11px}.monaco-workbench .monaco-list-row .expression .value{margin-left:6px}.monaco-workbench .monaco-list-row .expression .lazy-button{align-self:center;border-radius:5px;display:none;margin-left:3px}.monaco-workbench .monaco-list-row .expression.lazy .lazy-button{display:inline}.monaco-workbench .monaco-list-row .expression .value a.link:hover{text-decoration:underline}.monaco-workbench .monaco-list-row .expression .value a.link.pointer{cursor:pointer}.monaco-workbench .monaco-list:focus .monaco-list-row.selected .expression .name,.monaco-workbench .monaco-list:focus .monaco-list-row.selected .expression .value{color:inherit}.monaco-workbench .monaco-list-row .expression .name.internal,.monaco-workbench .monaco-list-row .expression .name.virtual{opacity:.5}.monaco-workbench .monaco-list-row .expression .unavailable{font-style:italic}.monaco-workbench .debug-inline-value{background-color:var(--vscode-editor-inlineValuesBackground);color:var(--vscode-editor-inlineValuesForeground)}";
+var css = ".codicon-debug-hint{cursor:pointer}.codicon-debug-hint:not([class*=codicon-debug-breakpoint]):not([class*=codicon-debug-stackframe]){opacity:.4!important}.inline-breakpoint-widget.codicon{align-items:center;display:flex!important}.inline-breakpoint-widget.codicon-debug-breakpoint-disabled{opacity:.7}.monaco-editor .inline-breakpoint-widget.line-start{left:-8px!important}.monaco-editor .debug-breakpoint-placeholder{display:inline-flex;margin-top:-1px;vertical-align:middle;width:.9em}.codicon-debug-breakpoint-conditional.codicon-debug-stackframe-focused:after,.codicon-debug-breakpoint-conditional.codicon-debug-stackframe:after,.codicon-debug-breakpoint.codicon-debug-stackframe-focused:after,.codicon-debug-breakpoint.codicon-debug-stackframe:after{content:\"\\eb8a\";position:absolute}.monaco-editor .debug-top-stack-frame-column{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;align-items:center;display:inline-flex;font:normal normal normal 16px/1 codicon;margin-left:0;margin-right:4px;margin-top:-1px;text-rendering:auto;vertical-align:middle;width:.9em}.monaco-editor .debug-top-stack-frame-column.start-of-line{margin-top:0;position:absolute;top:50%;transform:translate(-17px,-50%)}.monaco-editor .inline-breakpoint-widget{cursor:pointer}.monaco-workbench .debug-view-content .monaco-list-row .monaco-tl-contents{overflow:hidden;text-overflow:ellipsis}.monaco-workbench .monaco-list-row .expression{display:flex}.monaco-workbench .debug-hover-widget .monaco-list-row .expression,.monaco-workbench .debug-pane .monaco-list-row .expression{font-family:var(--monaco-monospace-font);font-size:13px;overflow:hidden;text-overflow:ellipsis;white-space:pre}.monaco-workbench.mac .debug-hover-widget .monaco-list-row .expression,.monaco-workbench.mac .debug-pane .monaco-list-row .expression{font-size:11px}.monaco-workbench .monaco-list-row .expression .value{margin-left:6px}.monaco-workbench .monaco-list-row .expression .lazy-button{align-self:center;border-radius:5px;display:none;margin-left:3px}.monaco-workbench .monaco-list-row .expression.lazy .lazy-button{display:inline}.monaco-workbench .monaco-list-row .expression .value a.link:hover{text-decoration:underline}.monaco-workbench .monaco-list-row .expression .value a.link.pointer{cursor:pointer}.monaco-workbench .monaco-list:focus .monaco-list-row.selected .expression .name,.monaco-workbench .monaco-list:focus .monaco-list-row.selected .expression .value{color:inherit}.monaco-workbench .monaco-list-row .expression .name.internal,.monaco-workbench .monaco-list-row .expression .name.virtual{opacity:.5}.monaco-workbench .monaco-list-row .expression .unavailable{font-style:italic}.monaco-workbench .debug-inline-value{background-color:var(--vscode-editor-inlineValuesBackground);color:var(--vscode-editor-inlineValuesForeground)}";
 n(css,{});
 
 export { css, css as default };

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

@@ -23,7 +23,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 } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, registerAction2, Action2, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
@@ -42,7 +42,8 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { resolveColorValue, editorForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { FilterViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { IViewsService, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 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';
@@ -51,10 +52,10 @@ import { ReplFilter } from './replFilter.js';
 import { ReplDelegate, ReplVariablesRenderer, ReplOutputElementRenderer, ReplEvaluationInputsRenderer, ReplGroupRenderer, ReplEvaluationResultsRenderer, ReplRawObjectsRenderer, ReplDataSource, ReplAccessibilityProvider } from './replViewer.js';
 import { DEBUG_SCHEME, CONTEXT_MULTI_SESSION_REPL, CONTEXT_IN_DEBUG_REPL, REPL_VIEW_ID, IDebugService, CONTEXT_DEBUG_STATE, getStateLabel } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
-import { ReplEvaluationResult, ReplGroup } from '../common/replModel.js';
+import { ReplEvaluationResult, ReplGroup } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
-import { IAccessibleNotificationService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
+import { IAudioCueService, AudioCue } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
 
 var Repl_1, ReplOptions_1;
 const $ = $$1;
@@ -94,6 +95,7 @@ let Repl = class Repl extends FilterViewPane {
         this.logService = logService;
         this.previousTreeScrollHeight = 0;
         this.replInputLineCount = 1;
+        this.styleChangedWhenInvisible = false;
         this.modelChangeListener = Disposable.None;
         this.menu = menuService.createMenu(MenuId.DebugConsoleContext, contextKeyService);
         this._register(this.menu);
@@ -128,7 +130,7 @@ let Repl = class Repl extends FilterViewPane {
             }
             this.multiSessionRepl.set(this.isMultiSessionView);
         }));
-        this._register(this.debugService.onDidEndSession(async (session) => {
+        this._register(this.debugService.onDidEndSession(async () => {
             await Promise.resolve();
             this.multiSessionRepl.set(this.isMultiSessionView);
         }));
@@ -147,6 +149,10 @@ let Repl = class Repl extends FilterViewPane {
                 this.replInput.setModel(this.model);
                 this.updateInputDecoration();
                 this.refreshReplElements(true);
+                if (this.styleChangedWhenInvisible) {
+                    this.styleChangedWhenInvisible = false;
+                    this.onDidStyleChange();
+                }
             }
         }));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
@@ -278,6 +284,10 @@ let Repl = class Repl extends FilterViewPane {
         }
     }
     onDidStyleChange() {
+        if (!this.isVisible()) {
+            this.styleChangedWhenInvisible = true;
+            return;
+        }
         if (this.styleElement) {
             this.replInput.updateOptions({
                 fontSize: this.replOptions.replConfiguration.fontSize,
@@ -849,7 +859,7 @@ registerAction2(class extends ViewAction {
         super({
             id: 'workbench.debug.panel.action.clearReplAction',
             viewId: REPL_VIEW_ID,
-            title: { value: ( (localizeWithPath('vs/workbench/contrib/debug/browser/repl', 'clearRepl', "Clear Console"))), original: 'Clear Console' },
+            title: ( (localize2WithPath('vs/workbench/contrib/debug/browser/repl', 'clearRepl', 'Clear Console'))),
             f1: true,
             icon: debugConsoleClearAll,
             menu: [{
@@ -865,9 +875,9 @@ registerAction2(class extends ViewAction {
         });
     }
     runInView(_accessor, view) {
-        const accessibleNotificationService = _accessor.get(IAccessibleNotificationService);
+        const audioCueService = _accessor.get(IAudioCueService);
         view.clearRepl();
-        accessibleNotificationService.notify("clear" );
+        audioCueService.playAudioCue(AudioCue.clear);
     }
 });
 registerAction2(class extends ViewAction {

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

@@ -1,6 +1,6 @@
 import { matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
 import { splitGlobAware } from 'vscode/vscode/vs/base/common/glob';
-import { ReplEvaluationInput, ReplEvaluationResult } from '../common/replModel.js';
+import { ReplEvaluationInput, ReplEvaluationResult } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 
 class ReplFilter {

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

@@ -13,12 +13,12 @@ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { renderExpressionValue, AbstractExpressionsRenderer, renderVariable } from './baseDebugView.js';
+import { renderExpressionValue, AbstractExpressionsRenderer, renderVariable } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { handleANSIOutput } from './debugANSIHandling.js';
 import { debugConsoleEvaluationInput } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
-import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvaluationInput, ReplGroup, RawObjectReplElement } from '../common/replModel.js';
+import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvaluationInput, ReplGroup, RawObjectReplElement } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 
 var ReplGroupRenderer_1, ReplOutputElementRenderer_1, ReplVariablesRenderer_1;

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

@@ -1,11 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { timeout, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
-import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { toDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, registerAction2, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -24,10 +27,12 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { AbstractExpressionsRenderer, renderVariable, renderViewTree } from './baseDebugView.js';
+import { AbstractExpressionsRenderer, renderVariable, renderViewTree } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { LinkDetector } from './linkDetector.js';
-import { IDebugService, VARIABLES_VIEW_ID, CONTEXT_VARIABLES_FOCUSED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { IDebugService, VARIABLES_VIEW_ID, CONTEXT_VARIABLES_FOCUSED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { getContextForVariable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugContext';
 import { Variable, getUriForDebugMemory, Expression, ErrorScope, Scope, StackFrame } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { IDebugVisualizerService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers';
 import { IEditorService, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 
@@ -153,21 +158,7 @@ let VariablesView = class VariablesView extends ViewPane {
         if (!(variable instanceof Variable) || !variable.value) {
             return;
         }
-        const toDispose = ( new DisposableStore());
-        try {
-            const contextKeyService = await getContextForVariableMenuWithDataAccess(this.contextKeyService, variable);
-            const menu = toDispose.add(this.menuService.createMenu(MenuId.DebugVariablesContext, contextKeyService));
-            const context = getVariablesContext(variable);
-            const secondary = [];
-            createAndFillInContextMenuActions(menu, { arg: context, shouldForwardArgs: false }, { primary: [], secondary }, 'inline');
-            this.contextMenuService.showContextMenu({
-                getAnchor: () => e.anchor,
-                getActions: () => secondary
-            });
-        }
-        finally {
-            toDispose.dispose();
-        }
+        return openContextMenuForVariableTreeElement(this.contextKeyService, this.menuService, this.contextMenuService, MenuId.DebugVariablesContext, e);
     }
 };
 VariablesView = ( __decorate([
@@ -183,6 +174,27 @@ VariablesView = ( __decorate([
     ( __param(10, ITelemetryService)),
     ( __param(11, IMenuService))
 ], VariablesView));
+async function openContextMenuForVariableTreeElement(parentContextKeyService, menuService, contextMenuService, menuId, e) {
+    const variable = e.element;
+    if (!(variable instanceof Variable) || !variable.value) {
+        return;
+    }
+    const toDispose = ( new DisposableStore());
+    try {
+        const contextKeyService = await getContextForVariableMenuWithDataAccess(parentContextKeyService, variable);
+        const menu = toDispose.add(menuService.createMenu(menuId, contextKeyService));
+        const context = getVariablesContext(variable);
+        const secondary = [];
+        createAndFillInContextMenuActions(menu, { arg: context, shouldForwardArgs: false }, { primary: [], secondary }, 'inline');
+        contextMenuService.showContextMenu({
+            getAnchor: () => e.anchor,
+            getActions: () => secondary
+        });
+    }
+    finally {
+        toDispose.dispose();
+    }
+}
 const getVariablesContext = (variable) => ({
     sessionId: variable.getSession()?.getId(),
     container: variable.parent instanceof Expression
@@ -193,7 +205,7 @@ const getVariablesContext = (variable) => ({
 async function getContextForVariableMenuWithDataAccess(parentContext, variable) {
     const session = variable.getSession();
     if (!session || !session.capabilities.supportsDataBreakpoints) {
-        return getContextForVariableMenu(parentContext, variable);
+        return getContextForVariableMenuBase(parentContext, variable);
     }
     const contextKeys = [];
     dataBreakpointInfoResponse = await session.dataBreakpointInfo(variable.name, variable.parent.reference);
@@ -217,19 +229,11 @@ async function getContextForVariableMenuWithDataAccess(parentContext, variable)
             }
         }
     }
-    return getContextForVariableMenu(parentContext, variable, contextKeys);
+    return getContextForVariableMenuBase(parentContext, variable, contextKeys);
 }
-function getContextForVariableMenu(parentContext, variable, additionalContext = []) {
-    const session = variable.getSession();
-    const contextKeys = [
-        [CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT.key, variable.variableMenuContext || ''],
-        [CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT.key, !!variable.evaluateName],
-        [CONTEXT_CAN_VIEW_MEMORY.key, !!session?.capabilities.supportsReadMemoryRequest && variable.memoryReference !== undefined],
-        [CONTEXT_VARIABLE_IS_READONLY.key, !!variable.presentationHint?.attributes?.includes('readOnly') || variable.presentationHint?.lazy],
-        ...additionalContext,
-    ];
+function getContextForVariableMenuBase(parentContext, variable, additionalContext = []) {
     variableInternalContext = variable;
-    return parentContext.createOverlay(contextKeys);
+    return getContextForVariable(parentContext, variable, additionalContext);
 }
 function isStackFrame(obj) {
     return obj instanceof StackFrame;
@@ -300,11 +304,13 @@ class ScopeErrorRenderer {
 let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRenderer {
     static { VariablesRenderer_1 = this; }
     static { this.ID = 'variable'; }
-    constructor(linkDetector, menuService, contextKeyService, debugService, contextViewService) {
+    constructor(linkDetector, menuService, contextKeyService, visualization, contextMenuService, debugService, contextViewService) {
         super(debugService, contextViewService);
         this.linkDetector = linkDetector;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
+        this.visualization = visualization;
+        this.contextMenuService = contextMenuService;
     }
     get templateId() {
         return VariablesRenderer_1.ID;
@@ -340,9 +346,9 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
             }
         };
     }
-    renderActionBar(actionBar, expression) {
+    renderActionBar(actionBar, expression, data) {
         const variable = expression;
-        const contextKeyService = getContextForVariableMenu(this.contextKeyService, variable);
+        const contextKeyService = getContextForVariableMenuBase(this.contextKeyService, variable);
         const menu = this.menuService.createMenu(MenuId.DebugVariablesContext, contextKeyService);
         const primary = [];
         const context = getVariablesContext(variable);
@@ -350,13 +356,58 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
         actionBar.clear();
         actionBar.context = context;
         actionBar.push(primary, { icon: true, label: false });
+        const cts = ( new CancellationTokenSource());
+        data.elementDisposable.add(toDisposable(() => cts.dispose(true)));
+        this.visualization.getApplicableFor(expression, cts.token).then(result => {
+            data.elementDisposable.add(result);
+            const actions = ( result.object.map(v => ( new Action(
+                'debugViz',
+                v.name,
+                v.iconClass || 'debug-viz-icon',
+                undefined,
+                this.useVisualizer(v, cts.token)
+            ))));
+            if (actions.length === 0) ;
+            else if (actions.length === 1) {
+                actionBar.push(actions[0], { icon: true, label: false });
+            }
+            else {
+                actionBar.push(( new Action('debugViz', ( localizeWithPath(
+                    'vs/workbench/contrib/debug/browser/variablesView',
+                    'useVisualizer',
+                    'Visualize Variable...'
+                )), ThemeIcon.asClassName(Codicon.eye), undefined, () => this.pickVisualizer(actions, expression, data))), { icon: true, label: false });
+            }
+        });
+    }
+    pickVisualizer(actions, expression, data) {
+        this.contextMenuService.showContextMenu({
+            getAnchor: () => data.actionBar.getContainer(),
+            getActions: () => actions,
+        });
+    }
+    useVisualizer(viz, token) {
+        return async () => {
+            const resolved = await viz.resolve(token);
+            if (token.isCancellationRequested) {
+                return;
+            }
+            if (resolved.type === 0 ) {
+                viz.execute();
+            }
+            else {
+                throw new Error('not implemented, yet');
+            }
+        };
     }
 };
 VariablesRenderer = VariablesRenderer_1 = ( __decorate([
     ( __param(1, IMenuService)),
     ( __param(2, IContextKeyService)),
-    ( __param(3, IDebugService)),
-    ( __param(4, IContextViewService))
+    ( __param(3, IDebugVisualizerService)),
+    ( __param(4, IContextMenuService)),
+    ( __param(5, IDebugService)),
+    ( __param(6, IContextViewService))
 ], VariablesRenderer));
 class VariablesAccessibilityProvider {
     getWidgetAriaLabel() {
@@ -597,4 +648,4 @@ registerAction2(class extends ViewAction {
     }
 });
 
-export { ADD_TO_WATCH_ID, BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, BREAK_WHEN_VALUE_IS_READ_ID, COPY_EVALUATE_PATH_ID, COPY_VALUE_ID, SET_VARIABLE_ID, VIEW_MEMORY_ID, VariablesRenderer, VariablesView };
+export { ADD_TO_WATCH_ID, BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, BREAK_WHEN_VALUE_IS_READ_ID, COPY_EVALUATE_PATH_ID, COPY_VALUE_ID, SET_VARIABLE_ID, VIEW_MEMORY_ID, VariablesRenderer, VariablesView, openContextMenuForVariableTreeElement };

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

@@ -5,7 +5,7 @@ import { Variable, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/c
 import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { AbstractExpressionsRenderer, renderExpressionValue, renderViewTree } from './baseDebugView.js';
+import { AbstractExpressionsRenderer, renderExpressionValue, renderViewTree } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
@@ -343,12 +343,32 @@ class WatchExpressionsDragAndDrop {
     constructor(debugService) {
         this.debugService = debugService;
     }
-    onDragOver(data) {
+    onDragOver(data, targetElement, targetIndex, targetSector, originalEvent) {
         if (!(data instanceof ElementsDragAndDropData)) {
             return false;
         }
         const expressions = data.elements;
-        return expressions.length > 0 && expressions[0] instanceof Expression;
+        if (!(expressions.length > 0 && expressions[0] instanceof Expression)) {
+            return false;
+        }
+        let dropEffectPosition = undefined;
+        if (targetIndex === undefined) {
+            dropEffectPosition = "drop-target-after" ;
+            targetIndex = -1;
+        }
+        else {
+            switch (targetSector) {
+                case 0 :
+                case 1 :
+                    dropEffectPosition = "drop-target-before" ;
+                    break;
+                case 2 :
+                case 3 :
+                    dropEffectPosition = "drop-target-after" ;
+                    break;
+            }
+        }
+        return { accept: true, effect: { type: 1 , position: dropEffectPosition }, feedback: [targetIndex] };
     }
     getDragURI(element) {
         if (!(element instanceof Expression) || element === this.debugService.getViewModel().getSelectedExpression()?.expression) {
@@ -362,14 +382,33 @@ class WatchExpressionsDragAndDrop {
         }
         return undefined;
     }
-    drop(data, targetElement) {
+    drop(data, targetElement, targetIndex, targetSector, originalEvent) {
         if (!(data instanceof ElementsDragAndDropData)) {
             return;
         }
         const draggedElement = data.elements[0];
+        if (!(draggedElement instanceof Expression)) {
+            throw new Error('Invalid dragged element');
+        }
         const watches = this.debugService.getModel().getWatchExpressions();
-        const position = targetElement instanceof Expression ? watches.indexOf(targetElement) : watches.length - 1;
-        this.debugService.moveWatchExpression(draggedElement.getId(), position);
+        const sourcePosition = watches.indexOf(draggedElement);
+        let targetPosition;
+        if (targetElement instanceof Expression) {
+            targetPosition = watches.indexOf(targetElement);
+            switch (targetSector) {
+                case 3 :
+                case 2 :
+                    targetPosition++;
+                    break;
+            }
+            if (sourcePosition < targetPosition) {
+                targetPosition--;
+            }
+        }
+        else {
+            targetPosition = watches.length - 1;
+        }
+        this.debugService.moveWatchExpression(draggedElement.getId(), targetPosition);
     }
     dispose() { }
 }