@codingame/monaco-vscode-debug-service-override 9.0.3 → 10.0.1

package/package.json

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

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

@@ -0,0 +1,160 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { $ as $$1, append, addDisposableListener, EventType, clearNode, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { InputBox } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { createMatches } from 'vscode/vscode/vs/base/common/filters';
+import { createSingleCallFunction } from 'vscode/vscode/vs/base/common/functional';
+import { DisposableStore, dispose, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { localize } from 'vscode/vscode/vs/nls';
+import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { defaultInputBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
+import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { IDebugVisualizerService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers.service';
+
+const $ = $$1;
+function renderViewTree(container) {
+    const treeContainer = $('.');
+    treeContainer.classList.add('debug-view-content');
+    container.appendChild(treeContainer);
+    return treeContainer;
+}
+let AbstractExpressionDataSource = class AbstractExpressionDataSource {
+    constructor(debugService, debugVisualizer) {
+        this.debugService = debugService;
+        this.debugVisualizer = debugVisualizer;
+    }
+    async getChildren(element) {
+        const vm = this.debugService.getViewModel();
+        const children = await this.doGetChildren(element);
+        return Promise.all(( (children.map(async (r) => {
+            const vizOrTree = vm.getVisualizedExpression(r);
+            if (typeof vizOrTree === 'string') {
+                const viz = await this.debugVisualizer.getVisualizedNodeFor(vizOrTree, r);
+                if (viz) {
+                    vm.setVisualizedExpression(r, viz);
+                    return viz;
+                }
+            }
+            else if (vizOrTree) {
+                return vizOrTree;
+            }
+            return r;
+        }))));
+    }
+};
+AbstractExpressionDataSource = ( (__decorate([
+    ( (__param(0, IDebugService))),
+    ( (__param(1, IDebugVisualizerService)))
+], AbstractExpressionDataSource)));
+let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
+    constructor(debugService, contextViewService, hoverService) {
+        this.debugService = debugService;
+        this.contextViewService = contextViewService;
+        this.hoverService = hoverService;
+    }
+    renderTemplate(container) {
+        const templateDisposable = ( (new DisposableStore()));
+        const expression = append(container, $('.expression'));
+        const name = append(expression, $('span.name'));
+        const lazyButton = append(expression, $('span.lazy-button'));
+        lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
+        templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localize(10372, "Click to expand"))));
+        const type = append(expression, $('span.type'));
+        const value = append(expression, $('span.value'));
+        const label = templateDisposable.add(( (new HighlightedLabel(name))));
+        const inputBoxContainer = append(expression, $('.inputBoxContainer'));
+        let actionBar;
+        if (this.renderActionBar) {
+            append(expression, $('.span.actionbar-spacer'));
+            actionBar = templateDisposable.add(( (new ActionBar(expression))));
+        }
+        const template = { expression, name, type, value, label, inputBoxContainer, actionBar, elementDisposable: ( (new DisposableStore())), templateDisposable, lazyButton, currentElement: undefined };
+        templateDisposable.add(addDisposableListener(lazyButton, EventType.CLICK, () => {
+            if (template.currentElement) {
+                this.debugService.getViewModel().evaluateLazyExpression(template.currentElement);
+            }
+        }));
+        return template;
+    }
+    renderExpressionElement(element, node, data) {
+        data.currentElement = element;
+        this.renderExpression(node.element, data, createMatches(node.filterData));
+        if (data.actionBar) {
+            this.renderActionBar(data.actionBar, element, data);
+        }
+        const selectedExpression = this.debugService.getViewModel().getSelectedExpression();
+        if (element === selectedExpression?.expression || (element instanceof Variable && element.errorMessage)) {
+            const options = this.getInputBoxOptions(element, !!selectedExpression?.settingWatch);
+            if (options) {
+                data.elementDisposable.add(this.renderInputBox(data.name, data.value, data.inputBoxContainer, options));
+            }
+        }
+    }
+    renderInputBox(nameElement, valueElement, inputBoxContainer, options) {
+        nameElement.style.display = 'none';
+        valueElement.style.display = 'none';
+        inputBoxContainer.style.display = 'initial';
+        clearNode(inputBoxContainer);
+        const inputBox = ( (new InputBox(
+            inputBoxContainer,
+            this.contextViewService,
+            { ...options, inputBoxStyles: defaultInputBoxStyles }
+        )));
+        inputBox.value = options.initialValue;
+        inputBox.focus();
+        inputBox.select();
+        const done = createSingleCallFunction((success, finishEditing) => {
+            nameElement.style.display = '';
+            valueElement.style.display = '';
+            inputBoxContainer.style.display = 'none';
+            const value = inputBox.value;
+            dispose(toDispose);
+            if (finishEditing) {
+                this.debugService.getViewModel().setSelectedExpression(undefined, false);
+                options.onFinish(value, success);
+            }
+        });
+        const toDispose = [
+            inputBox,
+            addStandardDisposableListener(inputBox.inputElement, EventType.KEY_DOWN, (e) => {
+                const isEscape = e.equals(9 );
+                const isEnter = e.equals(3 );
+                if (isEscape || isEnter) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    done(isEnter, true);
+                }
+            }),
+            addDisposableListener(inputBox.inputElement, EventType.BLUR, () => {
+                done(true, true);
+            }),
+            addDisposableListener(inputBox.inputElement, EventType.CLICK, e => {
+                e.preventDefault();
+                e.stopPropagation();
+            })
+        ];
+        return toDisposable(() => {
+            done(false, false);
+        });
+    }
+    disposeElement(node, index, templateData) {
+        templateData.elementDisposable.clear();
+    }
+    disposeTemplate(templateData) {
+        templateData.elementDisposable.dispose();
+        templateData.templateDisposable.dispose();
+    }
+};
+AbstractExpressionsRenderer = ( (__decorate([
+    ( (__param(0, IDebugService))),
+    ( (__param(1, IContextViewService))),
+    ( (__param(2, IHoverService)))
+], AbstractExpressionsRenderer)));
+
+export { AbstractExpressionDataSource, AbstractExpressionsRenderer, renderViewTree };

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

