@codingame/monaco-vscode-debug-service-override 7.0.11 → 7.1.1

package/package.json

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

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

@@ -10,7 +10,7 @@ import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { posix } from 'vscode/vscode/vs/base/common/path';
 import { commonSuffixLength } from 'vscode/vscode/vs/base/common/strings';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { createAndFillInContextMenuActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem, createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, MenuItemAction, SubmenuItemAction, registerAction2, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -52,7 +52,6 @@ import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var SessionsRenderer_1, ThreadsRenderer_1, StackFramesRenderer_1, ErrorsRenderer_1;
-const _moduleId = "vs/workbench/contrib/debug/browser/callStackView";
 const $ = $$1;
 function assignSessionContext(element, context) {
     context.sessionId = element.getId();
@@ -148,7 +147,7 @@ let CallStackView = class CallStackView extends ViewPane {
                 this.stateMessage.hidden = false;
             }
             else if (sessions.length === 1 && sessions[0].state === State.Running) {
-                this.stateMessageLabel.textContent = ( localizeWithPath(_moduleId, 0, "Running"));
+                this.stateMessageLabel.textContent = ( localize(5926, "Running"));
                 this.stateMessageLabelHover.update(sessions[0].getLabel());
                 this.stateMessageLabel.classList.remove('exception');
                 this.stateMessage.hidden = false;
@@ -229,7 +228,7 @@ let CallStackView = class CallStackView extends ViewPane {
                     if (e instanceof ThreadAndSessionIds) {
                         return LoadMoreRenderer.LABEL;
                     }
-                    return ( localizeWithPath(_moduleId, 1, "Show More Stack Frames"));
+                    return ( localize(5927, "Show More Stack Frames"));
                 },
                 getCompressedNodeKeyboardNavigationLabel: (e) => {
                     const firstItem = e[0];
@@ -407,9 +406,8 @@ let CallStackView = class CallStackView extends ViewPane {
         const secondary = [];
         const result = { primary, secondary };
         const contextKeyService = this.contextKeyService.createOverlay(overlay);
-        const menu = this.menuService.createMenu(MenuId.DebugCallStackContext, contextKeyService);
-        createAndFillInContextMenuActions(menu, { arg: getContextForContributedActions(element), shouldForwardArgs: true }, result, 'inline');
-        menu.dispose();
+        const menu = this.menuService.getMenuActions(MenuId.DebugCallStackContext, contextKeyService, { arg: getContextForContributedActions(element), shouldForwardArgs: true });
+        createAndFillInContextMenuActions(menu, result, 'inline');
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
             getActions: () => result.secondary,
@@ -489,7 +487,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, ( localizeWithPath(_moduleId, 2, "Session"))));
+        const sessionHover = data.elementDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.session, ( localize(5928, "Session"))));
         data.label.set(session.getLabel(), matches);
         const stoppedDetails = session.getStoppedDetails();
         const thread = session.getAllThreads().find(t => t.stopped);
@@ -518,7 +516,7 @@ let SessionsRenderer = class SessionsRenderer {
             data.stateLabel.classList.toggle('exception', thread.stoppedDetails.reason === 'exception');
         }
         else {
-            data.stateLabel.textContent = ( localizeWithPath(_moduleId, 0, "Running"));
+            data.stateLabel.textContent = ( localize(5928, "Running"));
             data.stateLabel.classList.remove('exception');
         }
     }
