@codingame/monaco-vscode-debug-service-override 4.5.2 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "4.5.2",
+  "version": "5.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.1"
   }
 }

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

@@ -41,17 +41,17 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { renderViewTree } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
-import { STOP_ID, DISCONNECT_ID, PAUSE_ID, PAUSE_LABEL, CONTINUE_ID, CONTINUE_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, RESTART_SESSION_ID, RESTART_LABEL, STOP_LABEL, DISCONNECT_LABEL } from './debugCommands.js';
+import { STOP_ID, DISCONNECT_ID, PAUSE_ID, PAUSE_LABEL, CONTINUE_ID, CONTINUE_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, RESTART_SESSION_ID, RESTART_LABEL, STOP_LABEL, DISCONNECT_LABEL } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 import { callstackViewSession, debugRestartFrame, debugPause, debugContinue, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStop, debugDisconnect } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
-import { CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, isFrameDeemphasized, CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { StackFrame, Thread, ThreadAndSessionIds } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { isSessionAttach } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
-var SessionsRenderer_1, ThreadsRenderer_1, StackFramesRenderer_1;
+var SessionsRenderer_1, ThreadsRenderer_1, StackFramesRenderer_1, ErrorsRenderer_1;
 const _moduleId = "vs/workbench/contrib/debug/browser/callStackView";
 const $ = $$1;
 function assignSessionContext(element, context) {
@@ -124,8 +124,8 @@ async function expandTo(session, tree) {
     await tree.expand(session);
 }
 let CallStackView = class CallStackView extends ViewPane {
-    constructor(options, contextMenuService, debugService, keybindingService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, themeService, telemetryService, menuService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, contextMenuService, debugService, keybindingService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, themeService, telemetryService, hoverService, menuService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.options = options;
         this.debugService = debugService;
         this.menuService = menuService;
@@ -185,7 +185,7 @@ let CallStackView = class CallStackView extends ViewPane {
         this.stateMessage = append(container, $('span.call-stack-state-message'));
         this.stateMessage.hidden = true;
         this.stateMessageLabel = append(this.stateMessage, $('span.label'));
-        this.stateMessageLabelHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.stateMessage, ''));
+        this.stateMessageLabelHover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.stateMessage, ''));
     }
     renderBody(container) {
         super.renderBody(container);
@@ -197,7 +197,7 @@ let CallStackView = class CallStackView extends ViewPane {
             this.instantiationService.createInstance(SessionsRenderer),
             this.instantiationService.createInstance(ThreadsRenderer),
             this.instantiationService.createInstance(StackFramesRenderer),
-            ( (new ErrorsRenderer())),
+            this.instantiationService.createInstance(ErrorsRenderer),
             ( (new LoadMoreRenderer())),
             ( (new ShowMoreRenderer()))
         ], this.dataSource, {
@@ -240,9 +240,7 @@ let CallStackView = class CallStackView extends ViewPane {
                 }
             },
             expandOnlyOnTwistieClick: true,
-            overrideStyles: {
-                listBackground: this.getBackgroundColor()
-            }
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles
         });
         this.tree.setInput(this.debugService.getModel());
         this._register(this.tree);
