@codingame/monaco-vscode-debug-service-override 8.0.4 → 9.0.2

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

@@ -4,7 +4,7 @@ import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { ScrollbarVisibility } from 'vscode/vscode/vs/base/common/scrollable';
@@ -34,7 +34,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { renderExpressionValue, AbstractExpressionDataSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
-import { LinkDetector } from './linkDetector.js';
+import { LinkDetector } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
 import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Variable, Expression, VisualizedExpression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
@@ -88,7 +88,6 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.highlightDecorations = this.editor.createDecorationsCollection();
         this.isUpdatingTree = false;
         this.toDispose = [];
-        this._isVisible = false;
         this.showAtPosition = null;
         this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
         this.debugHoverComputer = this.instantiationService.createInstance(DebugHoverComputer, this.editor);
@@ -101,7 +100,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.treeContainer.setAttribute('role', 'tree');
         const tip = append(this.complexValueContainer, $('.tip'));
         tip.textContent = ( localize(
-            10238,
+            10282,
             'Hold {0} key to switch to editor language hover',
             isMacintosh ? 'Option' : 'Alt'
         ));
@@ -174,7 +173,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         return !!this.domNode?.matches(':hover');
     }
     isVisible() {
-        return this._isVisible;
+        return !!this._isVisible;
     }
     willBeVisible() {
         return !!this.showCancellationSource;
@@ -189,7 +188,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         return this._isVisible && !!this.safeTriangle?.contains(x, y);
     }
     async showAt(position, focus, mouseEvent) {
-        this.showCancellationSource?.cancel();
+        this.showCancellationSource?.dispose(true);
         const cancellationSource = this.showCancellationSource = ( (new CancellationTokenSource()));
         const session = this.debugService.getViewModel().focusedSession;
         if (!session || !this.editor.hasModel()) {
@@ -232,13 +231,15 @@ let DebugHoverWidget = class DebugHoverWidget {
             this.create();
         }
         this.showAtPosition = position;
-        this._isVisible = true;
+        const store = new DisposableStore();
+        this._isVisible = { store };
         if (!expression.hasChildren) {
             this.complexValueContainer.hidden = true;
             this.valueContainer.hidden = false;
-            renderExpressionValue(expression, this.valueContainer, {
+            renderExpressionValue(store, expression, this.valueContainer, {
                 showChanged: false,
-                colorize: true
+                colorize: true,
+                hover: false,
             }, this.hoverService);
             this.valueContainer.title = '';
             this.editor.layoutContentWidget(this);
@@ -303,7 +304,7 @@ let DebugHoverWidget = class DebugHoverWidget {
     }
     hide() {
         if (this.showCancellationSource) {
-            this.showCancellationSource.cancel();
+            this.showCancellationSource.dispose(true);
             this.showCancellationSource = undefined;
         }
         if (!this._isVisible) {
@@ -312,7 +313,8 @@ let DebugHoverWidget = class DebugHoverWidget {
         if (isAncestorOfActiveElement(this.domNode)) {
             this.editor.focus();
         }
-        this._isVisible = false;
+        this._isVisible.store.dispose();
+        this._isVisible = undefined;
         this.highlightDecorations.clear();
         this.editor.layoutContentWidget(this);
         this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
@@ -337,10 +339,10 @@ DebugHoverWidget = DebugHoverWidget_1 = ( (__decorate([
 ], DebugHoverWidget)));
 class DebugHoverAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(10239, "Debug Hover"));
+        return ( localize(10283, "Debug Hover"));
     }
     getAriaLabel(element) {
-        return ( localize(10240, "{0}, value {1}, variables, debug", element.name, element.value));
+        return ( localize(10284, "{0}, value {1}, variables, debug", element.name, element.value));
     }
 }
 class DebugHoverDataSource extends AbstractExpressionDataSource {

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

@@ -15,7 +15,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
     constructor(debugService, contextService, commandService, notificationService) {
         super(DEBUG_QUICK_ACCESS_PREFIX, {
             noResultsPick: {
-                label: ( localize(6030, "No matching launch configurations"))
+                label: ( localize(6008, "No matching launch configurations"))
             }
         });
         this.debugService = debugService;
@@ -44,7 +44,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
                     highlights: { label: highlights },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(debugConfigure),
-                            tooltip: ( localize(6031, "Configure Launch Configuration"))
+                            tooltip: ( localize(6009, "Configure Launch Configuration"))
                         }],
                     trigger: () => {
                         config.launch.openConfigFile({ preserveFocus: false });
@@ -65,7 +65,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         const dynamicProviders = await configManager.getDynamicProviders();
         if (dynamicProviders.length > 0) {
             picks.push({
-                type: 'separator', label: ( localize(6032, "contributed"))
+                type: 'separator', label: ( localize(6010, "contributed"))
             });
         }
         configManager.getRecentDynamicConfigurations().forEach(({ name, type }) => {
@@ -76,7 +76,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
                     highlights: { label: highlights },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(debugRemoveConfig),
-                            tooltip: ( localize(6033, "Remove Launch Configuration"))
+                            tooltip: ( localize(6011, "Remove Launch Configuration"))
                         }],
                     trigger: () => {
                         configManager.removeRecentDynamicConfigurations(name, type);
@@ -99,7 +99,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         dynamicProviders.forEach(provider => {
             picks.push({
                 label: `$(folder) ${provider.label}...`,
-                ariaLabel: ( localize(6034, "{0} contributed configurations", provider.label)),
+                ariaLabel: ( localize(6012, "{0} contributed configurations", provider.label)),
                 accept: async () => {
                     const pick = await provider.pick();
                     if (pick) {
@@ -111,12 +111,12 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         });
         const visibleLaunches = configManager.getLaunches().filter(launch => !launch.hidden);
         if (visibleLaunches.length > 0) {
-            picks.push({ type: 'separator', label: ( localize(6035, "configure")) });
+            picks.push({ type: 'separator', label: ( localize(6013, "configure")) });
         }
         for (const launch of visibleLaunches) {
             const label = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ?
-                ( localize(6036, "Add Config ({0})...", launch.name)) :
-                ( localize(6037, "Add Configuration..."));
+                ( localize(6014, "Add Config ({0})...", launch.name)) :
+                ( localize(6015, "Add Configuration..."));
             picks.push({
                 label,
                 description: this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? launch.name : '',

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

@@ -138,7 +138,7 @@ let DebugService = class DebugService {
             if (numberOfSessions > 0) {
                 const viewContainer = this.viewDescriptorService.getViewContainerByViewId(CALLSTACK_VIEW_ID);
                 if (viewContainer) {
-                    this.activity = this.activityService.showViewContainerActivity(viewContainer.id, { badge: ( (new NumberBadge(numberOfSessions, n => n === 1 ? ( localize(2554, "1 active session")) : ( localize(2555, "{0} active sessions", n))))) });
+                    this.activity = this.activityService.showViewContainerActivity(viewContainer.id, { badge: ( (new NumberBadge(numberOfSessions, n => n === 1 ? ( localize(2567, "1 active session")) : ( localize(2568, "{0} active sessions", n))))) });
                 }
             }
         }));
@@ -160,7 +160,7 @@ let DebugService = class DebugService {
             }
         }));
         this.disposables.add(extensionService.onWillStop(evt => {
-            evt.veto(this.model.getSessions().length > 0, ( localize(2556, 'A debug session is still running.')));
+            evt.veto(this.model.getSessions().length > 0, ( localize(2569, 'A debug session is still running.')));
         }));
         this.initContextKeys(contextKeyService);
     }
@@ -269,8 +269,8 @@ let DebugService = class DebugService {
         }
     }
     async startDebugging(launch, configOrName, options, saveBeforeStart = !options?.parentSession) {
-        const message = options && options.noDebug ? ( localize(2557, "Running executes build tasks and program code from your workspace.")) : ( localize(
-            2558,
+        const message = options && options.noDebug ? ( localize(2570, "Running executes build tasks and program code from your workspace.")) : ( localize(
+            2571,
             "Debugging executes build tasks and program code from your workspace."
         ));
         const trust = await this.workspaceTrustRequestService.requestWorkspaceTrust({ message });
@@ -301,7 +301,7 @@ let DebugService = class DebugService {
             if (compound) {
                 if (!compound.configurations) {
                     throw ( (new Error(localize(
-                        2559,
+                        2572,
                         "Compound must have \"configurations\" attribute set in order to start multiple configurations."
                     ))));
                 }
@@ -331,9 +331,9 @@ let DebugService = class DebugService {
                         }
                         else {
                             throw ( (new Error(
-                                launchesContainingName.length === 0 ? localize(2560, "Could not find launch configuration '{0}' in the workspace.", name)
+                                launchesContainingName.length === 0 ? localize(2573, "Could not find launch configuration '{0}' in the workspace.", name)
                                     : localize(
-                                    2561,
+                                    2574,
                                     "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.",
                                     name
                                 )
@@ -347,7 +347,7 @@ let DebugService = class DebugService {
                         }
                         else {
                             throw ( (new Error(localize(
-                                2562,
+                                2575,
                                 "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.",
                                 configData.folder,
                                 configData.name,
@@ -363,11 +363,11 @@ let DebugService = class DebugService {
             }
             if (configOrName && !config) {
                 const message = !!launch ? ( localize(
-                    2563,
+                    2576,
                     "Configuration '{0}' is missing in 'launch.json'.",
                     typeof configOrName === 'string' ? configOrName : configOrName.name
                 )) :
-                    ( localize(2564, "'launch.json' does not exist for passed workspace folder."));
+                    ( localize(2577, "'launch.json' does not exist for passed workspace folder."));
                 throw ( (new Error(message)));
             }
             const result = await this.createSession(launch, config, options);
@@ -440,23 +440,23 @@ let DebugService = class DebugService {
                     let message;
                     if (configByProviders.request !== 'attach' && configByProviders.request !== 'launch') {
                         message = configByProviders.request ? ( localize(
-                            2565,
+                            2578,
                             "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.",
                             'request',
                             configByProviders.request
                         ))
                             : ( localize(
-                            2566,
+                            2579,
                             "Attribute '{0}' is missing from the chosen debug configuration.",
                             'request'
                         ));
                     }
                     else {
-                        message = resolvedConfig.type ? ( localize(2567, "Configured debug type '{0}' is not supported.", resolvedConfig.type)) :
-                            ( localize(2568, "Missing property 'type' for the chosen launch configuration."));
+                        message = resolvedConfig.type ? ( localize(2580, "Configured debug type '{0}' is not supported.", resolvedConfig.type)) :
+                            ( localize(2581, "Missing property 'type' for the chosen launch configuration."));
                     }
                     const actionList = [];
-                    actionList.push(( (new Action('installAdditionalDebuggers', ( localize(2569, "Install {0} Extension", resolvedConfig.type)), undefined, true, async () => this.commandService.executeCommand('debug.installAdditionalDebuggers', resolvedConfig?.type)))));
+                    actionList.push(( (new Action('installAdditionalDebuggers', ( localize(2582, "Install {0} Extension", resolvedConfig.type)), undefined, true, async () => this.commandService.executeCommand('debug.installAdditionalDebuggers', resolvedConfig?.type)))));
                     await this.showError(message, actionList);
                     return false;
                 }
@@ -477,7 +477,7 @@ let DebugService = class DebugService {
                 }
                 else if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
                     await this.showError(( localize(
-                        2570,
+                        2583,
                         "The active file can not be debugged. Make sure it is saved and that you have a debug extension installed for that file type."
                     )));
                 }
@@ -496,7 +496,7 @@ let DebugService = class DebugService {
         const session = this.instantiationService.createInstance(DebugSession, sessionId, configuration, root, this.model, options);
         if (options?.startedByUser && ( (this.model.getSessions().some(s => s.getLabel() === session.getLabel()))) && configuration.resolved.suppressMultipleSessionWarning !== true) {
             const result = await this.dialogService.confirm({ message: ( localize(
-                2571,
+                2584,
                 "'{0}' is already running. Do you want to start another instance?",
                 session.getLabel()
             )) });
@@ -587,7 +587,7 @@ let DebugService = class DebugService {
             if (adapterExitEvent) {
                 if (adapterExitEvent.error) {
                     this.notificationService.error(( localize(
-                        2572,
+                        2585,
                         "Debug adapter process has terminated unexpectedly ({0})",
                         adapterExitEvent.error.message || ( (adapterExitEvent.error.toString()))
                     )));
@@ -830,7 +830,7 @@ let DebugService = class DebugService {
                         if (lineNumber >= 1 && lineNumber <= model.getLineCount()) {
                             const lineContent = control.getModel().getLineContent(lineNumber);
                             alert(( localize(
-                                2573,
+                                2586,
                                 "{0}, debugging paused {1}, {2}:{3}",
                                 lineContent,
                                 thread && thread.stoppedDetails ? `, reason ${thread.stoppedDetails.reason}` : '',
@@ -903,7 +903,7 @@ let DebugService = class DebugService {
     async addBreakpoints(uri, rawBreakpoints, ariaAnnounce = true) {
         const breakpoints = this.model.addBreakpoints(uri, rawBreakpoints);
         if (ariaAnnounce) {
-            breakpoints.forEach(bp => status(( localize(2574, "Added breakpoint, line {0}, file {1}", bp.lineNumber, uri.fsPath))));
+            breakpoints.forEach(bp => status(( localize(2587, "Added breakpoint, line {0}, file {1}", bp.lineNumber, uri.fsPath))));
         }
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendBreakpoints(uri);
@@ -925,7 +925,7 @@ let DebugService = class DebugService {
         const breakpoints = this.model.getBreakpoints();
         const toRemove = breakpoints.filter(bp => !id || bp.getId() === id);
         toRemove.forEach(bp => status(( localize(
-            2575,
+            2588,
             "Removed breakpoint, line {0}, file {1}",
             bp.lineNumber,
             bp.uri.fsPath