@codingame/monaco-vscode-debug-service-override 2.2.2 → 3.0.0

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

@@ -1,5 +1,4 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
 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';
@@ -32,6 +31,7 @@ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/lay
 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';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
 
 const DEBUG_TOOLBAR_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_TOOLBAR_Y_KEY = 'debug.actionswidgety';
@@ -50,6 +50,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.isBuilt = false;
         this.stopActionViewItemDisposables = this._register(( new DisposableStore()));
         this.auxWindowCoordinates = ( new WeakMap());
+        this.trackPixelRatioListener = this._register(( new MutableDisposable()));
         this.$el = $('div.debug-toolbar');
         this.$el.style.top = `${layoutService.mainContainerOffset.top}px`;
         this.dragArea = append(this.$el, $('div.drag-area' + ThemeIcon.asCSSSelector(debugGripper)));
@@ -59,18 +60,18 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.activeActions = [];
         this.actionBar = this._register(( new ActionBar(actionBarContainer, {
             orientation: 0 ,
-            actionViewItemProvider: (action) => {
+            actionViewItemProvider: (action, options) => {
                 if (action.id === FOCUS_SESSION_ID) {
                     return this.instantiationService.createInstance(FocusSessionActionViewItem, action, undefined);
                 }
                 else if (action.id === STOP_ID || action.id === DISCONNECT_ID) {
                     this.stopActionViewItemDisposables.clear();
-                    const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, this.stopActionViewItemDisposables, accessor));
+                    const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, this.stopActionViewItemDisposables, accessor, { hoverDelegate: options.hoverDelegate }));
                     if (item) {
                         return item;
                     }
                 }
-                return createActionViewItem(this.instantiationService, action);
+                return createActionViewItem(this.instantiationService, action, options);
             }
         })));
         this.updateScheduler = this._register(( new RunOnceScheduler(() => {
@@ -127,13 +128,12 @@ let DebugToolBar = class DebugToolBar extends Themable {
             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.doShowInActiveContainer();
                     this.setCoordinates();
                 }
                 resizeListener.value = this._register(addDisposableListener(getWindow(this.layoutService.activeContainer), EventType.RESIZE, () => this.setYCoordinate()));
@@ -180,7 +180,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
             const positionPercentage = isMainWindow
                 ? Number(this.storageService.get(DEBUG_TOOLBAR_POSITION_KEY, 0 ))
                 : this.auxWindowCoordinates.get(currentWindow)?.x;
-            x = positionPercentage !== undefined
+            x = positionPercentage !== undefined && !isNaN(positionPercentage)
                 ? positionPercentage * currentWindow.innerWidth
                 : (0.5 * currentWindow.innerWidth - 0.5 * widgetWidth);
         }
@@ -229,12 +229,16 @@ let DebugToolBar = class DebugToolBar extends Themable {
         }
         if (!this.isBuilt) {
             this.isBuilt = true;
-            this.layoutService.activeContainer.appendChild(this.$el);
+            this.doShowInActiveContainer();
         }
         this.isVisible = true;
         show(this.$el);
         this.setCoordinates();
     }
+    doShowInActiveContainer() {
+        this.layoutService.activeContainer.appendChild(this.$el);
+        this.trackPixelRatioListener.value = PixelRatio.getInstance(getWindow(this.$el)).onDidChange(() => this.setYCoordinate());
+    }
     hide() {
         this.isVisible = false;
         hide(this.$el);
@@ -256,7 +260,7 @@ DebugToolBar = ( __decorate([
     ( __param(8, IMenuService)),
     ( __param(9, IContextKeyService))
 ], DebugToolBar));
-function createDisconnectMenuItemAction(action, disposables, accessor) {
+function createDisconnectMenuItemAction(action, disposables, accessor, options) {
     const menuService = accessor.get(IMenuService);
     const contextKeyService = accessor.get(IContextKeyService);
     const instantiationService = accessor.get(IInstantiationService);
@@ -272,7 +276,7 @@ function createDisconnectMenuItemAction(action, disposables, accessor) {
         'notebook.moreRunActionsLabel',
         "More..."
     )), 'codicon-chevron-down', true)));
-    const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', contextMenuService, {});
+    const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', contextMenuService, options);
     return item;
 }
 const debugViewTitleItems = [];

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

