@codingame/monaco-vscode-debug-service-override 16.1.1 → 17.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "16.1.1",
+  "version": "17.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - debug service-override",
   "keywords": [],
@@ -15,20 +15,22 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.1.1",
-    "@codingame/monaco-vscode-2b1a9082-790f-527f-b013-d1b29d6265a3-common": "16.1.1",
-    "@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common": "16.1.1",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "16.1.1",
-    "@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common": "16.1.1",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "16.1.1",
-    "@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common": "16.1.1",
-    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "16.1.1",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "16.1.1",
-    "@codingame/monaco-vscode-ab07af84-42e8-5a0f-8aef-b83fb90ede21-common": "16.1.1",
-    "@codingame/monaco-vscode-api": "16.1.1",
-    "@codingame/monaco-vscode-b99aef83-0d60-5e8c-a62e-9908b6256f35-common": "16.1.1",
-    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "16.1.1",
-    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "16.1.1"
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "17.0.0",
+    "@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common": "17.0.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "17.0.0",
+    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "17.0.0",
+    "@codingame/monaco-vscode-97284942-b044-5fbb-b53b-3f46d2468746-common": "17.0.0",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "17.0.0",
+    "@codingame/monaco-vscode-ab07af84-42e8-5a0f-8aef-b83fb90ede21-common": "17.0.0",
+    "@codingame/monaco-vscode-api": "17.0.0",
+    "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "17.0.0",
+    "@codingame/monaco-vscode-b99aef83-0d60-5e8c-a62e-9908b6256f35-common": "17.0.0",
+    "@codingame/monaco-vscode-bed2b49f-41ae-5ed2-b61a-1105500a3f8a-common": "17.0.0",
+    "@codingame/monaco-vscode-c8227507-8e59-53d6-b50b-71c0ab384cf4-common": "17.0.0",
+    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "17.0.0",
+    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "17.0.0",
+    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "17.0.0",
+    "@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common": "17.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -42,7 +42,7 @@ import { ViewPane, ViewAction } from '@codingame/monaco-vscode-65619f8f-0eab-5d8
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { renderViewTree } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/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 '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { callstackViewSession, debugRestartFrame, debugPause, debugContinue, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStop, debugDisconnect } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { callstackViewSession, debugRestartFrame, debugPause, debugContinue, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStop, debugDisconnect } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { State, CONTEXT_CALLSTACK_FOCUSED, 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 '@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';
@@ -145,7 +145,7 @@ let CallStackView = class CallStackView extends ViewPane {
                 this.stateMessage.hidden = false;
             }
             else if (sessions.length === 1 && sessions[0].state === State.Running) {
-                this.stateMessageLabel.textContent = ( localize(5448, "Running"));
+                this.stateMessageLabel.textContent = ( localize(5533, "Running"));
                 this.stateMessageLabelHover.update(sessions[0].getLabel());
                 this.stateMessageLabel.classList.remove('exception');
                 this.stateMessage.hidden = false;
@@ -155,7 +155,6 @@ let CallStackView = class CallStackView extends ViewPane {
             }
             this.updateActions();
             this.needsRefresh = false;
-            this.dataSource.deemphasizedStackFramesToShow = [];
             await this.tree.updateChildren();
             try {
                 const toExpand = ( new Set());
@@ -226,7 +225,7 @@ let CallStackView = class CallStackView extends ViewPane {
                     if (e instanceof ThreadAndSessionIds) {
                         return LoadMoreRenderer.LABEL;
                     }
-                    return localize(5449, "Show More Stack Frames");
+                    return localize(5534, "Show More Stack Frames");
                 },
                 getCompressedNodeKeyboardNavigationLabel: (e) => {
                     const firstItem = e[0];
@@ -281,7 +280,7 @@ let CallStackView = class CallStackView extends ViewPane {
                 }
             }
             if (element instanceof Array) {
-                this.dataSource.deemphasizedStackFramesToShow.push(...element);
+                element.forEach(sf => this.dataSource.deemphasizedStackFramesToShow.add(sf));
                 this.tree.updateChildren();
             }
         }));
