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

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

@@ -117,7 +117,7 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
         let horizontalScrolling;
         this._register(this.debugService.getViewModel().onDidSelectExpression(e => {
             const expression = e?.expression;
-            if (expression && this.tree.hasElement(expression)) {
+            if (expression && this.tree.hasNode(expression)) {
                 horizontalScrolling = this.tree.options.horizontalScrolling;
                 if (horizontalScrolling) {
                     this.tree.updateOptions({ horizontalScrolling: false });
@@ -227,24 +227,45 @@ class WatchExpressionsDataSource extends AbstractExpressionDataSource {
 let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
     static { WatchExpressionsRenderer_1 = this; }
     static { this.ID = 'watchexpression'; }
-    constructor(menuService, contextKeyService, debugService, contextViewService, hoverService) {
+    constructor(menuService, contextKeyService, debugService, contextViewService, hoverService, configurationService) {
         super(debugService, contextViewService, hoverService);
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
+        this.configurationService = configurationService;
     }
     get templateId() {
         return WatchExpressionsRenderer_1.ID;
     }
     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);
     }
     renderExpression(expression, data, highlights) {
-        const text = typeof expression.value === 'string' ? `${expression.name}:` : expression.name;
+        let text;
+        data.type.textContent = '';
+        const showType = this.configurationService.getValue('debug').showVariableTypes;
+        if (showType && expression.type) {
+            text = typeof expression.value === 'string' ? `${expression.name}: ` : expression.name;
+            data.type.textContent = expression.type + ' =';
+        }
+        else {
+            text = typeof expression.value === 'string' ? `${expression.name} =` : expression.name;
+        }
         let title;
         if (expression.type) {
-            title = expression.type === expression.value ?
-                expression.type :
-                `${expression.type}: ${expression.value}`;
+            if (showType) {
+                title = `${expression.name}`;
+            }
+            else {
+                title = expression.type === expression.value ?
+                    expression.type :
+                    `${expression.type}`;
+            }
         }
         else {
             title = expression.value;
@@ -306,7 +327,8 @@ WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( (__decorate([
     ( (__param(1, IContextKeyService))),
     ( (__param(2, IDebugService))),
     ( (__param(3, IContextViewService))),
-    ( (__param(4, IHoverService)))
+    ( (__param(4, IHoverService))),
+    ( (__param(5, IConfigurationService)))
 ], WatchExpressionsRenderer)));
 function getContextForWatchExpressionMenu(parentContext, expression) {
     return parentContext.createOverlay([
@@ -464,4 +486,4 @@ registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
     }
 });
 
-export { ADD_WATCH_ID, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, WatchExpressionsView };
+export { ADD_WATCH_ID, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, WatchExpressionsRenderer, WatchExpressionsView };

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

@@ -11,7 +11,7 @@ let DebugLifecycle = class DebugLifecycle {
         this.debugService = debugService;
         this.configurationService = configurationService;
         this.dialogService = dialogService;
-        lifecycleService.onBeforeShutdown(async (e) => e.veto(this.shouldVetoShutdown(e.reason), 'veto.debug'));
+        this.disposable = lifecycleService.onBeforeShutdown(async (e) => e.veto(this.shouldVetoShutdown(e.reason), 'veto.debug'));
     }
     shouldVetoShutdown(_reason) {
         const rootSessions = this.debugService.getModel().getSessions().filter(s => s.parentSession === undefined);
@@ -24,6 +24,9 @@ let DebugLifecycle = class DebugLifecycle {
         }
         return this.showWindowCloseConfirmation(rootSessions.length);
     }
+    dispose() {
+        return this.disposable.dispose();
+    }
     async showWindowCloseConfirmation(numSessions) {
         let message;
         if (numSessions === 1) {

package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js

@@ -226,7 +226,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                 1,
                 "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.",
                 variable,
-                'input'
+                'inputs'
             ))))));
         }
         const info = inputInfos.filter(item => item.id === variable).pop();