@codingame/monaco-vscode-debug-service-override 22.1.9 → 23.0.0

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { createErrorWithActions } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
@@ -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(6477, "Abort"));
-const DEBUG_ANYWAY_LABEL = ( localize(6478, "&&Debug Anyway"));
-const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(6479, "Debug Anyway"));
+const ABORT_LABEL = ( localize(6720, "Abort"));
+const DEBUG_ANYWAY_LABEL = ( localize(6721, "&&Debug Anyway"));
+const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(6722, "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(6480, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
+                ? ( localize(6723, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
                 : errorCount === 1
-                    ? ( localize(6481, "Error exists after running preLaunchTask '{0}'.", taskLabel))
+                    ? ( localize(6724, "Error exists after running preLaunchTask '{0}'.", taskLabel))
                     : taskSummary && typeof taskSummary.exitCode === 'number'
                         ? ( localize(
-                6482,
+                6725,
                 "The preLaunchTask '{0}' terminated with exit code {1}.",
                 taskLabel,
                 taskSummary.exitCode
             ))
-                        : ( localize(6483, "The preLaunchTask '{0}' terminated.", taskLabel));
+                        : ( localize(6726, "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(6484, "&&Show Errors")),
+                        label: ( localize(6727, "&&Show Errors")),
                         run: () => DebugChoice.ShowErrors
                     }
                 ],
@@ -109,7 +109,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     run: () => DebugChoice.Cancel
                 },
                 checkbox: {
-                    label: ( localize(6485, "Remember my choice in user settings")),
+                    label: ( localize(6728, "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(6478, "&&Debug Anyway")),
+                            label: ( localize(6721, "&&Debug Anyway")),
                             run: () => DebugChoice.DebugAnyway
                         },
                         {
@@ -157,7 +157,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.Cancel
                     },
                     checkbox: {
-                        label: ( localize(6486, "Remember my choice for this task"))
+                        label: ( localize(6729, "Remember my choice for this task"))
                     }
                 });
                 choice = result;
@@ -178,7 +178,7 @@ let DebugTaskRunner = class DebugTaskRunner {
         }
         if (!root) {
             return Promise.reject(( new Error(( localize(
-                6487,
+                6730,
                 "Task '{0}' can not be referenced from a launch configuration that is in a different workspace folder.",
                 typeof taskId === 'string' ? taskId : taskId.type
             )))));
@@ -186,15 +186,9 @@ let DebugTaskRunner = class DebugTaskRunner {
         const task = await this.taskService.getTask(root, taskId);
         if (!task) {
             const errorMessage = typeof taskId === 'string'
-                ? ( localize(6488, "Could not find the task '{0}'.", taskId))
-                : ( localize(6489, "Could not find the specified task."));
-            return Promise.reject(createErrorWithActions(errorMessage, [( new Action(
-                DEBUG_CONFIGURE_COMMAND_ID,
-                DEBUG_CONFIGURE_LABEL,
-                undefined,
-                true,
-                () => this.commandService.executeCommand(DEBUG_CONFIGURE_COMMAND_ID)
-            ))]));
+                ? ( localize(6731, "Could not find the task '{0}'.", taskId))
+                : ( localize(6732, "Could not find the specified task."));
+            return Promise.reject(createErrorWithActions(errorMessage, [toAction({ id: DEBUG_CONFIGURE_COMMAND_ID, label: DEBUG_CONFIGURE_LABEL, enabled: true, run: () => this.commandService.executeCommand(DEBUG_CONFIGURE_COMMAND_ID) })]));
         }
         let taskStarted = false;
         const store = ( new DisposableStore());
@@ -245,7 +239,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                 store.add(disposableTimeout(() => {
                     if (!taskStarted) {
                         const errorMessage = ( localize(
-                            6490,
+                            6733,
                             "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 +250,14 @@ let DebugTaskRunner = class DebugTaskRunner {
                 if (!hideSlowPreLaunchWarning) {
                     store.add(disposableTimeout(() => {
                         const message = ( localize(
-                            6491,
+                            6734,
                             "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(6492, "Configure Task")));
+                            buttons.splice(1, 0, ( localize(6735, "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-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem";
+import { IDropdownWithPrimaryActionViewItemOptions } from "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-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

@@ -15,7 +15,7 @@ import { DisposableStore, MutableDisposable, markAsSingleton } from '@codingame/
 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-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
+import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-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';
@@ -46,9 +46,9 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 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 '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugActionViewItems';
-import { debugToolBarBackground, debugToolBarBorder } from '@codingame/monaco-vscode-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/workbench/contrib/debug/browser/debugColors';
+import { debugToolBarBackground, debugToolBarBorder } from '@codingame/monaco-vscode-afb6e5ca-fe46-5d5a-aa9c-f722ebefae39-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-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { debugGripper, debugContinue, debugPause, debugStop, debugDisconnect, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStepBack, debugReverseContinue } from '@codingame/monaco-vscode-afb6e5ca-fe46-5d5a-aa9c-f722ebefae39-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import * as debugToolBar from './media/debugToolBar.css';
 
 registerCss(debugToolBar);
@@ -312,7 +312,7 @@ function createDisconnectMenuItemAction(action, disposables, accessor, options)
     if (!secondary.length) {
         return undefined;
     }
-    const dropdownAction = disposables.add(( new Action('notebook.moreRunActions', ( localize(6493, "More...")), 'codicon-chevron-down', true)));
+    const dropdownAction = disposables.add(( new Action('notebook.moreRunActions', ( localize(6736, "More...")), 'codicon-chevron-down', true)));
     const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', options);
     return item;
 }
@@ -370,8 +370,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(6494, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localize(6495, "Reverse")), 55, debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugToolBarItem(STEP_BACK_ID, ( localize(6737, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localize(6738, "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.js

@@ -23,7 +23,7 @@ import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { StartDebugActionViewItem, FocusSessionActionViewItem } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugActionViewItems';
 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-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { debugConfigure } from '@codingame/monaco-vscode-afb6e5ca-fe46-5d5a-aa9c-f722ebefae39-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';
@@ -171,10 +171,10 @@ registerAction2(class extends Action2 {
             title: {
                 value: DEBUG_CONFIGURE_LABEL,
                 original: 'Open \'launch.json\'',
-                mnemonicTitle: ( localize(6496, "Open &&Configurations"))
+                mnemonicTitle: ( localize(6739, "Open &&Configurations"))
             },
             metadata: {
-                description: ( localize2(6497, 'Opens the file used to configure how your program is debugged'))
+                description: ( localize2(6740, 'Opens the file used to configure how your program is debugged'))
             },
             f1: true,
             icon: debugConfigure,
@@ -214,7 +214,7 @@ registerAction2(class extends Action2 {
                 const picked = await quickInputService.pick(picks, {
                     activeItem: picks[0],
                     placeHolder: ( localize(
-                        6498,
+                        6741,
                         "Select a workspace folder to create a launch.json file in or add it to the workspace config file"
                     ))
                 });
@@ -238,7 +238,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.toggleReplIgnoreFocus',
-            title: ( localize(6499, "Debug Console")),
+            title: ( localize(6742, "Debug Console")),
             toggled: ( ContextKeyExpr.has(`view.${REPL_VIEW_ID}.visible`)),
             menu: [{
                     id: ViewsSubMenu,
@@ -263,7 +263,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     order: 10,
     command: {
         id: SELECT_AND_START_ID,
-        title: ( localize(6500, "Start Additional Session")),
+        title: ( localize(6743, "Start Additional Session")),
     }
 });
 

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

@@ -10,7 +10,7 @@ import { Constants } from '@codingame/monaco-vscode-api/vscode/vs/base/common/ui
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { applyFontInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/config/domFontInfo';
 import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
-import { BareFontInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/fontInfo';
+import { createBareFontInfoFromRawSettings } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/fontInfoFromSettings';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { StringBuilder } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/stringBuilder';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
@@ -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-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { topStackFrameColor, focusedStackFrameColor } from '@codingame/monaco-vscode-b99aef83-0d60-5e8c-a62e-9908b6256f35-common/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from '@codingame/monaco-vscode-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from '@codingame/monaco-vscode-afb6e5ca-fe46-5d5a-aa9c-f722ebefae39-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';
@@ -64,7 +64,7 @@ const disassemblyNotAvailable = {
     address: 0n,
     instruction: {
         address: '-1',
-        instruction: ( localize(6501, "Disassembly not available."))
+        instruction: ( localize(6744, "Disassembly not available."))
     },
 };
 let DisassemblyView = class DisassemblyView extends EditorPane {
@@ -109,7 +109,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
         return this._fontInfo;
     }
     createFontInfo() {
-        return BareFontInfo.createFromRawSettings(this._configurationService.getValue('editor'), PixelRatio.getInstance(this.window).value);
+        return createBareFontInfoFromRawSettings(this._configurationService.getValue('editor'), PixelRatio.getInstance(this.window).value);
     }
     get currentInstructionAddresses() {
         return ( ( ( ( this._debugService.getModel().getSessions(false).
@@ -182,7 +182,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
                 project(row) { return row; }
             },
             {
-                label: ( localize(6502, "instructions")),
+                label: ( localize(6745, "instructions")),
                 tooltip: '',
                 weight: 0.3,
                 templateId: InstructionRenderer.TEMPLATE_ID,
@@ -208,6 +208,9 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
             this.reloadDisassembly(this.focusedInstructionReference, 0);
         }
         this._register(this._disassembledInstructions.onDidScroll(e => {
+            if (this._disassembledInstructions?.row(0) === disassemblyNotAvailable) {
+                return;
+            }
             if (this._loadingLock) {
                 return;
             }
@@ -218,12 +221,11 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
                     if (loaded > 0) {
                         this._disassembledInstructions.reveal(prevTop + loaded, 0);
                     }
-                    this._loadingLock = false;
-                });
+                }).finally(() => { this._loadingLock = false; });
             }
             else if (e.oldScrollTop < e.scrollTop && e.scrollTop + e.height > e.scrollHeight - e.height) {
                 this._loadingLock = true;
-                this.scrollDown_LoadDisassembledInstructions(DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD).then(() => { this._loadingLock = false; });
+                this.scrollDown_LoadDisassembledInstructions(DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD).finally(() => { this._loadingLock = false; });
             }
         }));
         this._register(this._disassembledInstructions.onContextMenu(e => this.onContextMenu(e)));
@@ -732,7 +734,7 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
             };
             this.editorService.openEditor({
                 resource: sourceURI,
-                description: ( localize(6503, "from disassembly")),
+                description: ( localize(6746, "from disassembly")),
                 options: {
                     preserveFocus: false,
                     selection: selection,
@@ -767,18 +769,18 @@ InstructionRenderer = InstructionRenderer_1 = ( __decorate([
 ], InstructionRenderer));
 class AccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(6504, "Disassembly View");
+        return localize(6747, "Disassembly View");
     }
     getAriaLabel(element) {
         let label = '';
         const instruction = element.instruction;
         if (instruction.address !== '-1') {
-            label += `${( localize(6505, "Address"))}: ${instruction.address}`;
+            label += `${( localize(6748, "Address"))}: ${instruction.address}`;
         }
         if (instruction.instructionBytes) {
-            label += `, ${( localize(6506, "Bytes"))}: ${instruction.instructionBytes}`;
+            label += `, ${( localize(6749, "Bytes"))}: ${instruction.instructionBytes}`;
         }
-        label += `, ${( localize(6507, "Instruction"))}: ${instruction.instruction}`;
+        label += `, ${( localize(6750, "Instruction"))}: ${instruction.instruction}`;
         return label;
     }
 }

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

@@ -27,7 +27,7 @@ let BrowserExtensionHostDebugService = class BrowserExtensionHostDebugService ex
             channel = connection.getChannel(ExtensionHostDebugBroadcastChannel.ChannelName);
         }
         else {
-            channel = { call: async () => undefined, listen: () => Event.None };
+            channel = { call: async () => Promise.resolve(undefined), listen: () => Event.None };
         }
         super(channel);
         this.storageService = storageService;

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

@@ -26,7 +26,7 @@ import { WorkbenchCompressibleObjectTree } from '@codingame/monaco-vscode-api/vs
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.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 { ResourceLabels } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/browser/labels';
 import { ViewPane, ViewAction } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
 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';
@@ -563,7 +563,7 @@ class LoadedScriptsRenderer {
             options.fileKind = FileKind.ROOT_FOLDER;
         }
         else if (element instanceof SessionTreeItem) {
-            options.title = ( localize(6519, "Debug Session"));
+            options.title = ( localize(6762, "Debug Session"));
             options.hideIcon = true;
         }
         else if (element instanceof BaseTreeItem) {
@@ -585,20 +585,20 @@ class LoadedScriptsRenderer {
 }
 class LoadedSciptsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(6520, "Debug Loaded Scripts");
+        return localize(6763, "Debug Loaded Scripts");
     }
     getAriaLabel(element) {
         if (element instanceof RootFolderTreeItem) {
-            return localize(6521, "Workspace folder {0}, loaded script, debug", element.getLabel());
+            return localize(6764, "Workspace folder {0}, loaded script, debug", element.getLabel());
         }
         if (element instanceof SessionTreeItem) {
-            return localize(6522, "Session {0}, loaded script, debug", element.getLabel());
+            return localize(6765, "Session {0}, loaded script, debug", element.getLabel());
         }
         if (element.hasChildren()) {
-            return localize(6523, "Folder {0}, loaded script, debug", element.getLabel());
+            return localize(6766, "Folder {0}, loaded script, debug", element.getLabel());
         }
         else {
-            return localize(6524, "{0}, loaded script, debug", element.getLabel());
+            return localize(6767, "{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(6525, "Collapse All")),
+            title: ( localize(6768, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {

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

@@ -194,7 +194,7 @@ let RawDebugSession = class RawDebugSession {
     }
     async start() {
         if (!this.debugAdapter) {
-            return Promise.reject(( new Error(( localize(6526, "No debug adapter, can not start debug session.")))));
+            return Promise.reject(( new Error(( localize(6769, "No debug adapter, can not start debug session.")))));
         }
         await this.debugAdapter.startSession();
         this.startTime = ( new Date()).getTime();
@@ -518,10 +518,10 @@ let RawDebugSession = class RawDebugSession {
                     const { confirmed } = await this.dialogSerivce.confirm({
                         type: Severity.Warning,
                         message: ( localize(
-                            6527,
+                            6770,
                             "The debugger needs to open a new tab or window for the debuggee but the browser prevented this. You must give permission to continue."
                         )),
-                        primaryButton: ( localize(6528, "&&Continue"))
+                        primaryButton: ( localize(6771, "&&Continue"))
                     });
                     if (confirmed) {
                         result = await this.launchVsCode(request.arguments);
@@ -621,7 +621,7 @@ let RawDebugSession = class RawDebugSession {
                     completeDispatch(undefined);
                 }
                 else {
-                    errorDispatch(( new Error(( localize(6529, "No debugger available found. Can not send '{0}'.", command)))));
+                    errorDispatch(( new Error(( localize(6772, "No debugger available found. Can not send '{0}'.", command)))));
                 }
                 return;
             }
@@ -654,7 +654,7 @@ let RawDebugSession = class RawDebugSession {
         const userMessage = error ? formatPII(error.format, false, error.variables) : errorMessage;
         const url = error?.url;
         if (error && url) {
-            const label = error.urlLabel ? error.urlLabel : ( localize(6530, "More Info"));
+            const label = error.urlLabel ? error.urlLabel : ( localize(6773, "More Info"));
             const uri = ( URI.parse(url));
             const actionId = uri.scheme === Schemas.command ? 'debug.moreInfo.command' : 'debug.moreInfo';
             return createErrorWithActions(userMessage, [toAction({ id: actionId, label, run: () => this.openerService.open(uri, { allowCommands: true }) })]);

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

@@ -42,41 +42,41 @@ class ReplAccessibilityHelpProvider extends Disposable {
     provideContent() {
         return [
             ( localize(
-            6549,
+            6792,
             "The debug console is a Read-Eval-Print-Loop that allows you to evaluate expressions and run commands and can be focused with{0}.",
             '<keybinding:workbench.panel.repl.view.focus>'
         )),
             ( localize(
-            6550,
+            6793,
             "The debug console output can be navigated to from the input field with the Focus Previous Widget command{0}.",
             '<keybinding:widgetNavigation.focusPrevious>'
         )),
             ( localize(
-            6551,
+            6794,
             "The debug console input can be navigated to from the output with the Focus Next Widget command{0}.",
             '<keybinding:widgetNavigation.focusNext>'
         )),
             ( localize(
-            6552,
+            6795,
             "The debug console output history can be navigated with the up and down arrow keys."
         )),
             ( localize(
-            6553,
+            6796,
             "The Open Accessible View command{0} will allow character by character navigation of the console output.",
             '<keybinding:editor.action.accessibleView>'
         )),
             ( localize(
-            6554,
+            6797,
             "The Show Run and Debug view command{0} will open the Run and Debug view and provides more information about debugging.",
             '<keybinding:workbench.view.debug>'
         )),
             ( localize(
-            6555,
+            6798,
             "The Debug: Clear Console command{0} will clear the console output.",
             '<keybinding:workbench.debug.panel.action.clearReplAction>'
         )),
             ( localize(
-            6556,
+            6799,
             "The setting `debug.expandLazyVariables` controls whether variables are evaluated automatically. This is enabled by default when using a screen reader."
         )),
         ].join('\n');

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

@@ -53,79 +53,79 @@ let RunAndDebugAccessibilityHelpProvider = class RunAndDebugAccessibilityHelpPro
     provideContent() {
         return [
             ( localize(
-            6562,
+            6805,
             "The Show Run and Debug view command{0} will open the current view.",
             '<keybinding:workbench.view.debug>'
         )),
             ( localize(
-            6563,
+            6806,
             "The Debug: Start Debugging command{0} will start a debug session.",
             '<keybinding:workbench.action.debug.start>'
         )),
             ( localize(
-            6564,
+            6807,
             "Access debug output and evaluate expressions in the debug console, which can be focused with{0}.",
             '<keybinding:workbench.panel.repl.view.focus>'
         )),
             AccessibilityHelpNLS.setBreakpoint,
             AccessibilityHelpNLS.addToWatch,
-            ( localize(6565, "Once debugging, the following commands will be available:")),
+            ( localize(6808, "Once debugging, the following commands will be available:")),
             ( localize(
-            6566,
+            6809,
             "- Debug: Restart Debugging command{0} will restart the current debug session.",
             '<keybinding:workbench.action.debug.restart>'
         )),
             ( localize(
-            6567,
+            6810,
             "- Debug: Stop Debugging command{0} will stop the current debugging session.",
             '<keybinding:workbench.action.debug.stop>'
         )),
             ( localize(
-            6568,
+            6811,
             "- Debug: Continue command{0} will continue execution until the next breakpoint.",
             '<keybinding:workbench.action.debug.continue>'
         )),
             ( localize(
-            6569,
+            6812,
             "- Debug: Step Into command{0} will step into the next function call.",
             '<keybinding:workbench.action.debug.stepInto>'
         )),
             ( localize(
-            6570,
+            6813,
             "- Debug: Step Over command{0} will step over the current function call.",
             '<keybinding:workbench.action.debug.stepOver>'
         )),
             ( localize(
-            6571,
+            6814,
             "- Debug: Step Out command{0} will step out of the current function call.",
             '<keybinding:workbench.action.debug.stepOut>'
         )),
             ( localize(
-            6572,
+            6815,
             'The debug viewlet is comprised of several views that can be focused with the following commands or navigated to via tab then arrow keys:'
         )),
             ( localize(
-            6573,
+            6816,
             "- Debug: Focus Breakpoints View command{0} will focus the breakpoints view.",
             '<keybinding:workbench.debug.action.focusBreakpointsView>'
         )),
             ( localize(
-            6574,
+            6817,
             "- Debug: Focus Call Stack View command{0} will focus the call stack view.",
             '<keybinding:workbench.debug.action.focusCallStackView>'
         )),
             ( localize(
-            6575,
+            6818,
             "- Debug: Focus Variables View command{0} will focus the variables view.",
             '<keybinding:workbench.debug.action.focusVariablesView>'
         )),
             ( localize(
-            6576,
+            6819,
             "- Debug: Focus Watch View command{0} will focus the watch view.",
             '<keybinding:workbench.debug.action.focusWatchView>'
         )),
             ( localize(
-            6577,
+            6820,
             "The setting {0} controls whether watch variable changes are announced.",
             'accessibility.debugWatchVariableAnnouncements'
         )),

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

@@ -27,7 +27,7 @@ const STATUS_BAR_DEBUGGING_BACKGROUND = registerColor('statusBar.debuggingBackgr
     hcDark: '#BA592C',
     hcLight: '#B5200D'
 }, ( localize(
-    6578,
+    6821,
     "Status bar background color when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
 const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForeground', {
@@ -36,14 +36,14 @@ const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForegr
     hcDark: STATUS_BAR_FOREGROUND,
     hcLight: '#FFFFFF'
 }, ( localize(
-    6579,
+    6822,
     "Status bar foreground color when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
 const STATUS_BAR_DEBUGGING_BORDER = registerColor('statusBar.debuggingBorder', STATUS_BAR_BORDER, ( localize(
-    6580,
+    6823,
     "Status bar border color separating to the sidebar and editor when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
-const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258)), ( localize(6581, "Command center background color when a program is being debugged")), true);
+const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258)), ( localize(6824, "Command center background color when a program is being debugged")), true);
 let StatusBarColorProvider = class StatusBarColorProvider {
     set enabled(enabled) {
         if (enabled === !!this.disposable) {