@codingame/monaco-vscode-debug-service-override 8.0.3 → 9.0.0

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

@@ -33,7 +33,7 @@ import { ViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/v
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { renderViewTree, AbstractExpressionDataSource, AbstractExpressionsRenderer, renderExpressionValue, renderVariable } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { COPY_VALUE_LABEL, COPY_VALUE_ID, COPY_EVALUATE_PATH_LABEL, COPY_EVALUATE_PATH_ID, ADD_TO_WATCH_LABEL, ADD_TO_WATCH_ID } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { LinkDetector } from './linkDetector.js';
+import { LinkDetector } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
 import { CONTEXT_VARIABLES_FOCUSED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, DebugVisualizationType, DataBreakpointSetType, VARIABLES_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { getContextForVariable } from '../common/debugContext.js';
@@ -353,10 +353,9 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
             text += ':';
         }
         data.label.set(text, highlights, viz.name);
-        renderExpressionValue(viz, data.value, {
+        renderExpressionValue(data.elementDisposable, viz, data.value, {
             showChanged: false,
             maxValueLength: 1024,
-            hover: data.elementDisposable,
             colorize: true,
             linkDetector: this.linkDetector
         }, this.hoverService);
@@ -365,7 +364,7 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
         const viz = expression;
         return {
             initialValue: expression.value,
-            ariaLabel: ( localize(6084, "Type new variable value")),
+            ariaLabel: ( localize(6027, "Type new variable value")),
             validationOptions: {
                 validation: () => viz.errorMessage ? ({ content: viz.errorMessage }) : null
             },
@@ -388,7 +387,7 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
         const primary = [];
         createAndFillInContextMenuActions(menu, { primary, secondary: [] }, 'inline');
         if (viz.original) {
-            const action = ( (new Action('debugViz', ( localize(6085, 'Remove Visualizer')), ThemeIcon.asClassName(Codicon.eye), true, () => this.debugService.getViewModel().setVisualizedExpression(viz.original, undefined))));
+            const action = ( (new Action('debugViz', ( localize(6028, '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';
@@ -438,7 +437,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
         const variable = expression;
         return {
             initialValue: expression.value,
-            ariaLabel: ( localize(6084, "Type new variable value")),
+            ariaLabel: ( localize(6027, "Type new variable value")),
             validationOptions: {
                 validation: () => variable.errorMessage ? ({ content: variable.errorMessage }) : null
             },
@@ -482,7 +481,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
                 actionBar.push(actions[0], { icon: true, label: false });
             }
             else {
-                actionBar.push(( (new Action('debugViz', ( localize(6086, 'Visualize Variable...')), ThemeIcon.asClassName(Codicon.eye), undefined, () => this.pickVisualizer(actions, originalExpression, data)))), { icon: true, label: false });
+                actionBar.push(( (new Action('debugViz', ( localize(6029, 'Visualize Variable...')), ThemeIcon.asClassName(Codicon.eye), undefined, () => this.pickVisualizer(actions, originalExpression, data)))), { icon: true, label: false });
             }
         });
     }
@@ -523,14 +522,14 @@ VariablesRenderer = VariablesRenderer_1 = ( (__decorate([
 ], VariablesRenderer)));
 class VariablesAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(6087, "Debug Variables"));
+        return ( localize(6030, "Debug Variables"));
     }
     getAriaLabel(element) {
         if (element instanceof Scope) {
-            return ( localize(6088, "Scope {0}", element.name));
+            return ( localize(6031, "Scope {0}", element.name));
         }
         if (element instanceof Variable) {
-            return ( localize(6089, "{0}, value {1}", element.name, element.value));
+            return ( localize(6032, "{0}, value {1}", element.name, element.value));
         }
         return null;
     }
@@ -633,7 +632,7 @@ CommandsRegistry.registerCommand({
 async function tryInstallHexEditor(extensionsWorkbenchService, notificationService) {
     try {
         await extensionsWorkbenchService.install(HEX_EDITOR_EXTENSION_ID, {
-            justification: ( localize(6090, "Inspecting binary data requires this extension.")),
+            justification: ( localize(6033, "Inspecting binary data requires this extension.")),
             enable: true
         }, ProgressLocation.Notification);
         return true;
@@ -698,7 +697,7 @@ registerAction2(class extends ViewAction {
         super({
             id: 'variables.collapse',
             viewId: VARIABLES_VIEW_ID,
-            title: ( localize(6091, "Collapse All")),
+            title: ( localize(6034, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {

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

@@ -22,7 +22,7 @@ import { ViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/v
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { renderViewTree, AbstractExpressionDataSource, AbstractExpressionsRenderer, renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { watchExpressionsAdd, watchExpressionsRemoveAll } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
-import { LinkDetector } from './linkDetector.js';
+import { LinkDetector } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
 import { VariablesRenderer, VisualizedVariableRenderer } from './variablesView.js';
 import { CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_ITEM_TYPE, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_CAN_VIEW_MEMORY, WATCH_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
@@ -53,8 +53,8 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
         this.element.classList.add('debug-pane');
         container.classList.add('debug-watch');
         const treeContainer = renderViewTree(container);
-        const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer);
         const linkDetector = this.instantiationService.createInstance(LinkDetector);
+        const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer, linkDetector);
         this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'WatchExpressions', treeContainer, ( (new WatchExpressionsDelegate())), [
             expressionsRenderer,
             this.instantiationService.createInstance(VariablesRenderer, linkDetector),
@@ -226,8 +226,9 @@ class WatchExpressionsDataSource extends AbstractExpressionDataSource {
 let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
     static { WatchExpressionsRenderer_1 = this; }
     static { this.ID = 'watchexpression'; }
-    constructor(menuService, contextKeyService, debugService, contextViewService, hoverService, configurationService) {
+    constructor(linkDetector, menuService, contextKeyService, debugService, contextViewService, hoverService, configurationService) {
         super(debugService, contextViewService, hoverService);
+        this.linkDetector = linkDetector;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
@@ -270,10 +271,10 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
             title = expression.value;
         }
         data.label.set(text, highlights, title);
-        renderExpressionValue(expression, data.value, {
+        renderExpressionValue(data.elementDisposable, expression, data.value, {
             showChanged: true,
             maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-            hover: data.elementDisposable,
+            linkDetector: this.linkDetector,
             colorize: true
         }, this.hoverService);
     }
@@ -281,7 +282,7 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         if (settingValue) {
             return {
                 initialValue: expression.value,
-                ariaLabel: ( localize(6092, "Type new value")),
+                ariaLabel: ( localize(6035, "Type new value")),
                 onFinish: async (value, success) => {
                     if (success && value) {
                         const focusedFrame = this.debugService.getViewModel().focusedStackFrame;
@@ -295,8 +296,8 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         }
         return {
             initialValue: expression.name ? expression.name : '',
-            ariaLabel: ( localize(6093, "Type watch expression")),
-            placeholder: ( localize(6094, "Expression to watch")),
+            ariaLabel: ( localize(6036, "Type watch expression")),
+            placeholder: ( localize(6037, "Expression to watch")),
             onFinish: (value, success) => {
                 if (success && value) {
                     this.debugService.renameWatchExpression(expression.getId(), value);
@@ -322,12 +323,12 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
     }
 };
 WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( (__decorate([
-    ( (__param(0, IMenuService))),
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IDebugService))),
-    ( (__param(3, IContextViewService))),
-    ( (__param(4, IHoverService))),
-    ( (__param(5, IConfigurationService)))
+    ( (__param(1, IMenuService))),
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, IDebugService))),
+    ( (__param(4, IContextViewService))),
+    ( (__param(5, IHoverService))),
+    ( (__param(6, IConfigurationService)))
 ], WatchExpressionsRenderer)));
 function getContextForWatchExpressionMenu(parentContext, expression) {
     return parentContext.createOverlay([
@@ -337,13 +338,13 @@ function getContextForWatchExpressionMenu(parentContext, expression) {
 }
 class WatchExpressionsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(6095, "Debug Watch Expressions"));
+        return ( localize(6038, "Debug Watch Expressions"));
     }
     getAriaLabel(element) {
         if (element instanceof Expression) {
-            return ( localize(6096, "{0}, value {1}", element.name, element.value));
+            return ( localize(6039, "{0}, value {1}", element.name, element.value));
         }
-        return ( localize(6097, "{0}, value {1}", element.name, element.value));
+        return ( localize(6040, "{0}, value {1}", element.name, element.value));
     }
 }
 class WatchExpressionsDragAndDrop {
@@ -424,7 +425,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'watch.collapse',
             viewId: WATCH_VIEW_ID,
-            title: ( localize(6098, "Collapse All")),
+            title: ( localize(6041, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
@@ -441,7 +442,7 @@ registerAction2(class Collapse extends ViewAction {
     }
 });
 const ADD_WATCH_ID = 'workbench.debug.viewlet.action.addWatchExpression';
-const ADD_WATCH_LABEL = ( localize(6099, "Add Expression"));
+const ADD_WATCH_LABEL = ( localize(6042, "Add Expression"));
 registerAction2(class AddWatchExpressionAction extends Action2 {
     constructor() {
         super({
@@ -462,7 +463,7 @@ registerAction2(class AddWatchExpressionAction extends Action2 {
     }
 });
 const REMOVE_WATCH_EXPRESSIONS_COMMAND_ID = 'workbench.debug.viewlet.action.removeAllWatchExpressions';
-const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize(6100, "Remove All Expressions"));
+const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize(6043, "Remove All Expressions"));
 registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
     constructor() {
         super({

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

@@ -31,7 +31,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(6101, "Run")); }
+    static { this.LABEL = ( localize2(6044, "Run")); }
     constructor(options, themeService, keybindingService, contextMenuService, configurationService, contextKeyService, debugService, editorService, instantiationService, viewDescriptorService, openerService, storageSevice, telemetryService, hoverService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.debugService = debugService;
@@ -102,7 +102,7 @@ WelcomeView = ( (__decorate([
 const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6102,
+        6045,
         "[Open a file](command:{0}) which can be debugged or run.",
         (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFileAction.ID
     )),
@@ -114,20 +114,20 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 let debugKeybindingLabel = '';
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${( localize(6103, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
+    content: `[${( localize(6046, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
     when: CONTEXT_DEBUGGERS_AVAILABLE,
     group: ViewContentGroups.Debug,
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${( localize(6104, "Show all automatic debug configurations"))}](command:${SELECT_AND_START_ID}).`,
+    content: `[${( localize(6047, "Show all automatic debug configurations"))}](command:${SELECT_AND_START_ID}).`,
     when: CONTEXT_DEBUGGERS_AVAILABLE,
     group: ViewContentGroups.Debug,
     order: 10
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6105,
+        6048,
         "To customize Run and Debug [create a launch.json file](command:{0}).",
         DEBUG_CONFIGURE_COMMAND_ID
     )),
@@ -139,7 +139,7 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6106,
+        6049,
         "To customize Run and Debug, [open a folder](command:{0}) and create a launch.json file.",
         (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID
     )),
@@ -151,7 +151,7 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6107,
+        6050,
         "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/debugAccessibilityAnnouncer.js

@@ -4,6 +4,7 @@ import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/life
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 
 let DebugWatchAccessibilityAnnouncer = class DebugWatchAccessibilityAnnouncer extends Disposable {
     static { this.ID = 'workbench.contrib.debugWatchAccessibilityAnnouncer'; }
@@ -25,7 +26,7 @@ let DebugWatchAccessibilityAnnouncer = class DebugWatchAccessibilityAnnouncer ex
         const value = this._configurationService.getValue('accessibility.debugWatchVariableAnnouncements');
         if (value && !this._listener.value) {
             this._listener.value = this._debugService.getModel().onDidChangeWatchExpressionValue((e) => {
-                if (!e || e.value === 'not available') {
+                if (!e || e.value === Expression.DEFAULT_VALUE) {
                     return;
                 }
                 this._accessibilityService.alert(`${e.name} = ${e.value}`);

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

@@ -49,14 +49,14 @@ let DebugContentProvider = class DebugContentProvider {
             session = this.debugService.getViewModel().focusedSession;
         }
         if (!session) {
-            return Promise.reject(( (new ErrorNoTelemetry(( localize(6108, "Unable to resolve the resource without a debug session"))))));
+            return Promise.reject(( (new ErrorNoTelemetry(( localize(6051, "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(6109, "Could not load source '{0}': {1}.", resource.path, errMsg))
-                : ( localize(6110, "Could not load source '{0}'.", resource.path));
+                ? ( localize(6052, "Could not load source '{0}': {1}.", resource.path, errMsg))
+                : ( localize(6053, "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

@@ -30,20 +30,20 @@ let DebugLifecycle = class DebugLifecycle {
         let message;
         if (numSessions === 1) {
             message = ( localize(
-                6111,
+                6054,
                 "There is an active debug session, are you sure you want to stop it?"
             ));
         }
         else {
             message = ( localize(
-                6112,
+                6055,
                 "There are active debug sessions, are you sure you want to stop them?"
             ));
         }
         const res = await this.dialogService.confirm({
             message,
             type: 'warning',
-            primaryButton: ( localize(6113, "&&Stop Debugging"))
+            primaryButton: ( localize(6056, "&&Stop Debugging"))
         });
         return !res.confirmed;
     }