@codingame/monaco-vscode-debug-service-override 19.1.4 → 20.0.0

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

@@ -27,7 +27,7 @@ const STATUS_BAR_DEBUGGING_BACKGROUND = registerColor('statusBar.debuggingBackgr
     hcDark: '#BA592C',
     hcLight: '#B5200D'
 }, ( localize(
-    6242,
+    6360,
     "Status bar background color when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
 const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForeground', {
@@ -36,14 +36,14 @@ const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForegr
     hcDark: STATUS_BAR_FOREGROUND,
     hcLight: '#FFFFFF'
 }, ( localize(
-    6243,
+    6361,
     "Status bar foreground color when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
 const STATUS_BAR_DEBUGGING_BORDER = registerColor('statusBar.debuggingBorder', STATUS_BAR_BORDER, ( localize(
-    6244,
+    6362,
     "Status bar border color separating to the sidebar and editor when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
-const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258)), ( localize(6245, "Command center background color when a program is being debugged")), true);
+const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258)), ( localize(6363, "Command center background color when a program is being debugged")), true);
 let StatusBarColorProvider = class StatusBarColorProvider {
     set enabled(enabled) {
         if (enabled === !!this.disposable) {

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

@@ -21,13 +21,11 @@ import { AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions
 import { DebugExpressionRenderer } from "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer";
 export declare class WatchExpressionsView extends ViewPane implements IDebugViewWithVariables {
     private readonly debugService;
+    private readonly menuService;
     private watchExpressionsUpdatedScheduler;
     private needsRefresh;
     private tree;
     private watchExpressionsExist;
-    private watchItemType;
-    private variableReadonly;
-    private menu;
     private expressionRenderer;
     get treeSelection(): IExpression[];
     constructor(options: IViewletViewOptions, contextMenuService: IContextMenuService, debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, menuService: IMenuService);

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

@@ -6,7 +6,7 @@ import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/co
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { getFlatContextMenuActions, getContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { getContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
@@ -24,11 +24,11 @@ import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { ViewPane, ViewAction } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { FocusedViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_ITEM_TYPE, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_CAN_VIEW_MEMORY, WATCH_VIEW_ID, CONTEXT_EXPRESSION_SELECTED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
+import { CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_WATCH_ITEM_TYPE, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_TYPE, CONTEXT_DEBUG_TYPE, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, WATCH_VIEW_ID, CONTEXT_EXPRESSION_SELECTED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Expression, Variable, VisualizedExpression } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { renderViewTree, expressionAndScopeLabelProvider, AbstractExpressionDataSource, AbstractExpressionsRenderer } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
-import { COPY_WATCH_EXPRESSION_COMMAND_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
+import { setDataBreakpointInfoResponse, COPY_WATCH_EXPRESSION_COMMAND_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 import { DebugExpressionRenderer } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
 import { watchExpressionsAdd, watchExpressionsRemoveAll } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { VariablesRenderer, VisualizedVariableRenderer } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/variablesView';
@@ -44,17 +44,14 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
     constructor(options, contextMenuService, debugService, keybindingService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, themeService, hoverService, menuService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
         this.debugService = debugService;
+        this.menuService = menuService;
         this.needsRefresh = false;
-        this.menu = menuService.createMenu(MenuId.DebugWatchContext, contextKeyService);
-        this._register(this.menu);
         this.watchExpressionsUpdatedScheduler = ( new RunOnceScheduler(() => {
             this.needsRefresh = false;
             this.tree.updateChildren();
         }, 50));
         this.watchExpressionsExist = CONTEXT_WATCH_EXPRESSIONS_EXIST.bindTo(contextKeyService);
-        this.variableReadonly = CONTEXT_VARIABLE_IS_READONLY.bindTo(contextKeyService);
         this.watchExpressionsExist.set(this.debugService.getModel().getWatchExpressions().length > 0);
-        this.watchItemType = CONTEXT_WATCH_ITEM_TYPE.bindTo(contextKeyService);
         this.expressionRenderer = instantiationService.createInstance(DebugExpressionRenderer);
     }
     renderBody(container) {
@@ -170,16 +167,18 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
             this.debugService.addWatchExpression();
         }
     }
-    onContextMenu(e) {
+    async onContextMenu(e) {
         const element = e.element;
+        if (!element) {
+            return;
+        }
         const selection = this.tree.getSelection();
-        this.watchItemType.set(element instanceof Expression ? 'expression' : element instanceof Variable ? 'variable' : undefined);
-        const attributes = element instanceof Variable ? element.presentationHint?.attributes : undefined;
-        this.variableReadonly.set(!!attributes && attributes.indexOf('readOnly') >= 0 || !!element?.presentationHint?.lazy);
-        const actions = getFlatContextMenuActions(this.menu.getActions({ arg: element, shouldForwardArgs: true }));
+        const contextKeyService = element && (await getContextForWatchExpressionMenuWithDataAccess(this.contextKeyService, element));
+        const menu = this.menuService.getMenuActions(MenuId.DebugWatchContext, contextKeyService, { arg: element, shouldForwardArgs: false });
+        const { secondary } = getContextMenuActions(menu, 'inline');
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
-            getActions: () => actions,
+            getActions: () => secondary,
             getActionsContext: () => element && selection.includes(element) ? selection : element ? [element] : [],
         });
     }
@@ -289,7 +288,7 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         if (settingValue) {
             return {
                 initialValue: expression.value,
-                ariaLabel: ( localize(6254, "Type new value")),
+                ariaLabel: ( localize(6372, "Type new value")),
                 onFinish: async (value, success) => {
                     if (success && value) {
                         const focusedFrame = this.debugService.getViewModel().focusedStackFrame;
@@ -303,8 +302,8 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         }
         return {
             initialValue: expression.name ? expression.name : '',
-            ariaLabel: ( localize(6255, "Type watch expression")),
-            placeholder: ( localize(6256, "Expression to watch")),
+            ariaLabel: ( localize(6373, "Type watch expression")),
+            placeholder: ( localize(6374, "Expression to watch")),
             onFinish: (value, success) => {
                 if (success && value) {
                     this.debugService.renameWatchExpression(expression.getId(), value);
@@ -336,27 +335,68 @@ WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( __decorate([
     ( __param(5, IHoverService)),
     ( __param(6, IConfigurationService))
 ], WatchExpressionsRenderer));
-function getContextForWatchExpressionMenu(parentContext, expression) {
+function getContextForWatchExpressionMenu(parentContext, expression, additionalContext = []) {
+    const session = expression.getSession();
     return parentContext.createOverlay([
-        [CONTEXT_CAN_VIEW_MEMORY.key, expression.memoryReference !== undefined],
-        [CONTEXT_WATCH_ITEM_TYPE.key, 'expression']
+        [CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT.key, 'evaluateName' in expression],
+        [CONTEXT_WATCH_ITEM_TYPE.key, expression instanceof Expression ? 'expression' : expression instanceof Variable ? 'variable' : undefined],
+        [CONTEXT_CAN_VIEW_MEMORY.key, !!session?.capabilities.supportsReadMemoryRequest && expression.memoryReference !== undefined],
+        [CONTEXT_VARIABLE_IS_READONLY.key, !!expression.presentationHint?.attributes?.includes('readOnly') || expression.presentationHint?.lazy],
+        [CONTEXT_VARIABLE_TYPE.key, expression.type],
+        [CONTEXT_DEBUG_TYPE.key, session?.configuration.type],
+        ...additionalContext
     ]);
 }
+async function getContextForWatchExpressionMenuWithDataAccess(parentContext, expression) {
+    const session = expression.getSession();
+    if (!session || !session.capabilities.supportsDataBreakpoints) {
+        return getContextForWatchExpressionMenu(parentContext, expression);
+    }
+    const contextKeys = [];
+    const dataBreakpointInfoResponse = await session.dataBreakpointInfo('evaluateName' in expression ? expression.evaluateName : expression.name);
+    const dataBreakpointId = dataBreakpointInfoResponse?.dataId;
+    const dataBreakpointAccessTypes = dataBreakpointInfoResponse?.accessTypes;
+    setDataBreakpointInfoResponse(dataBreakpointInfoResponse);
+    if (!dataBreakpointAccessTypes) {
+        contextKeys.push([CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED.key, !!dataBreakpointId]);
+    }
+    else {
+        for (const accessType of dataBreakpointAccessTypes) {
+            switch (accessType) {
+                case 'read':
+                    contextKeys.push([CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED.key, !!dataBreakpointId]);
+                    break;
+                case 'write':
+                    contextKeys.push([CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED.key, !!dataBreakpointId]);
+                    break;
+                case 'readWrite':
+                    contextKeys.push([CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED.key, !!dataBreakpointId]);
+                    break;
+            }
+        }
+    }
+    return getContextForWatchExpressionMenu(parentContext, expression, contextKeys);
+}
 class WatchExpressionsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(6257, "Debug Watch Expressions");
+        return localize(6375, "Debug Watch Expressions");
     }
     getAriaLabel(element) {
         if (element instanceof Expression) {
-            return localize(6258, "{0}, value {1}", element.name, element.value);
+            return localize(6376, "{0}, value {1}", element.name, element.value);
         }
-        return localize(6259, "{0}, value {1}", element.name, element.value);
+        return localize(6377, "{0}, value {1}", element.name, element.value);
     }
 }
 class WatchExpressionsDragAndDrop {
     constructor(debugService) {
         this.debugService = debugService;
     }
+    onDragStart(data, originalEvent) {
+        if (data instanceof ElementsDragAndDropData) {
+            originalEvent.dataTransfer.setData('text/plain', data.elements[0].name);
+        }
+    }
     onDragOver(data, targetElement, targetIndex, targetSector, originalEvent) {
         if (!(data instanceof ElementsDragAndDropData)) {
             return false;
@@ -431,7 +471,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'watch.collapse',
             viewId: WATCH_VIEW_ID,
-            title: ( localize(6260, "Collapse All")),
+            title: ( localize(6378, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
@@ -448,7 +488,7 @@ registerAction2(class Collapse extends ViewAction {
     }
 });
 const ADD_WATCH_ID = 'workbench.debug.viewlet.action.addWatchExpression';
-const ADD_WATCH_LABEL = ( localize(6261, "Add Expression"));
+const ADD_WATCH_LABEL = ( localize(6379, "Add Expression"));
 registerAction2(class AddWatchExpressionAction extends Action2 {
     constructor() {
         super({
@@ -469,7 +509,7 @@ registerAction2(class AddWatchExpressionAction extends Action2 {
     }
 });
 const REMOVE_WATCH_EXPRESSIONS_COMMAND_ID = 'workbench.debug.viewlet.action.removeAllWatchExpressions';
-const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize(6262, "Remove All Expressions"));
+const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize(6380, "Remove All Expressions"));
 registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
     constructor() {
         super({
@@ -495,7 +535,7 @@ registerAction2(class CopyExpression extends ViewAction {
     constructor() {
         super({
             id: COPY_WATCH_EXPRESSION_COMMAND_ID,
-            title: ( localize(6263, "Copy Expression")),
+            title: ( localize(6381, "Copy Expression")),
             f1: false,
             viewId: WATCH_VIEW_ID,
             precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,

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

@@ -30,7 +30,7 @@ const CONTEXT_DEBUG_START_LANGUAGE = ( new RawContextKey(debugStartLanguageKey,
 const CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR = ( new RawContextKey('debuggerInterestedInActiveEditor', false));
 let WelcomeView = class WelcomeView extends ViewPane {
     static { this.ID = 'workbench.debug.welcome'; }
-    static { this.LABEL = ( localize2(6264, "Run")); }
+    static { this.LABEL = ( localize2(6382, "Run")); }
     constructor(options, themeService, keybindingService, contextMenuService, configurationService, contextKeyService, debugService, editorService, instantiationService, viewDescriptorService, openerService, storageSevice, hoverService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
         this.debugService = debugService;
@@ -100,7 +100,7 @@ WelcomeView = ( __decorate([
 const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6265,
+        6383,
         "[Open a file](command:{0}) which can be debugged or run.",
         OpenFileAction.ID
     )),
@@ -109,14 +109,14 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 let debugKeybindingLabel = '';
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${( localize(6266, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
+    content: `[${( localize(6384, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
     when: CONTEXT_DEBUGGERS_AVAILABLE,
     group: ViewContentGroups.Debug,
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6267,
+        6385,
         "To customize Run and Debug [create a launch.json file](command:{0}).",
         `${DEBUG_CONFIGURE_COMMAND_ID}?${encodeURIComponent(JSON.stringify([{ addNew: true }]))}`
     )),
@@ -125,7 +125,7 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6268,
+        6386,
         "To customize Run and Debug, [open a folder](command:{0}) and create a launch.json file.",
         OpenFolderAction.ID
     )),
@@ -134,7 +134,7 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6269,
+        6387,
         "All debug extensions are disabled. Enable a debug extension or install a new one from the Marketplace."
     )),
     when: ( CONTEXT_DEBUG_EXTENSION_AVAILABLE.toNegated()),

package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js

@@ -53,14 +53,14 @@ let DebugContentProvider = class DebugContentProvider extends Disposable {
             session = this.debugService.getViewModel().focusedSession;
         }
         if (!session) {
-            return Promise.reject(( new ErrorNoTelemetry(( localize(6336, "Unable to resolve the resource without a debug session")))));
+            return Promise.reject(( new ErrorNoTelemetry(( localize(6454, "Unable to resolve the resource without a debug session")))));
         }
         const createErrModel = (errMsg) => {
             this.debugService.sourceIsNotAvailable(resource);
             const languageSelection = this.languageService.createById(PLAINTEXT_LANGUAGE_ID);
             const message = errMsg
-                ? ( localize(6337, "Could not load source '{0}': {1}.", resource.path, errMsg))
-                : ( localize(6338, "Could not load source '{0}'.", resource.path));
+                ? ( localize(6455, "Could not load source '{0}': {1}.", resource.path, errMsg))
+                : ( localize(6456, "Could not load source '{0}'.", resource.path));
             return this.modelService.createModel(message, languageSelection, resource);
         };
         return session.loadSource(resource).then(response => {

package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.js

@@ -31,20 +31,20 @@ let DebugLifecycle = class DebugLifecycle {
         let message;
         if (numSessions === 1) {
             message = ( localize(
-                6339,
+                6457,
                 "There is an active debug session, are you sure you want to stop it?"
             ));
         }
         else {
             message = ( localize(
-                6340,
+                6458,
                 "There are active debug sessions, are you sure you want to stop them?"
             ));
         }
         const res = await this.dialogService.confirm({
             message,
             type: 'warning',
-            primaryButton: ( localize(6341, "&&Stop Debugging"))
+            primaryButton: ( localize(6459, "&&Stop Debugging"))
         });
         return !res.confirmed;
     }