@codingame/monaco-vscode-debug-service-override 15.0.3 → 16.0.1

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

@@ -30,9 +30,9 @@ var TaskRunResult;
     TaskRunResult[TaskRunResult["Success"] = 1] = "Success";
 })(TaskRunResult || (TaskRunResult = {}));
 const DEBUG_TASK_ERROR_CHOICE_KEY = 'debug.taskerrorchoice';
-const ABORT_LABEL = ( localize(5637, "Abort"));
-const DEBUG_ANYWAY_LABEL = ( localize(5638, "&&Debug Anyway"));
-const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(5639, "Debug Anyway"));
+const ABORT_LABEL = ( localize(5771, "Abort"));
+const DEBUG_ANYWAY_LABEL = ( localize(5772, "&&Debug Anyway"));
+const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(5773, "Debug Anyway"));
 let DebugTaskRunner = class DebugTaskRunner {
     constructor(taskService, markerService, configurationService, viewsService, dialogService, storageService, commandService, progressService) {
         this.taskService = taskService;
@@ -74,17 +74,17 @@ let DebugTaskRunner = class DebugTaskRunner {
             }
             const taskLabel = typeof taskId === 'string' ? taskId : taskId ? taskId.name : '';
             const message = errorCount > 1
-                ? ( localize(5640, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
+                ? ( localize(5774, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
                 : errorCount === 1
-                    ? ( localize(5641, "Error exists after running preLaunchTask '{0}'.", taskLabel))
+                    ? ( localize(5775, "Error exists after running preLaunchTask '{0}'.", taskLabel))
                     : taskSummary && typeof taskSummary.exitCode === 'number'
                         ? ( localize(
-                5642,
+                5776,
                 "The preLaunchTask '{0}' terminated with exit code {1}.",
                 taskLabel,
                 taskSummary.exitCode
             ))
-                        : ( localize(5643, "The preLaunchTask '{0}' terminated.", taskLabel));
+                        : ( localize(5777, "The preLaunchTask '{0}' terminated.", taskLabel));
             let DebugChoice;
             (function (DebugChoice) {
                 DebugChoice[DebugChoice["DebugAnyway"] = 1] = "DebugAnyway";
@@ -100,7 +100,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.DebugAnyway
                     },
                     {
-                        label: ( localize(5644, "&&Show Errors")),
+                        label: ( localize(5778, "&&Show Errors")),
                         run: () => DebugChoice.ShowErrors
                     }
                 ],
@@ -109,7 +109,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     run: () => DebugChoice.Cancel
                 },
                 checkbox: {
-                    label: ( localize(5645, "Remember my choice in user settings")),
+                    label: ( localize(5779, "Remember my choice in user settings")),
                 }
             });
             const debugAnyway = result === DebugChoice.DebugAnyway;
@@ -145,7 +145,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     message: err.message,
                     buttons: [
                         {
-                            label: ( localize(5638, "&&Debug Anyway")),
+                            label: ( localize(5772, "&&Debug Anyway")),
                             run: () => DebugChoice.DebugAnyway
                         },
                         {
@@ -157,7 +157,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.Cancel
                     },
                     checkbox: {
-                        label: ( localize(5646, "Remember my choice for this task"))
+                        label: ( localize(5780, "Remember my choice for this task"))
                     }
                 });
                 choice = result;
@@ -178,7 +178,7 @@ let DebugTaskRunner = class DebugTaskRunner {
         }
         if (!root) {
             return Promise.reject(( new Error(( localize(
-                5647,
+                5781,
                 "Task '{0}' can not be referenced from a launch configuration that is in a different workspace folder.",
                 typeof taskId === 'string' ? taskId : taskId.type
             )))));
@@ -186,8 +186,8 @@ let DebugTaskRunner = class DebugTaskRunner {
         const task = await this.taskService.getTask(root, taskId);
         if (!task) {
             const errorMessage = typeof taskId === 'string'
-                ? ( localize(5648, "Could not find the task '{0}'.", taskId))
-                : ( localize(5649, "Could not find the specified task."));
+                ? ( localize(5782, "Could not find the task '{0}'.", taskId))
+                : ( localize(5783, "Could not find the specified task."));
             return Promise.reject(createErrorWithActions(errorMessage, [( new Action(
                 DEBUG_CONFIGURE_COMMAND_ID,
                 DEBUG_CONFIGURE_LABEL,
@@ -245,7 +245,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                 store.add(disposableTimeout(() => {
                     if (!taskStarted) {
                         const errorMessage = ( localize(
-                            5650,
+                            5784,
                             "The task '{0}' has not exited and doesn't have a 'problemMatcher' defined. Make sure to define a problem matcher for watch tasks.",
                             typeof taskId === 'string' ? taskId : JSON.stringify(taskId)
                         ));
@@ -256,14 +256,14 @@ let DebugTaskRunner = class DebugTaskRunner {
                 if (!hideSlowPreLaunchWarning) {
                     store.add(disposableTimeout(() => {
                         const message = ( localize(
-                            5651,
+                            5785,
                             "Waiting for preLaunchTask '{0}'...",
                             task.configurationProperties.name
                         ));
                         const buttons = [DEBUG_ANYWAY_LABEL_NO_MEMO, ABORT_LABEL];
                         const canConfigure = task instanceof CustomTask || task instanceof ConfiguringTask;
                         if (canConfigure) {
-                            buttons.splice(1, 0, ( localize(5652, "Configure Task")));
+                            buttons.splice(1, 0, ( localize(5786, "Configure Task")));
                         }
                         this.progressService.withProgress({ location: ProgressLocation.Notification, title: message, buttons }, () => result.catch(() => { }), (choice) => {
                             if (choice === undefined) ;

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

@@ -1,7 +1,7 @@
 import { IActionViewItem } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar";
 import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
-import { IDropdownWithPrimaryActionViewItemOptions } from "@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem";
+import { IDropdownWithPrimaryActionViewItemOptions } from "@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem";
 import { MenuItemAction } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";

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

@@ -14,7 +14,7 @@ import { DisposableStore, MutableDisposable, markAsSingleton, dispose } from '@c
 import { platform, Platform } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
+import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { createActionViewItem, getFlatActionBarActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
@@ -39,16 +39,16 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { Themable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { getTitleBarStyle, TitlebarStyle } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
-import { LayoutSettings, Parts, EditorTabsMode } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
+import { getWindowControlsStyle, WindowControlsStyle } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
+import { LayoutSettings, Parts, EditorTabsMode } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { State, VIEWLET_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED } 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';
 import { FocusSessionActionViewItem } from './debugActionViewItems.js';
-import { debugToolBarBackground, debugToolBarBorder } from '@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common/vscode/vs/workbench/contrib/debug/browser/debugColors';
+import { debugToolBarBackground, debugToolBarBorder } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugColors';
 import { FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID, CONTINUE_ID, CONTINUE_LABEL, PAUSE_ID, PAUSE_LABEL, STOP_LABEL, DISCONNECT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, RESTART_SESSION_ID, RESTART_LABEL, STEP_BACK_ID, REVERSE_CONTINUE_ID, FOCUS_SESSION_LABEL, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_AND_SUSPEND_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { debugGripper, debugContinue, debugPause, debugStop, debugDisconnect, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStepBack, debugReverseContinue } from '@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
-import './media/debugToolBar.css.js';
+import { debugGripper, debugContinue, debugPause, debugStop, debugDisconnect, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStepBack, debugReverseContinue } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import './media/debugToolBar.css';
 
 const DEBUG_TOOLBAR_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_TOOLBAR_Y_KEY = 'debug.actionswidgety';
@@ -68,9 +68,9 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.auxWindowCoordinates = ( new WeakMap());
         this.trackPixelRatioListener = this._register(( new MutableDisposable()));
         this.$el = $('div.debug-toolbar');
-        const customTitleBar = getTitleBarStyle(this.configurationService) === TitlebarStyle.CUSTOM;
-        const controlsOnLeft = customTitleBar && platform === Platform.Mac;
-        const controlsOnRight = customTitleBar && (platform === Platform.Windows || platform === Platform.Linux);
+        const customWindowControls = getWindowControlsStyle(this.configurationService) === WindowControlsStyle.CUSTOM;
+        const controlsOnLeft = customWindowControls && platform === Platform.Mac;
+        const controlsOnRight = customWindowControls && (platform === Platform.Windows || platform === Platform.Linux);
         this.$el.style.transform = `translate(
 			min(
 				max(${controlsOnLeft ? '60px' : '0px'}, calc(-50% + (100vw * var(--x-position)))),
@@ -310,7 +310,7 @@ function createDisconnectMenuItemAction(action, disposables, accessor, options)
     if (!secondary.length) {
         return undefined;
     }
-    const dropdownAction = disposables.add(( new Action('notebook.moreRunActions', ( localize(5653, "More...")), 'codicon-chevron-down', true)));
+    const dropdownAction = disposables.add(( new Action('notebook.moreRunActions', ( localize(5787, "More...")), 'codicon-chevron-down', true)));
     const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', options);
     return item;
 }
@@ -368,8 +368,8 @@ registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, 20, debugStepOver, undef
 registerDebugToolBarItem(STEP_INTO_ID, STEP_INTO_LABEL, 30, debugStepInto, undefined, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugToolBarItem(STEP_OUT_ID, STEP_OUT_LABEL, 40, debugStepOut, undefined, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugToolBarItem(RESTART_SESSION_ID, RESTART_LABEL, 60, debugRestart);
-registerDebugToolBarItem(STEP_BACK_ID, ( localize(5654, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localize(5655, "Reverse")), 55, debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugToolBarItem(STEP_BACK_ID, ( localize(5788, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localize(5789, "Reverse")), 55, debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugToolBarItem(FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, 100, Codicon.listTree, ( ContextKeyExpr.and(CONTEXT_MULTI_SESSION_DEBUG, ( CONTEXT_TOOLBAR_COMMAND_CENTER.negate()))));
 MenuRegistry.appendMenuItem(MenuId.DebugToolBarStop, {
     group: 'navigation',

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

@@ -12,7 +12,7 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
-import { ViewPaneContainer } from "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import './media/debugViewlet.css.js';
+import './media/debugViewlet.css';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { createActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuRegistry, MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -16,13 +16,13 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { ViewPaneContainer, ViewsSubMenu } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer, ViewsSubMenu } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { WorkbenchStateContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { StartDebugActionViewItem, FocusSessionActionViewItem } from './debugActionViewItems.js';
 import { DEBUG_START_COMMAND_ID, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID, DEBUG_START_LABEL, DEBUG_CONFIGURE_LABEL, DEBUG_CONFIGURE_COMMAND_ID, SELECT_AND_START_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { debugConfigure } from '@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { debugConfigure } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { WelcomeView } from './welcomeView.js';
 import { VIEWLET_ID, CONTEXT_DEBUG_UX_KEY, State, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_DEBUG_UX, CONTEXT_DEBUGGERS_AVAILABLE, EDITOR_CONTRIBUTION_ID, REPL_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
@@ -169,10 +169,10 @@ registerAction2(class extends Action2 {
             title: {
                 value: DEBUG_CONFIGURE_LABEL,
                 original: 'Open \'launch.json\'',
-                mnemonicTitle: ( localize(5656, "Open &&Configurations"))
+                mnemonicTitle: ( localize(5790, "Open &&Configurations"))
             },
             metadata: {
-                description: ( localize2(5657, 'Opens the file used to configure how your program is debugged'))
+                description: ( localize2(5791, 'Opens the file used to configure how your program is debugged'))
             },
             f1: true,
             icon: debugConfigure,
@@ -212,7 +212,7 @@ registerAction2(class extends Action2 {
                 const picked = await quickInputService.pick(picks, {
                     activeItem: picks[0],
                     placeHolder: ( localize(
-                        5658,
+                        5792,
                         "Select a workspace folder to create a launch.json file in or add it to the workspace config file"
                     ))
                 });
@@ -236,7 +236,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.toggleReplIgnoreFocus',
-            title: ( localize(5659, "Debug Console")),
+            title: ( localize(5793, "Debug Console")),
             toggled: ( ContextKeyExpr.has(`view.${REPL_VIEW_ID}.visible`)),
             menu: [{
                     id: ViewsSubMenu,
@@ -261,7 +261,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     order: 10,
     command: {
         id: SELECT_AND_START_ID,
-        title: ( localize(5660, "Start Additional Session")),
+        title: ( localize(5794, "Start Additional Session")),
     }
 });
 

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

@@ -38,7 +38,7 @@ import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { EditorPane } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { topStackFrameColor, focusedStackFrameColor } from '@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from '@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { DISASSEMBLY_VIEW_ID, State, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST } 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';
 import { InstructionBreakpoint } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
@@ -57,7 +57,7 @@ const disassemblyNotAvailable = {
     address: 0n,
     instruction: {
         address: '-1',
-        instruction: ( localize(5661, "Disassembly not available."))
+        instruction: ( localize(5795, "Disassembly not available."))
     },
 };
 let DisassemblyView = class DisassemblyView extends EditorPane {
@@ -169,7 +169,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
                 project(row) { return row; }
             },
             {
-                label: ( localize(5662, "instructions")),
+                label: ( localize(5796, "instructions")),
                 tooltip: '',
                 weight: 0.3,
                 templateId: InstructionRenderer.TEMPLATE_ID,
@@ -593,8 +593,8 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
         this._topStackFrameColor = themeService.getColorTheme().getColor(topStackFrameColor);
         this._focusedStackFrameColor = themeService.getColorTheme().getColor(focusedStackFrameColor);
         this._register(themeService.onDidColorThemeChange(e => {
-            this._topStackFrameColor = e.theme.getColor(topStackFrameColor);
-            this._focusedStackFrameColor = e.theme.getColor(focusedStackFrameColor);
+            this._topStackFrameColor = e.getColor(topStackFrameColor);
+            this._focusedStackFrameColor = e.getColor(focusedStackFrameColor);
         }));
     }
     renderTemplate(container) {
@@ -704,7 +704,7 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
             };
             this.editorService.openEditor({
                 resource: sourceURI,
-                description: ( localize(5663, "from disassembly")),
+                description: ( localize(5797, "from disassembly")),
                 options: {
                     preserveFocus: false,
                     selection: selection,
@@ -739,18 +739,18 @@ InstructionRenderer = InstructionRenderer_1 = ( __decorate([
 ], InstructionRenderer));
 class AccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(5664, "Disassembly View");
+        return localize(5798, "Disassembly View");
     }
     getAriaLabel(element) {
         let label = '';
         const instruction = element.instruction;
         if (instruction.address !== '-1') {
-            label += `${( localize(5665, "Address"))}: ${instruction.address}`;
+            label += `${( localize(5799, "Address"))}: ${instruction.address}`;
         }
         if (instruction.instructionBytes) {
-            label += `, ${( localize(5666, "Bytes"))}: ${instruction.instructionBytes}`;
+            label += `, ${( localize(5800, "Bytes"))}: ${instruction.instructionBytes}`;
         }
-        label += `, ${( localize(5667, "Instruction"))}: ${instruction.instruction}`;
+        label += `, ${( localize(5801, "Instruction"))}: ${instruction.instruction}`;
         return label;
     }
 }

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

@@ -9,7 +9,7 @@ import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
-import { IViewletViewOptions } from "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
+import { IViewletViewOptions } from "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";

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

@@ -563,7 +563,7 @@ class LoadedScriptsRenderer {
             options.fileKind = FileKind.ROOT_FOLDER;
         }
         else if (element instanceof SessionTreeItem) {
-            options.title = ( localize(5679, "Debug Session"));
+            options.title = ( localize(5813, "Debug Session"));
             options.hideIcon = true;
         }
         else if (element instanceof BaseTreeItem) {
@@ -585,20 +585,20 @@ class LoadedScriptsRenderer {
 }
 class LoadedSciptsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(5680, "Debug Loaded Scripts");
+        return localize(5814, "Debug Loaded Scripts");
     }
     getAriaLabel(element) {
         if (element instanceof RootFolderTreeItem) {
-            return localize(5681, "Workspace folder {0}, loaded script, debug", element.getLabel());
+            return localize(5815, "Workspace folder {0}, loaded script, debug", element.getLabel());
         }
         if (element instanceof SessionTreeItem) {
-            return localize(5682, "Session {0}, loaded script, debug", element.getLabel());
+            return localize(5816, "Session {0}, loaded script, debug", element.getLabel());
         }
         if (element.hasChildren()) {
-            return localize(5683, "Folder {0}, loaded script, debug", element.getLabel());
+            return localize(5817, "Folder {0}, loaded script, debug", element.getLabel());
         }
         else {
-            return localize(5684, "{0}, loaded script, debug", element.getLabel());
+            return localize(5818, "{0}, loaded script, debug", element.getLabel());
         }
     }
 }
@@ -625,7 +625,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'loadedScripts.collapse',
             viewId: LOADED_SCRIPTS_VIEW_ID,
-            title: ( localize(5685, "Collapse All")),
+            title: ( localize(5819, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {

package/vscode/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css

@@ -0,0 +1,112 @@
+.codicon-debug-hint {
+	cursor: pointer;
+}
+.codicon-debug-hint:not([class*='codicon-debug-breakpoint']):not([class*='codicon-debug-stackframe']) {
+	opacity: 0.4 !important;
+}
+.inline-breakpoint-widget.codicon {
+	display: flex !important;
+	align-items: center;
+}
+.inline-breakpoint-widget.codicon-debug-breakpoint-disabled {
+	opacity: 0.7;
+}
+.monaco-editor .inline-breakpoint-widget.line-start {
+	left: -8px !important;
+}
+.monaco-editor .debug-breakpoint-placeholder {
+	width: 0.9em;
+	display: inline-flex;
+	vertical-align: middle;
+	margin-top: -1px;
+}
+.codicon-debug-breakpoint-conditional.codicon-debug-stackframe-focused::after,
+.codicon-debug-breakpoint-conditional.codicon-debug-stackframe::after,
+.codicon-debug-breakpoint.codicon-debug-stackframe-focused::after,
+.codicon-debug-breakpoint.codicon-debug-stackframe::after {
+	content: var(--vscode-icon-debug-stackframe-dot-content);
+	font-family: var(--vscode-icon-debug-stackframe-dot-font-family);
+	position: absolute;
+}
+.monaco-editor .debug-top-stack-frame-column {
+	font: normal normal normal 16px/1 codicon;
+	text-rendering: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	margin-left: 0;
+	margin-right: 4px;
+	margin-top: -1px;
+	align-items: center;
+	width: 0.9em;
+	display: inline-flex;
+	vertical-align: middle;
+}
+.debug-var-hover-pre {
+	margin: 0;
+}
+.debug-var-hover-pre span {
+	display: inline !important;
+}
+.monaco-editor .debug-top-stack-frame-column.start-of-line {
+	position: absolute;
+	top: 50%;
+	transform: translate(-17px, -50%);
+	margin-top: 0px;
+}
+.monaco-editor .inline-breakpoint-widget {
+	cursor: pointer;
+}
+.monaco-workbench .debug-view-content .monaco-list-row .monaco-tl-contents {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.monaco-workbench .monaco-list-row .expression {
+	display: flex;
+}
+.monaco-workbench .debug-pane .monaco-list-row .expression,
+.monaco-workbench .debug-hover-widget .monaco-list-row .expression {
+	font-size: 13px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	font-family: var(--monaco-monospace-font);
+	white-space: pre;
+}
+.monaco-workbench.mac .debug-pane .monaco-list-row .expression,
+.monaco-workbench.mac .debug-hover-widget .monaco-list-row .expression {
+	font-size: 11px;
+}
+.monaco-workbench .monaco-list-row .expression .value {
+	margin-left: 6px;
+}
+.monaco-workbench .monaco-list-row .expression .lazy-button {
+	margin-left: 3px;
+	display: none;
+	border-radius: 5px;
+	align-self: center;
+}
+.monaco-workbench .monaco-list-row .expression.lazy .lazy-button {
+	display: inline;
+}
+.monaco-workbench .monaco-list-row .expression .value a.link:hover {
+	text-decoration: underline;
+}
+.monaco-workbench .monaco-list-row .expression .value a.link.pointer {
+	cursor: pointer;
+}
+.monaco-workbench .monaco-list:focus .monaco-list-row.selected .expression .name,
+.monaco-workbench .monaco-list:focus .monaco-list-row.selected .expression .value {
+	color: inherit;
+}
+.monaco-workbench .monaco-list-row .expression .name.virtual {
+	opacity: 0.5;
+}
+.monaco-workbench .monaco-list-row .expression .name.internal {
+	opacity: 0.5;
+}
+.monaco-workbench .monaco-list-row .expression .unavailable {
+	font-style: italic;
+}
+.monaco-workbench .debug-inline-value {
+	background-color: var(--vscode-editor-inlineValuesBackground);
+	color: var(--vscode-editor-inlineValuesForeground);
+}

package/vscode/src/vs/workbench/contrib/debug/browser/media/debugHover.css

@@ -0,0 +1,63 @@
+.monaco-editor .debug-hover-widget {
+	position: absolute;
+	z-index: 50;
+	animation-duration: 0.15s;
+	animation-name: fadeIn;
+	user-select: text;
+	-webkit-user-select: text;
+	word-break: break-all;
+	white-space: pre;
+}
+.monaco-editor .debug-hover-widget .complex-value {
+	max-width: 550px;
+}
+.monaco-editor .debug-hover-widget .complex-value .title,
+.monaco-editor .debug-hover-widget .complex-value .tip {
+	padding-left: 15px;
+	padding-right: 2px;
+	font-size: 11px;
+	line-height: 18px;
+	word-break: normal;
+	text-overflow: ellipsis;
+	height: 18px;
+	overflow: hidden;
+	white-space: pre;
+}
+.monaco-editor .debug-hover-widget .complex-value .title {
+	border-bottom: 1px solid rgba(128, 128, 128, 0.35);
+}
+.monaco-editor .debug-hover-widget .complex-value .tip {
+	border-top: 1px solid rgba(128, 128, 128, 0.35);
+	opacity: 0.5;
+}
+.monaco-editor .debug-hover-widget .debug-hover-tree {
+	line-height: 18px;
+	cursor: pointer;
+}
+.monaco-editor .debug-hover-widget .debug-hover-tree .monaco-list-row .monaco-tl-contents {
+	user-select: text;
+	-webkit-user-select: text;
+	white-space: pre;
+}
+.monaco-editor .debug-hover-widget .debug-hover-tree .monaco-list-rows .monaco-list-row:hover:not(.highlighted):not(.selected):not(.focused)  {
+	background-color: inherit;
+}
+.monaco-editor .debug-hover-widget pre {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+.monaco-editor .debugHoverHighlight {
+	background-color: rgba(173, 214, 255, 0.15);
+}
+.monaco-editor .debug-hover-widget > .monaco-scrollable-element > .value {
+	color: rgba(108, 108, 108, 0.8);
+	overflow: auto;
+	font-family: var(--monaco-monospace-font);
+	max-height: 500px;
+	padding: 4px 5px;
+	white-space: pre-wrap;
+}
+.monaco-editor.vs-dark .debugHoverHighlight,
+.monaco-editor.hc-theme .debugHoverHighlight {
+	background-color: rgba(38, 79, 120, 0.25);
+}

package/vscode/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css

@@ -0,0 +1,41 @@
+.monaco-workbench .debug-toolbar {
+	position: absolute;
+	z-index: 2520;
+	height: 26px;
+	display: flex;
+	padding-left: 7px;
+	border-radius: 4px;
+	left: 0;
+	top: 0;
+	-webkit-app-region: no-drag;
+}
+.monaco-workbench .debug-toolbar .monaco-action-bar .action-item {
+	margin-right: 4px;
+}
+.monaco-workbench .debug-toolbar .monaco-action-bar .action-item.select-container {
+	margin-right: 7px;
+}
+.monaco-workbench .debug-toolbar .monaco-action-bar .action-item.select-container .monaco-select-box,
+.monaco-workbench .start-debug-action-item .select-container .monaco-select-box {
+	padding: 0 22px 0 6px;
+}
+.monaco-workbench .debug-toolbar .drag-area {
+	cursor: grab;
+	width: 16px;
+	opacity: 0.5;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.monaco-workbench .debug-toolbar .drag-area.dragged {
+	cursor: grabbing;
+}
+.monaco-workbench  .debug-toolbar .monaco-action-bar .action-item .action-label {
+	margin-right: 0;
+	background-size: 16px;
+	background-position: center center;
+	background-repeat: no-repeat;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}