@@ -430,7 +428,8 @@ CallStackView = ( (__decorate([
     ( (__param(8, IOpenerService))),
     ( (__param(9, IThemeService))),
     ( (__param(10, ITelemetryService))),
-    ( (__param(11, IMenuService)))
+    ( (__param(11, IHoverService))),
+    ( (__param(12, IMenuService)))
 ], CallStackView)));
 function getSessionContextOverlay(session) {
     return [
@@ -443,9 +442,10 @@ function getSessionContextOverlay(session) {
 let SessionsRenderer = class SessionsRenderer {
     static { SessionsRenderer_1 = this; }
     static { this.ID = 'session'; }
-    constructor(instantiationService, contextKeyService, menuService) {
+    constructor(instantiationService, contextKeyService, hoverService, menuService) {
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
+        this.hoverService = hoverService;
         this.menuService = menuService;
     }
     get templateId() {
@@ -463,7 +463,7 @@ let SessionsRenderer = class SessionsRenderer {
             actionViewItemProvider: (action, options) => {
                 if ((action.id === STOP_ID || action.id === DISCONNECT_ID) && action instanceof MenuItemAction) {
                     stopActionViewItemDisposables.clear();
-                    const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, stopActionViewItemDisposables, accessor, options));
+                    const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, stopActionViewItemDisposables, accessor, { ...options, menuAsChild: false }));
                     if (item) {
                         return item;
                     }
@@ -489,7 +489,7 @@ let SessionsRenderer = class SessionsRenderer {
         this.doRenderElement(lastElement, matches, templateData);
     }
     doRenderElement(session, matches, data) {
-        const sessionHover = data.elementDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), data.session, ( localizeWithPath(_moduleId, 2, "Session"))));
+        const sessionHover = data.elementDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.session, ( localizeWithPath(_moduleId, 2, "Session"))));
         data.label.set(session.getLabel(), matches);
         const stoppedDetails = session.getStoppedDetails();
         const thread = session.getAllThreads().find(t => t.stopped);
@@ -535,7 +535,8 @@ let SessionsRenderer = class SessionsRenderer {
 SessionsRenderer = SessionsRenderer_1 = ( (__decorate([
     ( (__param(0, IInstantiationService))),
     ( (__param(1, IContextKeyService))),
-    ( (__param(2, IMenuService)))
+    ( (__param(2, IHoverService))),
+    ( (__param(3, IMenuService)))
 ], SessionsRenderer)));
 function getThreadContextOverlay(thread) {
     return [
@@ -546,8 +547,9 @@ function getThreadContextOverlay(thread) {
 let ThreadsRenderer = class ThreadsRenderer {
     static { ThreadsRenderer_1 = this; }
     static { this.ID = 'thread'; }
-    constructor(contextKeyService, menuService) {
+    constructor(contextKeyService, hoverService, menuService) {
         this.contextKeyService = contextKeyService;
+        this.hoverService = hoverService;
         this.menuService = menuService;
     }
     get templateId() {
@@ -565,7 +567,7 @@ let ThreadsRenderer = class ThreadsRenderer {
     }
     renderElement(element, _index, data) {
         const thread = element.element;
-        data.elementDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), data.thread, thread.name));
+        data.elementDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.thread, thread.name));
         data.label.set(thread.name, createMatches(element.filterData));
         data.stateLabel.textContent = thread.stateLabel;
         data.stateLabel.classList.toggle('exception', thread.stoppedDetails?.reason === 'exception');
@@ -595,7 +597,8 @@ let ThreadsRenderer = class ThreadsRenderer {
 };
 ThreadsRenderer = ThreadsRenderer_1 = ( (__decorate([
     ( (__param(0, IContextKeyService))),
-    ( (__param(1, IMenuService)))
+    ( (__param(1, IHoverService))),
+    ( (__param(2, IMenuService)))
 ], ThreadsRenderer)));
 function getStackFrameContextOverlay(stackFrame) {
     return [
@@ -606,7 +609,8 @@ function getStackFrameContextOverlay(stackFrame) {
 let StackFramesRenderer = class StackFramesRenderer {
     static { StackFramesRenderer_1 = this; }
     static { this.ID = 'stackFrame'; }
-    constructor(labelService, notificationService) {
+    constructor(hoverService, labelService, notificationService) {
+        this.hoverService = hoverService;
         this.labelService = labelService;
         this.notificationService = notificationService;
     }
@@ -627,16 +631,15 @@ let StackFramesRenderer = class StackFramesRenderer {
     }
     renderElement(element, index, data) {
         const stackFrame = element.element;
-        data.stackFrame.classList.toggle('disabled', !stackFrame.source || !stackFrame.source.available || isDeemphasized(stackFrame));
+        data.stackFrame.classList.toggle('disabled', !stackFrame.source || !stackFrame.source.available || isFrameDeemphasized(stackFrame));
         data.stackFrame.classList.toggle('label', stackFrame.presentationHint === 'label');
-        data.stackFrame.classList.toggle('subtle', stackFrame.presentationHint === 'subtle');
         const hasActions = !!stackFrame.thread.session.capabilities.supportsRestartFrame && stackFrame.presentationHint !== 'label' && stackFrame.presentationHint !== 'subtle' && stackFrame.canRestart;
         data.stackFrame.classList.toggle('has-actions', hasActions);
         let title = stackFrame.source.inMemory ? stackFrame.source.uri.path : this.labelService.getUriLabel(stackFrame.source.uri);
         if (stackFrame.source.raw.origin) {
             title += `\n${stackFrame.source.raw.origin}`;
         }
-        data.templateDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), data.file, title));
+        data.templateDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.file, title));
         data.label.set(stackFrame.name, createMatches(element.filterData), stackFrame.name);
         data.fileName.textContent = getSpecificSourceName(stackFrame);
         if (stackFrame.range.startLineNumber !== undefined) {
@@ -670,13 +673,18 @@ let StackFramesRenderer = class StackFramesRenderer {
     }
 };
 StackFramesRenderer = StackFramesRenderer_1 = ( (__decorate([
-    ( (__param(0, ILabelService))),
-    ( (__param(1, INotificationService)))
+    ( (__param(0, IHoverService))),
+    ( (__param(1, ILabelService))),
+    ( (__param(2, INotificationService)))
 ], StackFramesRenderer)));
-class ErrorsRenderer {
+let ErrorsRenderer = class ErrorsRenderer {
+    static { ErrorsRenderer_1 = this; }
     static { this.ID = 'error'; }
     get templateId() {
-        return ErrorsRenderer.ID;
+        return ErrorsRenderer_1.ID;
+    }
+    constructor(hoverService) {
+        this.hoverService = hoverService;
     }
     renderTemplate(container) {
         const label = append(container, $('.error'));
@@ -685,14 +693,17 @@ class ErrorsRenderer {
     renderElement(element, index, data) {
         const error = element.element;
         data.label.textContent = error;
-        data.templateDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), data.label, error));
+        data.templateDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.label, error));
     }
     renderCompressedElements(node, index, templateData, height) {
         throw ( (new Error('Method not implemented.')));
     }
     disposeTemplate(templateData) {
     }
-}
+};
+ErrorsRenderer = ErrorsRenderer_1 = ( (__decorate([
+    ( (__param(0, IHoverService)))
+], ErrorsRenderer)));
 class LoadMoreRenderer {
     static { this.ID = 'loadMore'; }
     static { this.LABEL = ( localizeWithPath(_moduleId, 4, "Load More Stack Frames")); }
@@ -788,9 +799,6 @@ function isDebugModel(obj) {
 function isDebugSession(obj) {
     return obj && typeof obj.getAllThreads === 'function';
 }
-function isDeemphasized(frame) {
-    return frame.source.presentationHint === 'deemphasize' || frame.presentationHint === 'deemphasize';
-}
 class CallStackDataSource {
     constructor(debugService) {
         this.debugService = debugService;
@@ -832,7 +840,7 @@ class CallStackDataSource {
         return this.getThreadCallstack(thread).then(children => {
             const result = [];
             children.forEach((child, index) => {
-                if (child instanceof StackFrame && child.source && isDeemphasized(child)) {
+                if (child instanceof StackFrame && child.source && isFrameDeemphasized(child)) {
                     if (this.deemphasizedStackFramesToShow.indexOf(child) === -1) {
                         if (result.length) {
                             const last = result[result.length - 1];
@@ -842,7 +850,7 @@ class CallStackDataSource {
                             }
                         }
                         const nextChild = index < children.length - 1 ? children[index + 1] : undefined;
-                        if (nextChild instanceof StackFrame && nextChild.source && isDeemphasized(nextChild)) {
+                        if (nextChild instanceof StackFrame && nextChild.source && isFrameDeemphasized(nextChild)) {
                             result.push([child]);
                             return;
                         }