@@ -654,7 +652,7 @@ let StackFramesRenderer = class StackFramesRenderer {
         }
         data.actionBar.clear();
         if (hasActions) {
-            const action = ( (new Action('debug.callStack.restartFrame', ( localizeWithPath(_moduleId, 3, "Restart Frame")), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
+            const action = ( (new Action('debug.callStack.restartFrame', ( localize(5929, "Restart Frame")), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
                 try {
                     await stackFrame.restart();
                 }
@@ -706,7 +704,7 @@ ErrorsRenderer = ErrorsRenderer_1 = ( (__decorate([
 ], ErrorsRenderer)));
 class LoadMoreRenderer {
     static { this.ID = 'loadMore'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 4, "Load More Stack Frames")); }
+    static { this.LABEL = ( localize(5930, "Load More Stack Frames")); }
     constructor() { }
     get templateId() {
         return LoadMoreRenderer.ID;
@@ -739,16 +737,15 @@ class ShowMoreRenderer {
     renderElement(element, index, data) {
         const stackFrames = element.element;
         if (stackFrames.every(sf => !!(sf.source && sf.source.origin && sf.source.origin === stackFrames[0].source.origin))) {
-            data.label.textContent = ( localizeWithPath(
-                _moduleId,
-                5,
+            data.label.textContent = ( localize(
+                5931,
                 "Show {0} More: {1}",
                 stackFrames.length,
                 stackFrames[0].source.origin
             ));
         }
         else {
-            data.label.textContent = ( localizeWithPath(_moduleId, 6, "Show {0} More Stack Frames", stackFrames.length));
+            data.label.textContent = ( localize(5932, "Show {0} More Stack Frames", stackFrames.length));
         }
     }
     renderCompressedElements(node, index, templateData, height) {
@@ -791,7 +788,7 @@ function stoppedText(stoppedDetails) {
 }
 function stoppedDescription(stoppedDetails) {
     return stoppedDetails.description ||
-        (stoppedDetails.reason ? ( localizeWithPath(_moduleId, 7, "Paused on {0}", stoppedDetails.reason)) : ( localizeWithPath(_moduleId, 8, "Paused")));
+        (stoppedDetails.reason ? ( localize(5933, "Paused on {0}", stoppedDetails.reason)) : ( localize(5934, "Paused")));
 }
 function isDebugModel(obj) {
     return typeof obj.getSessions === 'function';
@@ -881,7 +878,7 @@ class CallStackDataSource {
 }
 class CallStackAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 9, "Debug Call Stack"));
+        return ( localize(5935, "Debug Call Stack"));
     }
     getWidgetRole() {
         return 'treegrid';
@@ -891,12 +888,11 @@ class CallStackAccessibilityProvider {
     }
     getAriaLabel(element) {
         if (element instanceof Thread) {
-            return ( localizeWithPath(_moduleId, 10, "Thread {0} {1}", element.name, element.stateLabel));
+            return ( localize(5936, "Thread {0} {1}", element.name, element.stateLabel));
         }
         if (element instanceof StackFrame) {
-            return ( localizeWithPath(
-                _moduleId,
-                11,
+            return ( localize(
+                5937,
                 "Stack Frame {0}, line {1}, {2}",
                 element.name,
                 element.range.startLineNumber,
@@ -905,14 +901,14 @@ class CallStackAccessibilityProvider {
         }
         if (isDebugSession(element)) {
             const thread = element.getAllThreads().find(t => t.stopped);
-            const state = thread ? thread.stateLabel : ( localizeWithPath(_moduleId, 0, "Running"));
-            return ( localizeWithPath(_moduleId, 12, "Session {0} {1}", element.getLabel(), state));
+            const state = thread ? thread.stateLabel : ( localize(5937, "Running"));
+            return ( localize(5938, "Session {0} {1}", element.getLabel(), state));
         }
         if (typeof element === 'string') {
             return element;
         }
         if (element instanceof Array) {
-            return ( localizeWithPath(_moduleId, 6, "Show {0} More Stack Frames", element.length));
+            return ( localize(5938, "Show {0} More Stack Frames", element.length));
         }
         return LoadMoreRenderer.LABEL;
     }
@@ -940,7 +936,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'callStack.collapse',
             viewId: CALLSTACK_VIEW_ID,
-            title: ( localizeWithPath(_moduleId, 13, "Collapse All")),
+            title: ( localize(5939, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             precondition: ( (CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(State.Stopped)))),