@codingame/monaco-vscode-debug-service-override 6.0.3 → 7.0.0

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { $ as $$1, append, addStandardDisposableListener, isAncestorOfActiveElement } from 'vscode/vscode/vs/base/browser/dom';
+import { $ as $$1, append, addStandardDisposableListener, SafeTriangle, isAncestorOfActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
@@ -187,7 +187,10 @@ let DebugHoverWidget = class DebugHoverWidget {
     getDomNode() {
         return this.domNode;
     }
-    async showAt(position, focus) {
+    isInSafeTriangle(x, y) {
+        return this._isVisible && !!this.safeTriangle?.contains(x, y);
+    }
+    async showAt(position, focus, mouseEvent) {
         this.showCancellationSource?.cancel();
         const cancellationSource = this.showCancellationSource = ( (new CancellationTokenSource()));
         const session = this.debugService.getViewModel().focusedSession;
@@ -220,19 +223,19 @@ let DebugHoverWidget = class DebugHoverWidget {
                 range: result.range,
                 options: DebugHoverWidget_1._HOVER_HIGHLIGHT_DECORATION_OPTIONS
             }]);
-        return this.doShow(result.range.getStartPosition(), expression, focus);
+        return this.doShow(result.range.getStartPosition(), expression, focus, mouseEvent);
     }
     static { this._HOVER_HIGHLIGHT_DECORATION_OPTIONS = ModelDecorationOptions.register({
         description: 'bdebug-hover-highlight',
         className: 'hoverHighlight'
     }); }
-    async doShow(position, expression, focus, forceValueHover = false) {
+    async doShow(position, expression, focus, mouseEvent) {
         if (!this.domNode) {
             this.create();
         }
         this.showAtPosition = position;
         this._isVisible = true;
-        if (!expression.hasChildren || forceValueHover) {
+        if (!expression.hasChildren) {
             this.complexValueContainer.hidden = true;
             this.valueContainer.hidden = false;
             renderExpressionValue(expression, this.valueContainer, {
@@ -256,6 +259,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.tree.scrollTop = 0;
         this.tree.scrollLeft = 0;
         this.complexValueContainer.hidden = false;
+        this.safeTriangle = mouseEvent && new SafeTriangle(mouseEvent.posx, mouseEvent.posy, this.domNode);
         if (focus) {
             this.editor.render();
             this.tree.domFocus();
@@ -384,27 +388,30 @@ let DebugHoverComputer = class DebugHoverComputer {
             return { rangeChanged: false };
         }
         const { range, matchingExpression } = result;
-        const rangeChanged = this._currentRange ?
-            !this._currentRange.equalsRange(range) :
-            true;
-        this._currentExpression = matchingExpression;
-        this._currentRange = Range.lift(range);
-        return { rangeChanged, range: this._currentRange };
+        const rangeChanged = !this._current?.range.equalsRange(range);
+        this._current = { expression: matchingExpression, range: Range.lift(range) };
+        return { rangeChanged, range: this._current.range };
     }
     async evaluate(session) {
-        if (!this._currentExpression) {
+        if (!this._current) {
             this.logService.error('No expression to evaluate');
             return;
         }
+        const textModel = this.editor.getModel();
+        const debugSource = textModel && session.getSourceForUri(textModel?.uri);
         if (session.capabilities.supportsEvaluateForHovers) {
-            const expression = ( (new Expression(this._currentExpression)));
-            await expression.evaluate(session, this.debugService.getViewModel().focusedStackFrame, 'hover');
+            const expression = ( (new Expression(this._current.expression)));
+            await expression.evaluate(session, this.debugService.getViewModel().focusedStackFrame, 'hover', undefined, debugSource ? {
+                line: this._current.range.startLineNumber,
+                column: this._current.range.startColumn,
+                source: debugSource.raw,
+            } : undefined);
             return expression;
         }
         else {
             const focusedStackFrame = this.debugService.getViewModel().focusedStackFrame;
             if (focusedStackFrame) {
-                return await findExpressionInStackFrame(focusedStackFrame, coalesce(( (this._currentExpression.split('.').map(word => word.trim())))));
+                return await findExpressionInStackFrame(focusedStackFrame, coalesce(( (this._current.expression.split('.').map(word => word.trim())))));
             }
         }
         return undefined;

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

@@ -47,6 +47,7 @@ import { saveAllBeforeDebugStart, getExtensionHostDebugSession } from 'vscode/vs
 import { ViewModel } from '../common/debugViewModel.js';
 import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
 import { VIEWLET_ID as VIEWLET_ID$1 } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
 import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -59,7 +60,7 @@ import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/
 
 const _moduleId = "vs/workbench/contrib/debug/browser/debugService";
 let DebugService = class DebugService {
-    constructor(editorService, paneCompositeService, viewsService, viewDescriptorService, notificationService, dialogService, layoutService, contextService, contextKeyService, lifecycleService, instantiationService, extensionService, fileService, configurationService, extensionHostDebugService, activityService, commandService, quickInputService, workspaceTrustRequestService, uriIdentityService) {
+    constructor(editorService, paneCompositeService, viewsService, viewDescriptorService, notificationService, dialogService, layoutService, contextService, contextKeyService, lifecycleService, instantiationService, extensionService, fileService, configurationService, extensionHostDebugService, activityService, commandService, quickInputService, workspaceTrustRequestService, uriIdentityService, testService) {
         this.editorService = editorService;
         this.paneCompositeService = paneCompositeService;
         this.viewsService = viewsService;
@@ -80,6 +81,7 @@ let DebugService = class DebugService {
         this.quickInputService = quickInputService;
         this.workspaceTrustRequestService = workspaceTrustRequestService;
         this.uriIdentityService = uriIdentityService;
+        this.testService = testService;
         this.restartingSessions = ( (new Set()));
         this.disposables = ( (new DisposableStore()));
         this.initializing = false;
@@ -159,7 +161,7 @@ let DebugService = class DebugService {
             }
         }));
         this.disposables.add(extensionService.onWillStop(evt => {
-            evt.veto(this.stopSession(undefined).then(() => false), ( localizeWithPath(_moduleId, 2, 'Stopping debug sessions...')));
+            evt.veto(this.model.getSessions().length > 0, ( localizeWithPath(_moduleId, 2, 'A debug session is still running.')));
         }));
         this.initContextKeys(contextKeyService);
     }
@@ -735,6 +737,14 @@ let DebugService = class DebugService {
                 }
             }
         };
+        if (session.correlatedTestRun) {
+            if (!session.correlatedTestRun.completedAt) {
+                this.testService.cancelTestRun(session.correlatedTestRun.id);
+                await Event.toPromise(session.correlatedTestRun.onComplete);
+            }
+            this.testService.runResolvedTests(session.correlatedTestRun.request);
+            return;
+        }
         if (session.capabilities.supportsRestartRequest) {
             const taskResult = await runTasks();
             if (taskResult === TaskRunResult.Success) {
@@ -1258,7 +1268,8 @@ DebugService = ( (__decorate([
     ( (__param(16, ICommandService))),
     ( (__param(17, IQuickInputService))),
     ( (__param(18, IWorkspaceTrustRequestService))),
-    ( (__param(19, IUriIdentityService)))
+    ( (__param(19, IUriIdentityService))),
+    ( (__param(20, ITestService)))
 ], DebugService)));
 function getStackFrameThreadAndSessionToFocus(model, stackFrame, thread, session, avoidSession) {
     if (!session) {

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

@@ -38,11 +38,13 @@ import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/p
 import { getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
+import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
 
 const _moduleId = "vs/workbench/contrib/debug/browser/debugSession";
 const TRIGGERED_BREAKPOINT_MAX_DELAY = 1500;
 let DebugSession = class DebugSession {
-    constructor(id, _configuration, root, model, options, debugService, telemetryService, hostService, configurationService, paneCompositeService, workspaceContextService, productService, notificationService, lifecycleService, uriIdentityService, instantiationService, customEndpointTelemetryService, workbenchEnvironmentService, logService) {
+    constructor(id, _configuration, root, model, options, debugService, telemetryService, hostService, configurationService, paneCompositeService, workspaceContextService, productService, notificationService, lifecycleService, uriIdentityService, instantiationService, customEndpointTelemetryService, workbenchEnvironmentService, logService, testService, testResultService) {
         this.id = id;
         this._configuration = _configuration;
         this.root = root;
@@ -60,6 +62,7 @@ let DebugSession = class DebugSession {
         this.customEndpointTelemetryService = customEndpointTelemetryService;
         this.workbenchEnvironmentService = workbenchEnvironmentService;
         this.logService = logService;
+        this.testService = testService;
         this.initialized = false;
         this.sources = ( (new Map()));
         this.threads = ( (new Map()));
@@ -96,6 +99,12 @@ let DebugSession = class DebugSession {
                 dispose(toDispose);
             }));
         }
+        this.correlatedTestRun = options?.testRun
+            ? testResultService.getResult(options.testRun.runId)
+            : this.parentSession?.correlatedTestRun;
+        if (this.correlatedTestRun) {
+            toDispose.add(this.correlatedTestRun.onComplete(() => this.terminate()));
+        }
         const compoundRoot = this._options.compoundRoot;
         if (compoundRoot) {
             toDispose.add(compoundRoot.onDidSessionStop(() => this.terminate()));
@@ -304,6 +313,10 @@ let DebugSession = class DebugSession {
         if (this._options.lifecycleManagedByParent && this.parentSession) {
             await this.parentSession.terminate(restart);
         }
+        else if (this.correlatedTestRun && !this.correlatedTestRun.completedAt && !this.didTerminateTestRun) {
+            this.didTerminateTestRun = true;
+            this.testService.cancelTestRun(this.correlatedTestRun.id);
+        }
         else if (this.raw) {
             if (this.raw.capabilities.supportsTerminateRequest && this._configuration.resolved.request === 'launch') {
                 await this.raw.terminate(restart);
@@ -577,13 +590,13 @@ let DebugSession = class DebugSession {
         const token = threadId ? this.getNewCancellationToken(threadId) : undefined;
         return this.raw.variables({ variablesReference, filter, start, count }, token);
     }
-    evaluate(expression, frameId, context) {
+    evaluate(expression, frameId, context, location) {
         if (!this.raw) {
             throw ( (new Error(
                 localizeWithPath(_moduleId, 0, "No debugger available, can not send '{0}'", 'evaluate')
             )));
         }
-        return this.raw.evaluate({ expression, frameId, context });
+        return this.raw.evaluate({ expression, frameId, context, line: location?.line, column: location?.column, source: location?.source });
     }
     async restartFrame(frameId, threadId) {
         await this.waitForTriggeredBreakpoints();
@@ -1289,8 +1302,8 @@ let DebugSession = class DebugSession {
     removeReplExpressions() {
         this.repl.removeReplExpressions();
     }
-    async addReplExpression(stackFrame, name) {
-        await this.repl.addReplExpression(this, stackFrame, name);
+    async addReplExpression(stackFrame, expression) {
+        await this.repl.addReplExpression(this, stackFrame, expression);
         this.debugService.getViewModel().updateViews();
     }
     appendToRepl(data, isImportant) {
@@ -1314,7 +1327,9 @@ DebugSession = ( (__decorate([
     ( (__param(15, IInstantiationService))),
     ( (__param(16, ICustomEndpointTelemetryService))),
     ( (__param(17, IWorkbenchEnvironmentService))),
-    ( (__param(18, ILogService)))
+    ( (__param(18, ILogService))),
+    ( (__param(19, ITestService))),
+    ( (__param(20, ITestResultService)))
 ], DebugSession)));
 class ThreadStatusScheduler extends Disposable {
     constructor() {

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

@@ -6,7 +6,7 @@ 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 { DisposableStore, MutableDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableStore, MutableDisposable, markAsSingleton, dispose } 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';
@@ -337,7 +337,7 @@ const registerDebugToolBarItem = (id, title, order, icon, when, precondition, al
         }
     }));
 };
-MenuRegistry.onDidChangeMenu(e => {
+markAsSingleton(MenuRegistry.onDidChangeMenu(e => {
     if (( (e.has(MenuId.DebugToolBar)))) {
         dispose(debugViewTitleItems);
         const items = MenuRegistry.getMenuItems(MenuId.DebugToolBar);
@@ -353,7 +353,7 @@ MenuRegistry.onDidChangeMenu(e => {
             }));
         }
     }
-});
+}));
 const CONTEXT_TOOLBAR_COMMAND_CENTER = ( (ContextKeyExpr.equals('config.debug.toolBarLocation', 'commandCenter')));
 MenuRegistry.appendMenuItem(MenuId.CommandCenterCenter, {
     submenu: MenuId.DebugToolBar,

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

@@ -27,7 +27,7 @@ import { widgetClose } from 'vscode/vscode/vs/platform/theme/common/iconRegistry
 
 const _moduleId = "vs/workbench/contrib/debug/browser/exceptionWidget";
 const $ = $$1;
-const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', { dark: '#a31515', light: '#a31515', hcDark: '#a31515', hcLight: '#a31515' }, ( localizeWithPath(_moduleId, 0, 'Exception widget border color.')));
+const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', '#a31515', ( localizeWithPath(_moduleId, 0, 'Exception widget border color.')));
 const debugExceptionWidgetBackground = registerColor('debugExceptionWidget.background', { dark: '#420b0d', light: '#f1dfde', hcDark: '#420b0d', hcLight: '#f1dfde' }, ( localizeWithPath(_moduleId, 1, 'Exception widget background color.')));
 let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
     constructor(editor, exceptionInfo, debugSession, themeService, instantiationService) {

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

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench .debug-toolbar{-webkit-app-region:no-drag;border-radius:4px;display:flex;height:26px;padding-left:7px;position:absolute;z-index:3000}.monaco-workbench .debug-toolbar .monaco-action-bar .action-item{margin-right:4px}.monaco-workbench .debug-toolbar .monaco-action-bar .action-item.select-container{margin-right:7px}.monaco-workbench .debug-toolbar .monaco-action-bar .action-item.select-container .monaco-select-box,.monaco-workbench .start-debug-action-item .select-container .monaco-select-box{padding:0 22px 0 6px}.monaco-workbench .debug-toolbar .drag-area{align-items:center;cursor:grab;display:flex;justify-content:center;opacity:.5;width:16px}.monaco-workbench .debug-toolbar .drag-area.dragged{cursor:grabbing}.monaco-workbench .debug-toolbar .monaco-action-bar .action-item .action-label{align-items:center;background-position:50%;background-repeat:no-repeat;background-size:16px;display:flex;justify-content:center;margin-right:0}";
+var css = ".monaco-workbench .debug-toolbar{-webkit-app-region:no-drag;border-radius:4px;display:flex;height:26px;padding-left:7px;position:absolute;z-index:2520}.monaco-workbench .debug-toolbar .monaco-action-bar .action-item{margin-right:4px}.monaco-workbench .debug-toolbar .monaco-action-bar .action-item.select-container{margin-right:7px}.monaco-workbench .debug-toolbar .monaco-action-bar .action-item.select-container .monaco-select-box,.monaco-workbench .start-debug-action-item .select-container .monaco-select-box{padding:0 22px 0 6px}.monaco-workbench .debug-toolbar .drag-area{align-items:center;cursor:grab;display:flex;justify-content:center;opacity:.5;width:16px}.monaco-workbench .debug-toolbar .drag-area.dragged{cursor:grabbing}.monaco-workbench .debug-toolbar .monaco-action-bar .action-item .action-label{align-items:center;background-position:50%;background-repeat:no-repeat;background-size:16px;display:flex;justify-content:center;margin-right:0}";
 n(css,{});
 
 export { css, css as default };

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

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench .repl{box-sizing:border-box;height:100%;overflow:hidden}.monaco-workbench .repl .repl-tree .monaco-tl-contents{user-select:text;-webkit-user-select:text;white-space:pre}.monaco-workbench .repl .repl-tree .monaco-tl-contents .expression{font-family:var(--vscode-repl-font-family);font-size:var(--vscode-repl-font-size);line-height:var(--vscode-repl-line-height)}.monaco-workbench .repl .repl-tree .monaco-tl-contents .expression .lazy-button{cursor:pointer}.monaco-workbench .repl .repl-tree .monaco-tl-twistie{background-position-y:calc(100% - var(--vscode-repl-font-size-for-twistie))}.monaco-workbench .repl .repl-tree.word-wrap .monaco-tl-contents{word-wrap:break-word;white-space:pre-wrap;word-break:break-all}.monaco-workbench .repl .repl-tree.word-wrap .monaco-tl-contents .expression.nested-variable{white-space:pre}.monaco-workbench .repl .repl-tree .monaco-tl-twistie,.monaco-workbench .repl .repl-tree .monaco-tl-twistie.collapsible+.monaco-tl-contents{cursor:pointer}.monaco-workbench .repl .repl-tree .output.expression.value-and-source{display:flex}.monaco-workbench .repl .repl-tree .output.expression.value-and-source .count-badge-wrapper,.monaco-workbench .repl .repl-tree .output.expression.value-and-source .value{margin-right:4px}.monaco-workbench .repl .repl-tree .output.expression.value-and-source .count-badge-wrapper .monaco-count-badge{min-height:16px;word-break:keep-all}.monaco-workbench .repl .repl-tree .monaco-tl-contents .arrow{left:2px;position:absolute}.monaco-workbench .repl .repl-tree .output.expression.value-and-source .source{cursor:pointer;direction:rtl;margin-left:auto;margin-right:8px;max-width:400px;overflow:hidden;text-align:right;text-decoration:underline;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .repl .repl-tree .evaluation-result.expression>.value,.monaco-workbench .repl .repl-tree .output.expression>.value{margin-left:0}.monaco-workbench .repl .repl-tree .output.expression .name:not(:empty){margin-right:6px}.monaco-workbench .repl .repl-input-wrapper{align-items:center;display:flex}.monaco-workbench .repl .repl-input-wrapper .suggest-status-bar .monaco-action-bar.right{display:none}.monaco-workbench .repl .repl-input-wrapper .repl-input-chevron{display:flex;flex-shrink:0;font-weight:600;height:100%;justify-content:center;padding:0 6px 0 8px;width:16px}.monaco-workbench .repl .repl-tree .output.expression>.ignore{font-style:italic}.monaco-workbench .repl .repl-tree .output.expression .code-bold{font-weight:700}.monaco-workbench .repl .repl-tree .output.expression .code-italic{font-style:italic}.monaco-workbench .repl .repl-tree .output.expression .code-underline{text-decoration:underline;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-double-underline{text-decoration:underline;text-decoration-style:double}.monaco-workbench .repl .repl-tree .output.expression .code-strike-through{text-decoration:line-through;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline{text-decoration:overline;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-underline.code-strike-through{text-decoration:overline underline line-through;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-underline{text-decoration:overline underline;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-strike-through{text-decoration:overline line-through;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-underline.code-strike-through{text-decoration:underline line-through;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-double-underline.code-strike-through{text-decoration:overline underline line-through;text-decoration-style:double}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-double-underline{text-decoration:overline underline;text-decoration-style:double}.monaco-workbench .repl .repl-tree .output.expression .code-double-underline.code-strike-through{text-decoration:underline line-through;text-decoration-style:double}.monaco-workbench .repl .repl-tree .output.expression .code-dim{opacity:.4}.monaco-workbench .repl .repl-tree .output.expression .code-hidden{opacity:0}.monaco-workbench .repl .repl-tree .output.expression .code-blink{animation:code-blink-key 1s cubic-bezier(1,0,0,1) infinite alternate}.monaco-workbench .repl .repl-tree .output.expression .code-rapid-blink{animation:code-blink-key .3s cubic-bezier(1,0,0,1) infinite alternate}@keyframes code-blink-key{to{opacity:.4}}.monaco-workbench .repl .repl-tree .output.expression .code-subscript{font-size:smaller;line-height:normal;vertical-align:sub}.monaco-workbench .repl .repl-tree .output.expression .code-superscript{font-size:smaller;line-height:normal;vertical-align:super}";
+var css = ".monaco-workbench .repl{box-sizing:border-box;height:100%;overflow:hidden}.monaco-workbench .repl .repl-tree .monaco-tl-contents{user-select:text;-webkit-user-select:text;white-space:pre}.monaco-workbench .repl .repl-tree .monaco-tl-contents .expression{font-family:var(--vscode-repl-font-family);font-size:var(--vscode-repl-font-size);line-height:var(--vscode-repl-line-height)}.monaco-workbench .repl .repl-tree .monaco-tl-contents .expression .lazy-button{cursor:pointer}.monaco-workbench .repl .repl-tree .monaco-tl-twistie{background-position-y:calc(100% - var(--vscode-repl-font-size-for-twistie))}.monaco-workbench .repl .repl-tree.word-wrap .monaco-tl-contents{word-wrap:break-word;white-space:pre-wrap;word-break:break-all}.monaco-workbench .repl .repl-tree.word-wrap .monaco-tl-contents .expression.nested-variable{white-space:pre}.monaco-workbench .repl .repl-tree .monaco-tl-twistie,.monaco-workbench .repl .repl-tree .monaco-tl-twistie.collapsible+.monaco-tl-contents{cursor:pointer}.monaco-workbench .repl .repl-tree .output.expression.value-and-source{display:flex}.monaco-workbench .repl .repl-tree .output.expression.value-and-source .count-badge-wrapper,.monaco-workbench .repl .repl-tree .output.expression.value-and-source .label{margin-right:4px}.monaco-workbench .repl .repl-tree .output.expression.value-and-source .count-badge-wrapper .monaco-count-badge{min-height:16px;word-break:keep-all}.monaco-workbench .repl .repl-tree .monaco-tl-contents .arrow{left:2px;position:absolute}.monaco-workbench .repl .repl-tree .group .source,.monaco-workbench .repl .repl-tree .output.expression.value-and-source .source{cursor:pointer;direction:rtl;margin-left:auto;margin-right:8px;max-width:400px;overflow:hidden;text-align:right;text-decoration:underline;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .repl .repl-tree .evaluation-result.expression>.value,.monaco-workbench .repl .repl-tree .output.expression>.value{margin-left:0}.monaco-workbench .repl .repl-tree .output.expression .name:not(:empty){margin-right:6px}.monaco-workbench .repl .repl-input-wrapper{align-items:center;display:flex}.monaco-workbench .repl .repl-input-wrapper .suggest-status-bar .monaco-action-bar.right{display:none}.monaco-workbench .repl .repl-input-wrapper .repl-input-chevron{display:flex;flex-shrink:0;font-weight:600;height:100%;justify-content:center;padding:0 6px 0 8px;width:16px}.monaco-workbench .repl .repl-tree .output.expression>.ignore{font-style:italic}.monaco-workbench .repl .repl-tree .output.expression .code-bold{font-weight:700}.monaco-workbench .repl .repl-tree .output.expression .code-italic{font-style:italic}.monaco-workbench .repl .repl-tree .output.expression .code-underline{text-decoration:underline;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-double-underline{text-decoration:underline;text-decoration-style:double}.monaco-workbench .repl .repl-tree .output.expression .code-strike-through{text-decoration:line-through;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline{text-decoration:overline;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-underline.code-strike-through{text-decoration:overline underline line-through;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-underline{text-decoration:overline underline;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-strike-through{text-decoration:overline line-through;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-underline.code-strike-through{text-decoration:underline line-through;text-decoration-style:solid}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-double-underline.code-strike-through{text-decoration:overline underline line-through;text-decoration-style:double}.monaco-workbench .repl .repl-tree .output.expression .code-overline.code-double-underline{text-decoration:overline underline;text-decoration-style:double}.monaco-workbench .repl .repl-tree .output.expression .code-double-underline.code-strike-through{text-decoration:underline line-through;text-decoration-style:double}.monaco-workbench .repl .repl-tree .output.expression .code-dim{opacity:.4}.monaco-workbench .repl .repl-tree .output.expression .code-hidden{opacity:0}.monaco-workbench .repl .repl-tree .output.expression .code-blink{animation:code-blink-key 1s cubic-bezier(1,0,0,1) infinite alternate}.monaco-workbench .repl .repl-tree .output.expression .code-rapid-blink{animation:code-blink-key .3s cubic-bezier(1,0,0,1) infinite alternate}@keyframes code-blink-key{to{opacity:.4}}.monaco-workbench .repl .repl-tree .output.expression .code-subscript{font-size:smaller;line-height:normal;vertical-align:sub}.monaco-workbench .repl .repl-tree .output.expression .code-superscript{font-size:smaller;line-height:normal;vertical-align:super}";
 n(css,{});
 
 export { css, css as default };

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

@@ -116,7 +116,7 @@ let Repl = class Repl extends FilterViewPane {
         this._register(this.menu);
         this.history = ( (new HistoryNavigator(
             JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')),
-            50
+            100
         )));
         this.filter = ( (new ReplFilter()));
         this.filter.filterQuery = filterText;
@@ -394,6 +394,14 @@ let Repl = class Repl extends FilterViewPane {
             }
         }
     }
+    sendReplInput(input) {
+        const session = this.tree?.getInput();
+        if (session && !this.isReadonly) {
+            session.addReplExpression(this.debugService.getViewModel().focusedStackFrame, input);
+            revealLastElement(this.tree);
+            this.history.add(input);
+        }
+    }
     getVisibleContent() {
         let text = '';
         if (this.model && this.tree) {
@@ -571,7 +579,7 @@ let Repl = class Repl extends FilterViewPane {
             historyNavigationForwardsEnablement.set(enabled);
         };
         CONTEXT_IN_DEBUG_REPL.bindTo(this.scopedContextKeyService).set(true);
-        this.scopedInstantiationService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
+        this.scopedInstantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService])))));
         const options = getSimpleEditorOptions(this.configurationService);
         options.readOnly = true;
         options.suggest = { showStatusBar: true };

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

@@ -2,17 +2,21 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { $ as $$1, append, clearNode, addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { CachedListVirtualDelegate } from 'vscode/vscode/vs/base/browser/ui/list/list';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
-import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { basename } from 'vscode/vscode/vs/base/common/path';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 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';
@@ -20,9 +24,6 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 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.service';
-import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var ReplGroupRenderer_1, ReplOutputElementRenderer_1, ReplVariablesRenderer_1;
 const _moduleId = "vs/workbench/contrib/debug/browser/replViewer";
@@ -49,28 +50,35 @@ class ReplEvaluationInputsRenderer {
 let ReplGroupRenderer = class ReplGroupRenderer {
     static { ReplGroupRenderer_1 = this; }
     static { this.ID = 'replGroup'; }
-    constructor(linkDetector, themeService) {
+    constructor(linkDetector, themeService, instaService) {
         this.linkDetector = linkDetector;
         this.themeService = themeService;
+        this.instaService = instaService;
     }
     get templateId() {
         return ReplGroupRenderer_1.ID;
     }
     renderTemplate(container) {
-        const label = append(container, $('.expression'));
-        return { label };
+        container.classList.add('group');
+        const expression = append(container, $('.output.expression.value-and-source'));
+        const label = append(expression, $('span.label'));
+        const source = this.instaService.createInstance(SourceWidget, expression);
+        return { label, source };
     }
     renderElement(element, _index, templateData) {
         const replGroup = element.element;
         clearNode(templateData.label);
         const result = handleANSIOutput(replGroup.name, this.linkDetector, this.themeService, undefined);
         templateData.label.appendChild(result);
+        templateData.source.setSource(replGroup.sourceData);
     }
-    disposeTemplate(_templateData) {
+    disposeTemplate(templateData) {
+        templateData.source.dispose();
     }
 };
 ReplGroupRenderer = ReplGroupRenderer_1 = ( (__decorate([
-    ( (__param(1, IThemeService)))
+    ( (__param(1, IThemeService))),
+    ( (__param(2, IInstantiationService)))
 ], ReplGroupRenderer)));
 class ReplEvaluationResultsRenderer {
     static { this.ID = 'replEvaluationResult'; }
@@ -99,12 +107,10 @@ class ReplEvaluationResultsRenderer {
 let ReplOutputElementRenderer = class ReplOutputElementRenderer {
     static { ReplOutputElementRenderer_1 = this; }
     static { this.ID = 'outputReplElement'; }
-    constructor(linkDetector, editorService, hoverService, labelService, themeService) {
+    constructor(linkDetector, themeService, instaService) {
         this.linkDetector = linkDetector;
-        this.editorService = editorService;
-        this.hoverService = hoverService;
-        this.labelService = labelService;
         this.themeService = themeService;
+        this.instaService = instaService;
     }
     get templateId() {
         return ReplOutputElementRenderer_1.ID;
@@ -116,22 +122,8 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
         data.container = container;
         data.countContainer = append(expression, $('.count-badge-wrapper'));
         data.count = ( (new CountBadge(data.countContainer, {}, defaultCountBadgeStyles)));
-        data.value = append(expression, $('span.value'));
-        data.source = append(expression, $('.source'));
-        data.toDispose = [];
-        data.toDispose.push(addDisposableListener(data.source, 'click', e => {
-            e.preventDefault();
-            e.stopPropagation();
-            const source = data.getReplElementSource();
-            if (source) {
-                source.source.openInEditor(this.editorService, {
-                    startLineNumber: source.lineNumber,
-                    startColumn: source.column,
-                    endLineNumber: source.lineNumber,
-                    endColumn: source.column
-                });
-            }
-        }));
+        data.value = append(expression, $('span.value.label'));
+        data.source = this.instaService.createInstance(SourceWidget, expression);
         return data;
     }
     renderElement({ element }, index, templateData) {
@@ -141,8 +133,7 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
         templateData.value.className = 'value';
         templateData.value.appendChild(handleANSIOutput(element.value, this.linkDetector, this.themeService, element.session.root));
         templateData.value.classList.add((element.severity === Severity$1.Warning) ? 'warn' : (element.severity === Severity$1.Error) ? 'error' : (element.severity === Severity$1.Ignore) ? 'ignore' : 'info');
-        templateData.source.textContent = element.sourceData ? `${basename(element.sourceData.source.name)}:${element.sourceData.lineNumber}` : '';
-        templateData.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), templateData.source, element.sourceData ? `${this.labelService.getUriLabel(element.sourceData.source.uri)}:${element.sourceData.lineNumber}` : ''));
+        templateData.source.setSource(element.sourceData);
         templateData.getReplElementSource = () => element.sourceData;
     }
     setElementCount(element, templateData) {
@@ -155,17 +146,15 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
         }
     }
     disposeTemplate(templateData) {
-        dispose(templateData.toDispose);
+        templateData.source.dispose();
     }
     disposeElement(_element, _index, templateData) {
         templateData.elementListener.dispose();
     }
 };
 ReplOutputElementRenderer = ReplOutputElementRenderer_1 = ( (__decorate([
-    ( (__param(1, IEditorService))),
-    ( (__param(2, IHoverService))),
-    ( (__param(3, ILabelService))),
-    ( (__param(4, IThemeService)))
+    ( (__param(1, IThemeService))),
+    ( (__param(2, IInstantiationService)))
 ], ReplOutputElementRenderer)));
 let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressionsRenderer {
     static { ReplVariablesRenderer_1 = this; }
@@ -180,6 +169,7 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
     }
     renderElement(node, _index, data) {
         const element = node.element;
+        data.elementDisposable.clear();
         super.renderExpressionElement(element instanceof ReplVariableElement ? element.expression : element, node, data);
     }
     renderExpression(expression, data, highlights) {
@@ -335,5 +325,36 @@ class ReplAccessibilityProvider {
         return '';
     }
 }
+let SourceWidget = class SourceWidget extends Disposable {
+    constructor(container, editorService, hoverService, labelService) {
+        super();
+        this.hoverService = hoverService;
+        this.labelService = labelService;
+        this.el = append(container, $('.source'));
+        this._register(addDisposableListener(this.el, 'click', e => {
+            e.preventDefault();
+            e.stopPropagation();
+            if (this.source) {
+                this.source.source.openInEditor(editorService, {
+                    startLineNumber: this.source.lineNumber,
+                    startColumn: this.source.column,
+                    endLineNumber: this.source.lineNumber,
+                    endColumn: this.source.column
+                });
+            }
+        }));
+    }
+    setSource(source) {
+        this.source = source;
+        this.el.textContent = source ? `${basename(source.source.name)}:${source.lineNumber}` : '';
+        this.hover ??= this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.el, ''));
+        this.hover.update(source ? `${this.labelService.getUriLabel(source.source.uri)}:${source.lineNumber}` : '');
+    }
+};
+SourceWidget = ( (__decorate([
+    ( (__param(1, IEditorService))),
+    ( (__param(2, IHoverService))),
+    ( (__param(3, ILabelService)))
+], SourceWidget)));
 
 export { ReplAccessibilityProvider, ReplDataSource, ReplDelegate, ReplEvaluationInputsRenderer, ReplEvaluationResultsRenderer, ReplGroupRenderer, ReplOutputElementRenderer, ReplRawObjectsRenderer, ReplVariablesRenderer };

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { registerColor, ColorTransformType, asCssVariableName, asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { registerColor, transparent, asCssVariableName, asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
@@ -41,22 +41,12 @@ const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForegr
     1,
     "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', {
-    dark: STATUS_BAR_BORDER,
-    light: STATUS_BAR_BORDER,
-    hcDark: STATUS_BAR_BORDER,
-    hcLight: STATUS_BAR_BORDER
-}, ( localizeWithPath(
+const STATUS_BAR_DEBUGGING_BORDER = registerColor('statusBar.debuggingBorder', STATUS_BAR_BORDER, ( localizeWithPath(
     _moduleId,
     2,
     "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', {
-    dark: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
-    hcDark: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
-    light: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
-    hcLight: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 }
-}, ( localizeWithPath(
+const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( (transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258))), ( localizeWithPath(
     _moduleId,
     3,
     "Command center background color when a program is being debugged"
@@ -92,7 +82,7 @@ let StatusBarColorProvider = class StatusBarColorProvider {
             if (e.affectsConfiguration('debug.enableStatusBarColor') || e.affectsConfiguration('debug.toolBarLocation')) {
                 this.update();
             }
-        }, this.disposables);
+        }, undefined, this.disposables);
         this.update();
     }
     update() {

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

@@ -350,6 +350,7 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
         return VisualizedVariableRenderer_1.ID;
     }
     renderElement(node, index, data) {
+        data.elementDisposable.clear();
         super.renderExpressionElement(node.element, node, data);
     }
     renderExpression(expression, data, highlights) {
@@ -414,7 +415,7 @@ VisualizedVariableRenderer = VisualizedVariableRenderer_1 = ( (__decorate([
 let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRenderer {
     static { VariablesRenderer_1 = this; }
     static { this.ID = 'variable'; }
-    constructor(linkDetector, menuService, contextKeyService, visualization, contextMenuService, commandService, debugService, contextViewService, hoverService) {
+    constructor(linkDetector, menuService, contextKeyService, visualization, contextMenuService, commandService, debugService, contextViewService, hoverService, configurationService) {
         super(debugService, contextViewService, hoverService);
         this.linkDetector = linkDetector;
         this.menuService = menuService;
@@ -422,14 +423,22 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
         this.visualization = visualization;
         this.contextMenuService = contextMenuService;
         this.commandService = commandService;
+        this.configurationService = configurationService;
     }
     get templateId() {
         return VariablesRenderer_1.ID;
     }
     renderExpression(expression, data, highlights) {
-        renderVariable(data.elementDisposable, this.commandService, this.hoverService, expression, data, true, highlights, this.linkDetector);
+        const showType = this.configurationService.getValue('debug').showVariableTypes;
+        renderVariable(data.elementDisposable, this.commandService, this.hoverService, expression, data, true, highlights, this.linkDetector, showType);
     }
     renderElement(node, index, data) {
+        data.elementDisposable.clear();
+        data.elementDisposable.add(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('debug.showVariableTypes')) {
+                super.renderExpressionElement(node.element, node, data);
+            }
+        }));
         super.renderExpressionElement(node.element, node, data);
     }
     getInputBoxOptions(expression) {
@@ -516,7 +525,8 @@ VariablesRenderer = VariablesRenderer_1 = ( (__decorate([
     ( (__param(5, ICommandService))),
     ( (__param(6, IDebugService))),
     ( (__param(7, IContextViewService))),
-    ( (__param(8, IHoverService)))
+    ( (__param(8, IHoverService))),
+    ( (__param(9, IConfigurationService)))
 ], VariablesRenderer)));
 class VariablesAccessibilityProvider {
     getWidgetAriaLabel() {