@@ -482,7 +481,7 @@ let SessionsRenderer = class SessionsRenderer {
         this.doRenderElement(lastElement, matches, templateData);
     }
     doRenderElement(session, matches, data) {
-        const sessionHover = data.elementDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.session, ( localize(5450, "Session"))));
+        const sessionHover = data.elementDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.session, ( localize(5535, "Session"))));
         data.label.set(session.getLabel(), matches);
         const stoppedDetails = session.getStoppedDetails();
         const thread = session.getAllThreads().find(t => t.stopped);
@@ -508,7 +507,7 @@ let SessionsRenderer = class SessionsRenderer {
             data.stateLabel.classList.toggle('exception', thread.stoppedDetails.reason === 'exception');
         }
         else {
-            data.stateLabel.textContent = ( localize(5448, "Running"));
+            data.stateLabel.textContent = ( localize(5533, "Running"));
             data.stateLabel.classList.remove('exception');
         }
     }
@@ -612,9 +611,11 @@ let StackFramesRenderer = class StackFramesRenderer {
         const wrapper = append(file, $('span.line-number-wrapper'));
         const lineNumber = append(wrapper, $('span.line-number.monaco-count-badge'));
         const templateDisposable = ( new DisposableStore());
+        const elementDisposables = ( new DisposableStore());
+        templateDisposable.add(elementDisposables);
         const label = templateDisposable.add(( new HighlightedLabel(labelDiv)));
         const actionBar = templateDisposable.add(( new ActionBar(stackFrame)));
-        return { file, fileName, label, lineNumber, stackFrame, actionBar, templateDisposable };
+        return { file, fileName, label, lineNumber, stackFrame, actionBar, templateDisposable, elementDisposables };
     }
     renderElement(element, index, data) {
         const stackFrame = element.element;
@@ -626,7 +627,7 @@ let StackFramesRenderer = class StackFramesRenderer {
         if (stackFrame.source.raw.origin) {
             title += `\n${stackFrame.source.raw.origin}`;
         }
-        data.templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.file, title));
+        data.elementDisposables.add(this.hoverService.setupManagedHover(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) {
@@ -641,22 +642,25 @@ let StackFramesRenderer = class StackFramesRenderer {
         }
         data.actionBar.clear();
         if (hasActions) {
-            const action = ( new Action('debug.callStack.restartFrame', ( localize(5451, "Restart Frame")), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
+            const action = data.elementDisposables.add(( new Action('debug.callStack.restartFrame', ( localize(5536, "Restart Frame")), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
                 try {
                     await stackFrame.restart();
                 }
                 catch (e) {
                     this.notificationService.error(e);
                 }
-            }));
+            })));
             data.actionBar.push(action, { icon: true, label: false });
         }
     }
     renderCompressedElements(node, index, templateData, height) {
         throw ( new Error('Method not implemented.'));
     }