@@ -19,7 +19,7 @@ import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/context
 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 { DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, SELECT_AND_START_ID, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID } from './debugCommands.js';
 import { debugConfigure } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { WelcomeView } from './welcomeView.js';
@@ -62,9 +62,9 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
             this.focusView(WelcomeView.ID);
         }
     }
-    getActionViewItem(action) {
+    getActionViewItem(action, options) {
         if (action.id === DEBUG_START_COMMAND_ID) {
-            this.startDebugActionViewItem = this.instantiationService.createInstance(StartDebugActionViewItem, null, action);
+            this.startDebugActionViewItem = this.instantiationService.createInstance(StartDebugActionViewItem, null, action, options);
             return this.startDebugActionViewItem;
         }
         if (action.id === FOCUS_SESSION_ID) {
@@ -78,12 +78,12 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
         }
         if (action.id === STOP_ID || action.id === DISCONNECT_ID) {
             this.stopActionViewItemDisposables.clear();
-            const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, this.stopActionViewItemDisposables, accessor));
+            const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, this.stopActionViewItemDisposables, accessor, { hoverDelegate: options.hoverDelegate }));
             if (item) {
                 return item;
             }
         }
-        return createActionViewItem(this.instantiationService, action);
+        return createActionViewItem(this.instantiationService, action, options);
     }
     focusView(id) {
         const view = this.getView(id);
@@ -144,7 +144,7 @@ DebugViewPaneContainer = ( __decorate([
     ( __param(12, IContextKeyService)),
     ( __param(13, IViewDescriptorService))
 ], DebugViewPaneContainer));
-( MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
+MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_UX.notEqualsTo('simple')), ( WorkbenchStateContext.notEqualsTo('empty')), ( ContextKeyExpr.or(( CONTEXT_DEBUG_STATE.isEqualTo('inactive')), ( ContextKeyExpr.notEquals('config.debug.toolBarLocation', 'docked')))), ( ContextKeyExpr.or(
         ContextKeyExpr.not('config.debug.hideLauncherWhileDebugging'),
         ContextKeyExpr.not('inDebugMode')
@@ -156,7 +156,7 @@ DebugViewPaneContainer = ( __decorate([
         id: DEBUG_START_COMMAND_ID,
         title: DEBUG_START_LABEL
     }
-}));
+});
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -251,5 +251,17 @@ registerAction2(class extends Action2 {
         }
     }
 });
+MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
+    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_STATE.notEqualsTo('inactive')), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked')), ( ContextKeyExpr.has('config.debug.hideLauncherWhileDebugging')))))),
+    order: 10,
+    command: {
+        id: SELECT_AND_START_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debugViewlet',
+            'startAdditionalSession',
+            "Start Additional Session"
+        )),
+    }
+});
 
 export { DebugViewPaneContainer };

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
-import { append, $, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
+import { getWindowById, append, $, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
 import { binarySearch2 } from 'vscode/vscode/vs/base/common/arrays';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { dispose, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -65,11 +65,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
         this._disassembledInstructions = undefined;
         this._onDidChangeStackFrame = this._register(( new Emitter({ leakWarningThreshold: 1000 })));
         this._previousDebuggingState = _debugService.state;
-        this._fontInfo = BareFontInfo.createFromRawSettings(_configurationService.getValue('editor'), PixelRatio.value);
         this._register(_configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration('editor')) {
-                this._fontInfo = BareFontInfo.createFromRawSettings(_configurationService.getValue('editor'), PixelRatio.value);
-            }
             if (e.affectsConfiguration('debug')) {
                 const newValue = this._configurationService.getValue('debug').disassemblyView.showSourceCode;
                 if (this._enableSourceCodeRender !== newValue) {
@@ -81,7 +77,21 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
             }
         }));
     }
