@codingame/monaco-vscode-debug-service-override 11.1.2 → 12.0.0

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { $ as $$1, append } 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';
@@ -11,7 +12,7 @@ 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 { localize } from 'vscode/vscode/vs/nls';
-import { createAndFillInContextMenuActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem, createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { getContextMenuActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem, getActionBarActions } 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';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -38,15 +39,15 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { ViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewPane, ViewAction } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 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 '@codingame/monaco-vscode-debug-notebook-common/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 { 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-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/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, isFrameDeemphasized, CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+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 '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 '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { StackFrame, Thread, ThreadAndSessionIds } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { isSessionAttach } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
@@ -88,9 +89,7 @@ function getContextForContributedActions(element) {
         if (element.source.inMemory) {
             return element.source.raw.path || element.source.reference || element.source.name;
         }
-        return (
-             (element.source.uri.toString())
-        );
+        return ( element.source.uri.toString());
     }
     if (element instanceof Thread) {
         return element.threadId;
@@ -103,7 +102,7 @@ function getContextForContributedActions(element) {
 function getSpecificSourceName(stackFrame) {
     let callStack = stackFrame.thread.getStaleCallStack();
     callStack = callStack.length > 0 ? callStack : stackFrame.thread.getCallStack();
-    const otherSources = ( (callStack.map(sf => sf.source))).filter(s => s !== stackFrame.source);
+    const otherSources = ( callStack.map(sf => sf.source)).filter(s => s !== stackFrame.source);
     let suffixLength = 0;
     otherSources.forEach(s => {
         if (s.name === stackFrame.source.name) {
@@ -131,9 +130,9 @@ let CallStackView = class CallStackView extends ViewPane {
         this.needsRefresh = false;
         this.ignoreSelectionChangedEvent = false;
         this.ignoreFocusStackFrameEvent = false;
-        this.autoExpandedSessions = ( (new Set()));
+        this.autoExpandedSessions = ( new Set());
         this.selectionNeedsUpdate = false;
-        this.onCallStackChangeScheduler = this._register(( (new RunOnceScheduler(async () => {
+        this.onCallStackChangeScheduler = this._register(( new RunOnceScheduler(async () => {
             const sessions = this.debugService.getModel().getSessions();
             if (sessions.length === 0) {
                 this.autoExpandedSessions.clear();
@@ -146,8 +145,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 === 3 ) {
-                this.stateMessageLabel.textContent = ( localize(5932, "Running"));
+            else if (sessions.length === 1 && sessions[0].state === State.Running) {
+                this.stateMessageLabel.textContent = ( localize(5052, "Running"));
                 this.stateMessageLabelHover.update(sessions[0].getLabel());
                 this.stateMessageLabel.classList.remove('exception');
                 this.stateMessage.hidden = false;
@@ -160,9 +159,9 @@ let CallStackView = class CallStackView extends ViewPane {
             this.dataSource.deemphasizedStackFramesToShow = [];
             await this.tree.updateChildren();
             try {
-                const toExpand = ( (new Set()));
+                const toExpand = ( new Set());
                 sessions.forEach(s => {
-                    if (s.parentSession && !( (this.autoExpandedSessions.has(s.parentSession)))) {
+                    if (s.parentSession && !( this.autoExpandedSessions.has(s.parentSession))) {
                         toExpand.add(s.parentSession);
                     }
                 });
@@ -177,7 +176,7 @@ let CallStackView = class CallStackView extends ViewPane {
                 this.selectionNeedsUpdate = false;
                 await this.updateTreeSelection();
             }
-        }, 50))));
+        }, 50)));
     }
     renderHeaderTitle(container) {
         super.renderHeaderTitle(container, this.options.title);
@@ -191,16 +190,16 @@ let CallStackView = class CallStackView extends ViewPane {
         this.element.classList.add('debug-pane');
         container.classList.add('debug-call-stack');
         const treeContainer = renderViewTree(container);
-        this.dataSource = ( (new CallStackDataSource(this.debugService)));
-        this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'CallStackView', treeContainer, ( (new CallStackDelegate())), ( (new CallStackCompressionDelegate(this.debugService))), [
+        this.dataSource = ( new CallStackDataSource(this.debugService));
+        this.tree = this.instantiationService.createInstance((WorkbenchCompressibleAsyncDataTree), 'CallStackView', treeContainer, ( new CallStackDelegate()), ( new CallStackCompressionDelegate(this.debugService)), [
             this.instantiationService.createInstance(SessionsRenderer),
             this.instantiationService.createInstance(ThreadsRenderer),
             this.instantiationService.createInstance(StackFramesRenderer),
             this.instantiationService.createInstance(ErrorsRenderer),
-            ( (new LoadMoreRenderer())),
-            ( (new ShowMoreRenderer()))
+            ( new LoadMoreRenderer()),
+            ( new ShowMoreRenderer())
         ], this.dataSource, {
-            accessibilityProvider: ( (new CallStackAccessibilityProvider())),
+            accessibilityProvider: ( new CallStackAccessibilityProvider()),
             compressionEnabled: true,
             autoExpandSingleChildren: true,
             identityProvider: {
@@ -228,7 +227,7 @@ let CallStackView = class CallStackView extends ViewPane {
                     if (e instanceof ThreadAndSessionIds) {
                         return LoadMoreRenderer.LABEL;
                     }
-                    return ( localize(5933, "Show More Stack Frames"));
+                    return localize(5053, "Show More Stack Frames");
                 },
                 getCompressedNodeKeyboardNavigationLabel: (e) => {
                     const firstItem = e[0];
@@ -241,6 +240,7 @@ let CallStackView = class CallStackView extends ViewPane {
             expandOnlyOnTwistieClick: true,
             overrideStyles: this.getLocationBasedColors().listOverrideStyles
         });
+        CONTEXT_CALLSTACK_FOCUSED.bindTo(this.tree.contextKeyService);
         this.tree.setInput(this.debugService.getModel());
         this._register(this.tree);
         this._register(this.tree.onDidOpen(async (e) => {
@@ -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 === 2 ) {
+        if (this.debugService.state === State.Stopped) {
             this.onCallStackChangeScheduler.schedule(0);
         }
         this._register(this.onDidChangeBodyVisibility(visible => {
@@ -402,12 +402,9 @@ let CallStackView = class CallStackView extends ViewPane {
         else if (element instanceof StackFrame) {
             overlay = getStackFrameContextOverlay(element);
         }
-        const primary = [];
-        const secondary = [];
-        const result = { primary, secondary };
         const contextKeyService = this.contextKeyService.createOverlay(overlay);
         const menu = this.menuService.getMenuActions(MenuId.DebugCallStackContext, contextKeyService, { arg: getContextForContributedActions(element), shouldForwardArgs: true });
-        createAndFillInContextMenuActions(menu, result, 'inline');
+        const result = getContextMenuActions(menu, 'inline');
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
             getActions: () => result.secondary,
@@ -415,25 +412,25 @@ let CallStackView = class CallStackView extends ViewPane {
         });
     }
 };
-CallStackView = ( (__decorate([
-    ( (__param(1, IContextMenuService))),
-    ( (__param(2, IDebugService))),
-    ( (__param(3, IKeybindingService))),
-    ( (__param(4, IInstantiationService))),
-    ( (__param(5, IViewDescriptorService))),
-    ( (__param(6, IConfigurationService))),
-    ( (__param(7, IContextKeyService))),
-    ( (__param(8, IOpenerService))),
-    ( (__param(9, IThemeService))),
-    ( (__param(10, ITelemetryService))),
-    ( (__param(11, IHoverService))),
-    ( (__param(12, IMenuService)))
-], CallStackView)));
+CallStackView = ( __decorate([
+    ( __param(1, IContextMenuService)),
+    ( __param(2, IDebugService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IViewDescriptorService)),
+    ( __param(6, IConfigurationService)),
+    ( __param(7, IContextKeyService)),
+    ( __param(8, IOpenerService)),
+    ( __param(9, IThemeService)),
+    ( __param(10, ITelemetryService)),
+    ( __param(11, IHoverService)),
+    ( __param(12, IMenuService))
+], CallStackView));
 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 === 2 ],
+        [CONTEXT_CALLSTACK_ITEM_STOPPED.key, session.state === State.Stopped],
         [CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD.key, session.getAllThreads().length === 1],
     ];
 }
@@ -454,10 +451,10 @@ let SessionsRenderer = class SessionsRenderer {
         append(session, $(ThemeIcon.asCSSSelector(callstackViewSession)));
         const name = append(session, $('.name'));
         const stateLabel = append(session, $('span.state.label.monaco-count-badge.long'));
-        const templateDisposable = ( (new DisposableStore()));
-        const label = templateDisposable.add(( (new HighlightedLabel(name))));
-        const stopActionViewItemDisposables = templateDisposable.add(( (new DisposableStore())));
-        const actionBar = templateDisposable.add(( (new ActionBar(session, {
+        const templateDisposable = ( new DisposableStore());
+        const label = templateDisposable.add(( new HighlightedLabel(name)));
+        const stopActionViewItemDisposables = templateDisposable.add(( new DisposableStore()));
+        const actionBar = templateDisposable.add(( new ActionBar(session, {
             actionViewItemProvider: (action, options) => {
                 if ((action.id === STOP_ID || action.id === DISCONNECT_ID) && action instanceof MenuItemAction) {
                     stopActionViewItemDisposables.clear();
@@ -474,8 +471,8 @@ let SessionsRenderer = class SessionsRenderer {
                 }
                 return undefined;
             }
-        }))));
-        const elementDisposable = templateDisposable.add(( (new DisposableStore())));
+        })));
+        const elementDisposable = templateDisposable.add(( new DisposableStore()));
         return { session, name, stateLabel, label, actionBar, elementDisposable, templateDisposable };
     }
     renderElement(element, _, data) {
@@ -487,7 +484,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(5934, "Session"))));
+        const sessionHover = data.elementDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.session, ( localize(5054, "Session"))));
         data.label.set(session.getLabel(), matches);
         const stoppedDetails = session.getStoppedDetails();
         const thread = session.getAllThreads().find(t => t.stopped);
@@ -495,10 +492,7 @@ let SessionsRenderer = class SessionsRenderer {
         const menu = data.elementDisposable.add(this.menuService.createMenu(MenuId.DebugCallStackContext, contextKeyService));
         const setupActionBar = () => {
             data.actionBar.clear();
-            const primary = [];
-            const secondary = [];
-            const result = { primary, secondary };
-            createAndFillInActionBarActions(menu, { arg: getContextForContributedActions(session), shouldForwardArgs: true }, result, 'inline');
+            const { primary } = getActionBarActions(menu.getActions({ arg: getContextForContributedActions(session), shouldForwardArgs: true }), 'inline');
             data.actionBar.push(primary, { icon: true, label: false });
             data.actionBar.context = getContext(session);
         };
@@ -516,7 +510,7 @@ let SessionsRenderer = class SessionsRenderer {
             data.stateLabel.classList.toggle('exception', thread.stoppedDetails.reason === 'exception');
         }
         else {
-            data.stateLabel.textContent = ( localize(5932, "Running"));
+            data.stateLabel.textContent = ( localize(5052, "Running"));
             data.stateLabel.classList.remove('exception');
         }
     }
@@ -530,12 +524,12 @@ let SessionsRenderer = class SessionsRenderer {
         templateData.elementDisposable.clear();
     }
 };
-SessionsRenderer = SessionsRenderer_1 = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IHoverService))),
-    ( (__param(3, IMenuService)))
-], SessionsRenderer)));
+SessionsRenderer = SessionsRenderer_1 = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IContextKeyService)),
+    ( __param(2, IHoverService)),
+    ( __param(3, IMenuService))
+], SessionsRenderer));
 function getThreadContextOverlay(thread) {
     return [
         [CONTEXT_CALLSTACK_ITEM_TYPE.key, 'thread'],
@@ -557,10 +551,10 @@ let ThreadsRenderer = class ThreadsRenderer {
         const thread = append(container, $('.thread'));
         const name = append(thread, $('.name'));
         const stateLabel = append(thread, $('span.state.label.monaco-count-badge.long'));
-        const templateDisposable = ( (new DisposableStore()));
-        const label = templateDisposable.add(( (new HighlightedLabel(name))));
-        const actionBar = templateDisposable.add(( (new ActionBar(thread))));
-        const elementDisposable = templateDisposable.add(( (new DisposableStore())));
+        const templateDisposable = ( new DisposableStore());
+        const label = templateDisposable.add(( new HighlightedLabel(name)));
+        const actionBar = templateDisposable.add(( new ActionBar(thread)));
+        const elementDisposable = templateDisposable.add(( new DisposableStore()));
         return { thread, name, stateLabel, label, actionBar, elementDisposable, templateDisposable };
     }
     renderElement(element, _index, data) {
@@ -573,10 +567,7 @@ let ThreadsRenderer = class ThreadsRenderer {
         const menu = data.elementDisposable.add(this.menuService.createMenu(MenuId.DebugCallStackContext, contextKeyService));
         const setupActionBar = () => {
             data.actionBar.clear();
-            const primary = [];
-            const secondary = [];
-            const result = { primary, secondary };
-            createAndFillInActionBarActions(menu, { arg: getContextForContributedActions(thread), shouldForwardArgs: true }, result, 'inline');
+            const { primary } = getActionBarActions(menu.getActions({ arg: getContextForContributedActions(thread), shouldForwardArgs: true }), 'inline');
             data.actionBar.push(primary, { icon: true, label: false });
             data.actionBar.context = getContext(thread);
         };
@@ -584,7 +575,7 @@ let ThreadsRenderer = class ThreadsRenderer {
         setupActionBar();
     }
     renderCompressedElements(_node, _index, _templateData, _height) {
-        throw ( (new Error('Method not implemented.')));
+        throw ( new Error('Method not implemented.'));
     }
     disposeElement(_element, _index, templateData) {
         templateData.elementDisposable.clear();
@@ -593,11 +584,11 @@ let ThreadsRenderer = class ThreadsRenderer {
         templateData.templateDisposable.dispose();
     }
 };
-ThreadsRenderer = ThreadsRenderer_1 = ( (__decorate([
-    ( (__param(0, IContextKeyService))),
-    ( (__param(1, IHoverService))),
-    ( (__param(2, IMenuService)))
-], ThreadsRenderer)));
+ThreadsRenderer = ThreadsRenderer_1 = ( __decorate([
+    ( __param(0, IContextKeyService)),
+    ( __param(1, IHoverService)),
+    ( __param(2, IMenuService))
+], ThreadsRenderer));
 function getStackFrameContextOverlay(stackFrame) {
     return [
         [CONTEXT_CALLSTACK_ITEM_TYPE.key, 'stackFrame'],
@@ -622,9 +613,9 @@ let StackFramesRenderer = class StackFramesRenderer {
         const fileName = append(file, $('span.file-name'));
         const wrapper = append(file, $('span.line-number-wrapper'));
         const lineNumber = append(wrapper, $('span.line-number.monaco-count-badge'));
-        const templateDisposable = ( (new DisposableStore()));
-        const label = templateDisposable.add(( (new HighlightedLabel(labelDiv))));
-        const actionBar = templateDisposable.add(( (new ActionBar(stackFrame))));
+        const templateDisposable = ( new DisposableStore());
+        const label = templateDisposable.add(( new HighlightedLabel(labelDiv)));
+        const actionBar = templateDisposable.add(( new ActionBar(stackFrame)));
         return { file, fileName, label, lineNumber, stackFrame, actionBar, templateDisposable };
     }
     renderElement(element, index, data) {
@@ -652,29 +643,29 @@ let StackFramesRenderer = class StackFramesRenderer {
         }
         data.actionBar.clear();
         if (hasActions) {
-            const action = ( (new Action('debug.callStack.restartFrame', ( localize(5935, "Restart Frame")), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
+            const action = ( new Action('debug.callStack.restartFrame', ( localize(5055, "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.')));
+        throw ( new Error('Method not implemented.'));
     }
     disposeTemplate(templateData) {
         templateData.actionBar.dispose();
     }
 };
-StackFramesRenderer = StackFramesRenderer_1 = ( (__decorate([
-    ( (__param(0, IHoverService))),
-    ( (__param(1, ILabelService))),
-    ( (__param(2, INotificationService)))
-], StackFramesRenderer)));
+StackFramesRenderer = StackFramesRenderer_1 = ( __decorate([
+    ( __param(0, IHoverService)),
+    ( __param(1, ILabelService)),
+    ( __param(2, INotificationService))
+], StackFramesRenderer));
 let ErrorsRenderer = class ErrorsRenderer {
     static { ErrorsRenderer_1 = this; }
     static { this.ID = 'error'; }
@@ -686,7 +677,7 @@ let ErrorsRenderer = class ErrorsRenderer {
     }
     renderTemplate(container) {
         const label = append(container, $('.error'));
-        return { label, templateDisposable: ( (new DisposableStore())) };
+        return { label, templateDisposable: ( new DisposableStore()) };
     }
     renderElement(element, index, data) {
         const error = element.element;
@@ -694,17 +685,17 @@ let ErrorsRenderer = class ErrorsRenderer {
         data.templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.label, error));
     }
     renderCompressedElements(node, index, templateData, height) {
-        throw ( (new Error('Method not implemented.')));
+        throw ( new Error('Method not implemented.'));
     }
     disposeTemplate(templateData) {
     }
 };
-ErrorsRenderer = ErrorsRenderer_1 = ( (__decorate([
-    ( (__param(0, IHoverService)))
-], ErrorsRenderer)));
+ErrorsRenderer = ErrorsRenderer_1 = ( __decorate([
+    ( __param(0, IHoverService))
+], ErrorsRenderer));
 class LoadMoreRenderer {
     static { this.ID = 'loadMore'; }
-    static { this.LABEL = ( localize(5936, "Load More Stack Frames")); }
+    static { this.LABEL = ( localize(5056, "Load More Stack Frames")); }
     constructor() { }
     get templateId() {
         return LoadMoreRenderer.ID;
@@ -718,7 +709,7 @@ class LoadMoreRenderer {
         data.label.textContent = LoadMoreRenderer.LABEL;
     }
     renderCompressedElements(node, index, templateData, height) {
-        throw ( (new Error('Method not implemented.')));
+        throw ( new Error('Method not implemented.'));
     }
     disposeTemplate(templateData) {
     }
@@ -738,18 +729,18 @@ 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(
-                5937,
+                5057,
                 "Show {0} More: {1}",
                 stackFrames.length,
                 stackFrames[0].source.origin
             ));
         }
         else {
-            data.label.textContent = ( localize(5938, "Show {0} More Stack Frames", stackFrames.length));
+            data.label.textContent = ( localize(5058, "Show {0} More Stack Frames", stackFrames.length));
         }
     }
     renderCompressedElements(node, index, templateData, height) {
-        throw ( (new Error('Method not implemented.')));
+        throw ( new Error('Method not implemented.'));
     }
     disposeTemplate(templateData) {
     }
@@ -788,7 +779,7 @@ function stoppedText(stoppedDetails) {
 }
 function stoppedDescription(stoppedDetails) {
     return stoppedDetails.description ||
-        (stoppedDetails.reason ? ( localize(5939, "Paused on {0}", stoppedDetails.reason)) : ( localize(5940, "Paused")));
+        (stoppedDetails.reason ? ( localize(5059, "Paused on {0}", stoppedDetails.reason)) : ( localize(5060, "Paused")));
 }
 function isDebugModel(obj) {
     return typeof obj.getSessions === 'function';
@@ -871,14 +862,14 @@ class CallStackDataSource {
             callStack = callStack.concat([thread.stoppedDetails.framesErrorMessage]);
         }
         if (!thread.reachedEndOfCallStack && thread.stoppedDetails) {
-            callStack = callStack.concat([( (new ThreadAndSessionIds(thread.session.getId(), thread.threadId)))]);
+            callStack = callStack.concat([( new ThreadAndSessionIds(thread.session.getId(), thread.threadId))]);
         }
         return callStack;
     }
 }
 class CallStackAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(5941, "Debug Call Stack"));
+        return localize(5061, "Debug Call Stack");
     }
     getWidgetRole() {
         return 'treegrid';
@@ -888,27 +879,27 @@ class CallStackAccessibilityProvider {
     }
     getAriaLabel(element) {
         if (element instanceof Thread) {
-            return ( localize(5942, "Thread {0} {1}", element.name, element.stateLabel));
+            return localize(5062, "Thread {0} {1}", element.name, element.stateLabel);
         }
         if (element instanceof StackFrame) {
-            return ( localize(
-                5943,
+            return localize(
+                5063,
                 "Stack Frame {0}, line {1}, {2}",
                 element.name,
                 element.range.startLineNumber,
                 getSpecificSourceName(element)
-            ));
+            );
         }
         if (isDebugSession(element)) {
             const thread = element.getAllThreads().find(t => t.stopped);
-            const state = thread ? thread.stateLabel : ( localize(5932, "Running"));
-            return ( localize(5944, "Session {0} {1}", element.getLabel(), state));
+            const state = thread ? thread.stateLabel : ( localize(5052, "Running"));
+            return localize(5064, "Session {0} {1}", element.getLabel(), state);
         }
         if (typeof element === 'string') {
             return element;
         }
         if (element instanceof Array) {
-            return ( localize(5938, "Show {0} More Stack Frames", element.length));
+            return localize(5058, "Show {0} More Stack Frames", element.length);
         }
         return LoadMoreRenderer.LABEL;
     }
@@ -923,7 +914,7 @@ class CallStackCompressionDelegate {
                 return false;
             }
             const sessions = this.debugService.getModel().getSessions();
-            if (( (sessions.some(s => s.parentSession === stat && s.compact)))) {
+            if (( sessions.some(s => s.parentSession === stat && s.compact))) {
                 return false;
             }
             return true;
@@ -936,15 +927,15 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'callStack.collapse',
             viewId: CALLSTACK_VIEW_ID,
-            title: ( localize(5945, "Collapse All")),
+            title: ( localize(5065, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
-            precondition: ( (CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(2 )))),
+            precondition: ( CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(State.Stopped))),
             menu: {
                 id: MenuId.ViewTitle,
                 order: 10,
                 group: 'navigation',
-                when: ( (ContextKeyExpr.equals('view', CALLSTACK_VIEW_ID)))
+                when: ( ContextKeyExpr.equals('view', CALLSTACK_VIEW_ID))
             }
         });
     }
@@ -960,29 +951,14 @@ function registerCallStackInlineMenuItem(id, title, icon, when, order, precondit
         command: { id, title, icon, precondition }
     });
 }
-const threadOrSessionWithOneThread = ( (ContextKeyExpr.or(
-     (CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread')),
-     (ContextKeyExpr.and(
-         (CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session')),
-        CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD
-    ))
-)));
-registerCallStackInlineMenuItem(PAUSE_ID, PAUSE_LABEL, debugPause, ( (ContextKeyExpr.and(
-    threadOrSessionWithOneThread,
-     (CONTEXT_CALLSTACK_ITEM_STOPPED.toNegated())
-))), 10, ( (CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG.toNegated())));
-registerCallStackInlineMenuItem(CONTINUE_ID, CONTINUE_LABEL, debugContinue, ( (ContextKeyExpr.and(threadOrSessionWithOneThread, CONTEXT_CALLSTACK_ITEM_STOPPED))), 10);
+const threadOrSessionWithOneThread = ( ContextKeyExpr.or(( CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread')), ( ContextKeyExpr.and(( CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session')), CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD))));
+registerCallStackInlineMenuItem(PAUSE_ID, PAUSE_LABEL, debugPause, ( ContextKeyExpr.and(threadOrSessionWithOneThread, ( CONTEXT_CALLSTACK_ITEM_STOPPED.toNegated()))), 10, ( CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG.toNegated()));
+registerCallStackInlineMenuItem(CONTINUE_ID, CONTINUE_LABEL, debugContinue, ( ContextKeyExpr.and(threadOrSessionWithOneThread, CONTEXT_CALLSTACK_ITEM_STOPPED)), 10);
 registerCallStackInlineMenuItem(STEP_OVER_ID, STEP_OVER_LABEL, debugStepOver, threadOrSessionWithOneThread, 20, CONTEXT_CALLSTACK_ITEM_STOPPED);
 registerCallStackInlineMenuItem(STEP_INTO_ID, STEP_INTO_LABEL, debugStepInto, threadOrSessionWithOneThread, 30, CONTEXT_CALLSTACK_ITEM_STOPPED);
 registerCallStackInlineMenuItem(STEP_OUT_ID, STEP_OUT_LABEL, debugStepOut, threadOrSessionWithOneThread, 40, CONTEXT_CALLSTACK_ITEM_STOPPED);
-registerCallStackInlineMenuItem(RESTART_SESSION_ID, RESTART_LABEL, debugRestart, ( (CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'))), 50);
-registerCallStackInlineMenuItem(STOP_ID, STOP_LABEL, debugStop, ( (ContextKeyExpr.and(
-     (CONTEXT_CALLSTACK_SESSION_IS_ATTACH.toNegated()),
-     (CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'))
-))), 60);
-registerCallStackInlineMenuItem(DISCONNECT_ID, DISCONNECT_LABEL, debugDisconnect, ( (ContextKeyExpr.and(
-    CONTEXT_CALLSTACK_SESSION_IS_ATTACH,
-     (CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'))
-))), 60);
+registerCallStackInlineMenuItem(RESTART_SESSION_ID, RESTART_LABEL, debugRestart, ( CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session')), 50);
+registerCallStackInlineMenuItem(STOP_ID, STOP_LABEL, debugStop, ( ContextKeyExpr.and(( CONTEXT_CALLSTACK_SESSION_IS_ATTACH.toNegated()), ( CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session')))), 60);
+registerCallStackInlineMenuItem(DISCONNECT_ID, DISCONNECT_LABEL, debugDisconnect, ( ContextKeyExpr.and(CONTEXT_CALLSTACK_SESSION_IS_ATTACH, ( CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session')))), 60);
 
 export { CallStackView, getContext, getContextForContributedActions, getSpecificSourceName };

package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.d.ts

@@ -0,0 +1 @@
+