+    disposeElement(element, index, templateData, height) {
+        templateData.elementDisposables.clear();
+    }
     disposeTemplate(templateData) {
-        templateData.actionBar.dispose();
+        templateData.templateDisposable.dispose();
     }
 };
 StackFramesRenderer = StackFramesRenderer_1 = ( __decorate([
@@ -693,7 +697,7 @@ ErrorsRenderer = ErrorsRenderer_1 = ( __decorate([
 ], ErrorsRenderer));
 class LoadMoreRenderer {
     static { this.ID = 'loadMore'; }
-    static { this.LABEL = ( localize(5452, "Load More Stack Frames")); }
+    static { this.LABEL = ( localize(5537, "Load More Stack Frames")); }
     constructor() { }
     get templateId() {
         return LoadMoreRenderer.ID;
@@ -727,14 +731,14 @@ class ShowMoreRenderer {
         const stackFrames = element.element;
         if (stackFrames.every(sf => !!(sf.source && sf.source.origin && sf.source.origin === stackFrames[0].source.origin))) {
             data.label.textContent = ( localize(
-                5453,
+                5538,
                 "Show {0} More: {1}",
                 stackFrames.length,
                 stackFrames[0].source.origin
             ));
         }
         else {
-            data.label.textContent = ( localize(5454, "Show {0} More Stack Frames", stackFrames.length));
+            data.label.textContent = ( localize(5539, "Show {0} More Stack Frames", stackFrames.length));
         }
     }
     renderCompressedElements(node, index, templateData, height) {
@@ -777,7 +781,7 @@ function stoppedText(stoppedDetails) {
 }
 function stoppedDescription(stoppedDetails) {
     return stoppedDetails.description ||
-        (stoppedDetails.reason ? ( localize(5455, "Paused on {0}", stoppedDetails.reason)) : ( localize(5456, "Paused")));
+        (stoppedDetails.reason ? ( localize(5540, "Paused on {0}", stoppedDetails.reason)) : ( localize(5541, "Paused")));
 }
 function isDebugModel(obj) {
     return typeof obj.getSessions === 'function';
@@ -788,7 +792,7 @@ function isDebugSession(obj) {
 class CallStackDataSource {
     constructor(debugService) {
         this.debugService = debugService;
-        this.deemphasizedStackFramesToShow = [];
+        this.deemphasizedStackFramesToShow = ( new WeakSet());
     }
     hasChildren(element) {
         if (isDebugSession(element)) {
@@ -827,7 +831,7 @@ class CallStackDataSource {
             const result = [];
             children.forEach((child, index) => {
                 if (child instanceof StackFrame && child.source && isFrameDeemphasized(child)) {
-                    if (this.deemphasizedStackFramesToShow.indexOf(child) === -1) {
+                    if (!( this.deemphasizedStackFramesToShow.has(child))) {
                         if (result.length) {
                             const last = result[result.length - 1];
                             if (last instanceof Array) {
@@ -867,7 +871,7 @@ class CallStackDataSource {
 }
 class CallStackAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(5457, "Debug Call Stack");
+        return localize(5542, "Debug Call Stack");
     }
     getWidgetRole() {
         return 'treegrid';
@@ -877,11 +881,11 @@ class CallStackAccessibilityProvider {
     }
     getAriaLabel(element) {
         if (element instanceof Thread) {
-            return localize(5458, "Thread {0} {1}", element.name, element.stateLabel);
+            return localize(5543, "Thread {0} {1}", element.name, element.stateLabel);
         }
         if (element instanceof StackFrame) {
             return localize(
-                5459,
+                5544,
                 "Stack Frame {0}, line {1}, {2}",
                 element.name,
                 element.range.startLineNumber,
@@ -890,14 +894,14 @@ class CallStackAccessibilityProvider {
         }
         if (isDebugSession(element)) {
             const thread = element.getAllThreads().find(t => t.stopped);
-            const state = thread ? thread.stateLabel : ( localize(5448, "Running"));
-            return localize(5460, "Session {0} {1}", element.getLabel(), state);
+            const state = thread ? thread.stateLabel : ( localize(5533, "Running"));
+            return localize(5545, "Session {0} {1}", element.getLabel(), state);
         }
         if (typeof element === 'string') {
             return element;
         }
         if (element instanceof Array) {
-            return localize(5454, "Show {0} More Stack Frames", element.length);
+            return localize(5539, "Show {0} More Stack Frames", element.length);
         }
         return LoadMoreRenderer.LABEL;
     }
@@ -925,7 +929,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'callStack.collapse',
             viewId: CALLSTACK_VIEW_ID,
-            title: ( localize(5461, "Collapse All")),
+            title: ( localize(5546, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             precondition: ( CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(State.Stopped))),