-    get fontInfo() { return this._fontInfo; }
+    get fontInfo() {
+        if (!this._fontInfo) {
+            this._fontInfo = this.createFontInfo();
+            this._register(this._configurationService.onDidChangeConfiguration(e => {
+                if (e.affectsConfiguration('editor')) {
+                    this._fontInfo = this.createFontInfo();
+                }
+            }));
+        }
+        return this._fontInfo;
+    }
+    createFontInfo() {
+        const window = getWindowById(this.group?.windowId, true).window;
+        return BareFontInfo.createFromRawSettings(this._configurationService.getValue('editor'), PixelRatio.getInstance(window).value);
+    }
     get currentInstructionAddresses() {
         return ( ( ( ( this._debugService.getModel().getSessions(false).
             map(session => session.getAllThreads())).
@@ -516,7 +526,7 @@ let BreakpointRenderer = class BreakpointRenderer {
                         this._debugService.removeInstructionBreakpoints(reference, offset);
                     }
                     else if (currentElement.element.allowBreakpoint && !currentElement.element.isBreakpointSet) {
-                        this._debugService.addInstructionBreakpoint(reference, offset, currentElement.element.address);
+                        this._debugService.addInstructionBreakpoint({ instructionReference: reference, offset, address: currentElement.element.address, canPersist: false });
                     }
                 }
             })

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

@@ -98,7 +98,7 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
     }
     _doLayout(_heightInPixel, _widthInPixel) {
         this.container.style.height = 'initial';
-        const lineHeight = this.editor.getOption(66 );
+        const lineHeight = this.editor.getOption(67 );
         const arrowHeight = Math.round(lineHeight / 3);
         const computedLinesNumber = Math.ceil((this.container.offsetHeight + arrowHeight) / lineHeight);
         this._relayout(computedLinesNumber);

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { posix, isAbsolute, normalize } from 'vscode/vscode/vs/base/common/path';
-import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 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 '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 { LOADED_SCRIPTS_VIEW_ID, 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';
+import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { normalizeDriveLetter, tildify } from 'vscode/vscode/vs/base/common/labels';
 import { isWindows } from 'vscode/vscode/vs/base/common/platform';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -23,6 +23,8 @@ import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { DebugContentProvider } from '../common/debugContentProvider.js';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
@@ -488,6 +490,9 @@ let LoadedScriptsView = class LoadedScriptsView extends ViewPane {
         super.layoutBody(height, width);
         this.tree.layout(height, width);
     }
+    collapseAll() {
+        this.tree.collapseAll();
+    }
     dispose() {
         dispose(this.tree);
         dispose(this.treeLabels);
@@ -636,5 +641,29 @@ class LoadedScriptsFilter {
         return 2 ;
     }
 }
+registerAction2(class Collapse extends ViewAction {
+    constructor() {
+        super({
+            id: 'loadedScripts.collapse',
+            viewId: LOADED_SCRIPTS_VIEW_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/loadedScriptsView',
+                'collapse',
+                "Collapse All"
+            )),
+            f1: false,
+            icon: Codicon.collapseAll,
+            menu: {
+                id: MenuId.ViewTitle,
+                order: 30,
+                group: 'navigation',
+                when: ( ContextKeyExpr.equals('view', LOADED_SCRIPTS_VIEW_ID))
+            }
+        });
+    }
+    runInView(_accessor, view) {
+        view.collapseAll();
+    }
+});
 
 export { LoadedScriptsView };

package/vscode/src/vs/workbench/contrib/debug/browser/media/all.png.js