@@ -40,11 +40,11 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 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 { renderViewTree } from './baseDebugView.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 { State, 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 { 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';
@@ -146,8 +146,8 @@ let CallStackView = class CallStackView extends ViewPane {
                 this.stateMessageLabel.classList.toggle('exception', stoppedDetails.reason === 'exception');
                 this.stateMessage.hidden = false;
             }
-            else if (sessions.length === 1 && sessions[0].state === State.Running) {
-                this.stateMessageLabel.textContent = ( localize(5904, "Running"));
+            else if (sessions.length === 1 && sessions[0].state === 3 ) {
+                this.stateMessageLabel.textContent = ( localize(5951, "Running"));
                 this.stateMessageLabelHover.update(sessions[0].getLabel());
                 this.stateMessageLabel.classList.remove('exception');
                 this.stateMessage.hidden = false;
@@ -228,7 +228,7 @@ let CallStackView = class CallStackView extends ViewPane {
                     if (e instanceof ThreadAndSessionIds) {
                         return LoadMoreRenderer.LABEL;
                     }
-                    return ( localize(5905, "Show More Stack Frames"));
+                    return ( localize(5952, "Show More Stack Frames"));
                 },
                 getCompressedNodeKeyboardNavigationLabel: (e) => {
                     const firstItem = e[0];
@@ -312,7 +312,7 @@ let CallStackView = class CallStackView extends ViewPane {
             await this.updateTreeSelection();
         }));
         this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
-        if (this.debugService.state === State.Stopped) {
+        if (this.debugService.state === 2 ) {
             this.onCallStackChangeScheduler.schedule(0);
         }
         this._register(this.onDidChangeBodyVisibility(visible => {
@@ -433,7 +433,7 @@ function getSessionContextOverlay(session) {
     return [
         [CONTEXT_CALLSTACK_ITEM_TYPE.key, 'session'],
         [CONTEXT_CALLSTACK_SESSION_IS_ATTACH.key, isSessionAttach(session)],
-        [CONTEXT_CALLSTACK_ITEM_STOPPED.key, session.state === State.Stopped],
+        [CONTEXT_CALLSTACK_ITEM_STOPPED.key, session.state === 2 ],
         [CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD.key, session.getAllThreads().length === 1],
     ];
 }
@@ -487,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, ( localize(5906, "Session"))));
+        const sessionHover = data.elementDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.session, ( localize(5953, "Session"))));
         data.label.set(session.getLabel(), matches);
         const stoppedDetails = session.getStoppedDetails();
         const thread = session.getAllThreads().find(t => t.stopped);
@@ -516,7 +516,7 @@ let SessionsRenderer = class SessionsRenderer {
             data.stateLabel.classList.toggle('exception', thread.stoppedDetails.reason === 'exception');
         }
         else {
-            data.stateLabel.textContent = ( localize(5904, "Running"));
+            data.stateLabel.textContent = ( localize(5951, "Running"));
             data.stateLabel.classList.remove('exception');
         }
     }