@@ -0,0 +1,12 @@
+var pngAssets = {
+  'vs/workbench/contrib/debug/browser/media/continue-tb.png': new URL('../../../../../../../../assets/continue-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/pause-tb.png': new URL('../../../../../../../../assets/pause-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/restart-tb.png': new URL('../../../../../../../../assets/restart-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/run-with-debugging-tb.png': new URL('../../../../../../../../assets/run-with-debugging-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/stepinto-tb.png': new URL('../../../../../../../../assets/stepinto-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/stepout-tb.png': new URL('../../../../../../../../assets/stepout-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/stepover-tb.png': new URL('../../../../../../../../assets/stepover-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/stop-tb.png': new URL('../../../../../../../../assets/stop-tb.png', import.meta.url).href
+};
+
+export { pngAssets as default };

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

@@ -55,7 +55,7 @@ import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugM
 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 { IAudioCueService, AudioCue } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
+import { IAccessibilitySignalService, AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 
 var Repl_1, ReplOptions_1;
 const $ = $$1;
@@ -294,7 +294,7 @@ let Repl = class Repl extends FilterViewPane {
                 lineHeight: this.replOptions.replConfiguration.lineHeight,
                 fontFamily: this.replOptions.replConfiguration.fontFamily === 'default' ? EDITOR_FONT_DEFAULTS.fontFamily : this.replOptions.replConfiguration.fontFamily
             });
-            const replInputLineHeight = this.replInput.getOption(66 );
+            const replInputLineHeight = this.replInput.getOption(67 );
             this.styleElement.textContent = `
 				.repl .repl-input-wrapper .repl-input-chevron {
 					line-height: ${replInputLineHeight}px
@@ -875,9 +875,9 @@ registerAction2(class extends ViewAction {
         });
     }
     runInView(_accessor, view) {
-        const audioCueService = _accessor.get(IAudioCueService);
+        const accessibilitySignalService = _accessor.get(IAccessibilitySignalService);
         view.clearRepl();
-        audioCueService.playAudioCue(AudioCue.clear);
+        accessibilitySignalService.playSignal(AccessibilitySignal.clear);
     }
 });
 registerAction2(class extends ViewAction {

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

@@ -27,16 +27,16 @@ 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 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
+import { AbstractExpressionsRenderer, renderExpressionValue, renderVariable, renderViewTree, AbstractExpressionDataSource } 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 } 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 { VisualizedExpression, 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';
 
-var VariablesRenderer_1;
+var VisualizedVariableRenderer_1, VariablesRenderer_1;
 const $ = $$1;
 let forgetScopes = true;
 let variableInternalContext;
@@ -75,8 +75,13 @@ let VariablesView = class VariablesView extends ViewPane {
         this.element.classList.add('debug-pane');
         container.classList.add('debug-variables');
         const treeContainer = renderViewTree(container);
-        const linkeDetector = this.instantiationService.createInstance(LinkDetector);
-        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'VariablesView', treeContainer, ( new VariablesDelegate()), [this.instantiationService.createInstance(VariablesRenderer, linkeDetector), ( new ScopesRenderer()), ( new ScopeErrorRenderer())], ( new VariablesDataSource()), {
+        const linkDetector = this.instantiationService.createInstance(LinkDetector);
+        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'VariablesView', treeContainer, ( new VariablesDelegate()), [
+            this.instantiationService.createInstance(VariablesRenderer, linkDetector),
+            this.instantiationService.createInstance(VisualizedVariableRenderer, linkDetector),
+            ( new ScopesRenderer()),
+            ( new ScopeErrorRenderer()),
+        ], this.instantiationService.createInstance(VariablesDataSource), {
             accessibilityProvider: ( new VariablesAccessibilityProvider()),
             identityProvider: { getId: (element) => element.getId() },
             keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e) => e.name },
@@ -84,6 +89,7 @@ let VariablesView = class VariablesView extends ViewPane {
                 listBackground: this.getBackgroundColor()
             }
         });
+        this._register(VisualizedVariableRenderer.rendererOnVisualizationRange(this.debugService.getViewModel(), this.tree));
         this.tree.setInput(this.debugService.getViewModel().focusedStackFrame ?? null);
         CONTEXT_VARIABLES_FOCUSED.bindTo(this.tree.contextKeyService);
         this._register(this.debugService.getViewModel().onDidFocusStackFrame(sf => {
@@ -113,7 +119,7 @@ let VariablesView = class VariablesView extends ViewPane {
         let horizontalScrolling;
         this._register(this.debugService.getViewModel().onDidSelectExpression(e => {
             const variable = e?.expression;
-            if (variable instanceof Variable && !e?.settingWatch) {
+            if (variable && this.tree.hasNode(variable)) {
                 horizontalScrolling = this.tree.options.horizontalScrolling;
                 if (horizontalScrolling) {
                     this.tree.updateOptions({ horizontalScrolling: false });
@@ -148,11 +154,20 @@ let VariablesView = class VariablesView extends ViewPane {
         this.tree.collapseAll();
     }
     onMouseDblClick(e) {
-        const session = this.debugService.getViewModel().focusedSession;
-        if (session && e.element instanceof Variable && session.capabilities.supportsSetVariable && !e.element.presentationHint?.attributes?.includes('readOnly') && !e.element.presentationHint?.lazy) {
+        if (this.canSetExpressionValue(e.element)) {
             this.debugService.getViewModel().setSelectedExpression(e.element, false);
         }
     }
+    canSetExpressionValue(e) {
+        const session = this.debugService.getViewModel().focusedSession;
+        if (!session) {
+            return false;
+        }
+        if (e instanceof VisualizedExpression) {
+            return !!e.treeItem.canEdit;
+        }
+        return e instanceof Variable && !e.presentationHint?.attributes?.includes('readOnly') && !e.presentationHint?.lazy;
+    }
     async onContextMenu(e) {
         const variable = e.element;
         if (!(variable instanceof Variable) || !variable.value) {
@@ -238,7 +253,7 @@ function getContextForVariableMenuBase(parentContext, variable, additionalContex
 function isStackFrame(obj) {
     return obj instanceof StackFrame;
 }
-class VariablesDataSource {
+class VariablesDataSource extends AbstractExpressionDataSource {
     hasChildren(element) {
         if (!element) {
             return false;
@@ -248,7 +263,7 @@ class VariablesDataSource {
         }
         return element.hasChildren;
     }
-    getChildren(element) {
+    doGetChildren(element) {
         if (isStackFrame(element)) {
             return element.getScopes();
         }
@@ -266,6 +281,9 @@ class VariablesDelegate {
         if (element instanceof Scope) {
             return ScopesRenderer.ID;
         }
+        if (element instanceof VisualizedExpression) {
+            return VisualizedVariableRenderer.ID;
+        }
         return VariablesRenderer.ID;
     }
 }
@@ -301,6 +319,96 @@ class ScopeErrorRenderer {
     disposeTemplate() {
     }
 }
+let VisualizedVariableRenderer = class VisualizedVariableRenderer extends AbstractExpressionsRenderer {
+    static { VisualizedVariableRenderer_1 = this; }
+    static { this.ID = 'viz'; }
+    static rendererOnVisualizationRange(model, tree) {
+        return model.onDidChangeVisualization(({ original }) => {
+            if (!tree.hasNode(original)) {
+                return;
+            }
+            const parent = tree.getParentElement(original);
+            tree.updateChildren(parent, false, false);
+        });
+    }
+    constructor(linkDetector, debugService, contextViewService, menuService, contextKeyService) {
+        super(debugService, contextViewService);
+        this.linkDetector = linkDetector;
+        this.menuService = menuService;
+        this.contextKeyService = contextKeyService;
+    }
+    get templateId() {
+        return VisualizedVariableRenderer_1.ID;
+    }
+    renderElement(node, index, data) {
+        super.renderExpressionElement(node.element, node, data);
+    }
+    renderExpression(expression, data, highlights) {
+        const viz = expression;
+        let text = viz.name;
+        if (viz.value && typeof viz.name === 'string') {
+            text += ':';
+        }
+        data.label.set(text, highlights, viz.name);
+        renderExpressionValue(viz, data.value, {
+            showChanged: false,
+            maxValueLength: 1024,
+            showHover: true,
+            colorize: true,
+            linkDetector: this.linkDetector
+        });
+    }
+    getInputBoxOptions(expression) {
+        const viz = expression;
+        return {
+            initialValue: expression.value,
+            ariaLabel: ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/variablesView',
+                'variableValueAriaLabel',
+                "Type new variable value"
+            )),
+            validationOptions: {
+                validation: () => viz.errorMessage ? ({ content: viz.errorMessage }) : null
+            },
+            onFinish: (value, success) => {
+                viz.errorMessage = undefined;
+                if (success) {
+                    viz.edit(value).then(() => {
+                        forgetScopes = false;
+                        this.debugService.getViewModel().updateViews();
+                    });
+                }
+            }
+        };
+    }
+    renderActionBar(actionBar, expression, _data) {
+        const viz = expression;
+        const contextKeyService = viz.original ? getContextForVariableMenuBase(this.contextKeyService, viz.original) : this.contextKeyService;
+        const menu = this.menuService.createMenu(MenuId.DebugVariablesContext, contextKeyService);
+        const primary = [];
+        const context = viz.original ? getVariablesContext(viz.original) : undefined;
+        createAndFillInContextMenuActions(menu, { arg: context, shouldForwardArgs: false }, { primary, secondary: [] }, 'inline');
+        if (viz.original) {
+            const action = ( new Action('debugViz', ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/variablesView',
+                'removeVisualizer',
+                'Remove Visualizer'
+            )), ThemeIcon.asClassName(Codicon.eye), true, () => this.debugService.getViewModel().setVisualizedExpression(viz.original, undefined)));
+            action.checked = true;
+            primary.push(action);
+            actionBar.domNode.style.display = 'initial';
+        }
+        actionBar.clear();
+        actionBar.context = context;
+        actionBar.push(primary, { icon: true, label: false });
+    }
+};
+VisualizedVariableRenderer = VisualizedVariableRenderer_1 = ( __decorate([
+    ( __param(1, IDebugService)),
+    ( __param(2, IContextViewService)),
+    ( __param(3, IMenuService)),
+    ( __param(4, IContextKeyService))
+], VisualizedVariableRenderer));
 let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRenderer {
     static { VariablesRenderer_1 = this; }
     static { this.ID = 'variable'; }
@@ -360,12 +468,13 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
         data.elementDisposable.add(toDisposable(() => cts.dispose(true)));
         this.visualization.getApplicableFor(expression, cts.token).then(result => {
             data.elementDisposable.add(result);
+            const originalExpression = (expression instanceof VisualizedExpression && expression.original) || expression;
             const actions = ( result.object.map(v => ( new Action(
                 'debugViz',
                 v.name,
                 v.iconClass || 'debug-viz-icon',
                 undefined,
-                this.useVisualizer(v, cts.token)
+                this.useVisualizer(v, originalExpression, cts.token)
             ))));
             if (actions.length === 0) ;
             else if (actions.length === 1) {
@@ -376,7 +485,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
                     'vs/workbench/contrib/debug/browser/variablesView',
                     'useVisualizer',
                     'Visualize Variable...'
-                )), ThemeIcon.asClassName(Codicon.eye), undefined, () => this.pickVisualizer(actions, expression, data))), { icon: true, label: false });
+                )), ThemeIcon.asClassName(Codicon.eye), undefined, () => this.pickVisualizer(actions, originalExpression, data))), { icon: true, label: false });
             }
         });
     }
@@ -386,7 +495,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
             getActions: () => actions,
         });
     }
-    useVisualizer(viz, token) {
+    useVisualizer(viz, expression, token) {
         return async () => {
             const resolved = await viz.resolve(token);
             if (token.isCancellationRequested) {
@@ -396,7 +505,10 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
                 viz.execute();
             }
             else {
-                throw new Error('not implemented, yet');
+                const replacement = await this.visualization.getVisualizedNodeFor(resolved.id, expression);
+                if (replacement) {
+                    this.debugService.getViewModel().setVisualizedExpression(expression, replacement);
+                }
             }
         };
     }
@@ -584,7 +696,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'write');
+            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'write', undefined);
         }
     }
 });
@@ -594,7 +706,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'readWrite');
+            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'readWrite', undefined);
         }
     }
 });
@@ -604,7 +716,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'read');
+            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'read', undefined);
         }
     }
 });
@@ -648,4 +760,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, openContextMenuForVariableTreeElement };
+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, VisualizedVariableRenderer, openContextMenuForVariableTreeElement };