@@ -652,7 +652,7 @@ let StackFramesRenderer = class StackFramesRenderer {
         }
         data.actionBar.clear();
         if (hasActions) {
-            const action = ( (new Action('debug.callStack.restartFrame', ( localize(5907, "Restart Frame")), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
+            const action = ( (new Action('debug.callStack.restartFrame', ( localize(5954, "Restart Frame")), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
                 try {
                     await stackFrame.restart();
                 }
@@ -704,7 +704,7 @@ ErrorsRenderer = ErrorsRenderer_1 = ( (__decorate([
 ], ErrorsRenderer)));
 class LoadMoreRenderer {
     static { this.ID = 'loadMore'; }
-    static { this.LABEL = ( localize(5908, "Load More Stack Frames")); }
+    static { this.LABEL = ( localize(5955, "Load More Stack Frames")); }
     constructor() { }
     get templateId() {
         return LoadMoreRenderer.ID;
@@ -738,14 +738,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(
-                5909,
+                5956,
                 "Show {0} More: {1}",
                 stackFrames.length,
                 stackFrames[0].source.origin
             ));
         }
         else {
-            data.label.textContent = ( localize(5910, "Show {0} More Stack Frames", stackFrames.length));
+            data.label.textContent = ( localize(5957, "Show {0} More Stack Frames", stackFrames.length));
         }
     }
     renderCompressedElements(node, index, templateData, height) {
@@ -788,7 +788,7 @@ function stoppedText(stoppedDetails) {
 }
 function stoppedDescription(stoppedDetails) {
     return stoppedDetails.description ||
-        (stoppedDetails.reason ? ( localize(5911, "Paused on {0}", stoppedDetails.reason)) : ( localize(5912, "Paused")));
+        (stoppedDetails.reason ? ( localize(5958, "Paused on {0}", stoppedDetails.reason)) : ( localize(5959, "Paused")));
 }
 function isDebugModel(obj) {
     return typeof obj.getSessions === 'function';
@@ -878,7 +878,7 @@ class CallStackDataSource {
 }
 class CallStackAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(5913, "Debug Call Stack"));
+        return ( localize(5960, "Debug Call Stack"));
     }
     getWidgetRole() {
         return 'treegrid';
@@ -888,11 +888,11 @@ class CallStackAccessibilityProvider {
     }
     getAriaLabel(element) {
         if (element instanceof Thread) {
-            return ( localize(5914, "Thread {0} {1}", element.name, element.stateLabel));
+            return ( localize(5961, "Thread {0} {1}", element.name, element.stateLabel));
         }
         if (element instanceof StackFrame) {
             return ( localize(
-                5915,
+                5962,
                 "Stack Frame {0}, line {1}, {2}",
                 element.name,
                 element.range.startLineNumber,
@@ -901,14 +901,14 @@ class CallStackAccessibilityProvider {
         }
         if (isDebugSession(element)) {
             const thread = element.getAllThreads().find(t => t.stopped);
-            const state = thread ? thread.stateLabel : ( localize(5904, "Running"));
-            return ( localize(5916, "Session {0} {1}", element.getLabel(), state));
+            const state = thread ? thread.stateLabel : ( localize(5951, "Running"));
+            return ( localize(5963, "Session {0} {1}", element.getLabel(), state));
         }
         if (typeof element === 'string') {
             return element;
         }
         if (element instanceof Array) {
-            return ( localize(5910, "Show {0} More Stack Frames", element.length));
+            return ( localize(5957, "Show {0} More Stack Frames", element.length));
         }
         return LoadMoreRenderer.LABEL;
     }
@@ -936,10 +936,10 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'callStack.collapse',
             viewId: CALLSTACK_VIEW_ID,
-            title: ( localize(5917, "Collapse All")),
+            title: ( localize(5964, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
-            precondition: ( (CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(State.Stopped)))),
+            precondition: ( (CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(2 )))),
             menu: {
                 id: MenuId.ViewTitle,
                 order: 10,