@codingame/monaco-vscode-debug-service-override 1.83.16 → 1.85.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.83.16"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.1",
+    "monaco-editor": "0.45.0",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.0-next.1"
   }
 }

package/vscode/src/vs/editor/common/services/languageFeaturesService.js

@@ -19,6 +19,7 @@ class LanguageFeaturesService {
         this.signatureHelpProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.hoverProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.documentHighlightProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
+        this.multiDocumentHighlightProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.selectionRangeProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.foldingRangeProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.linkProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));

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

@@ -502,7 +502,7 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
         if (decorations) {
             for (const { options } of decorations) {
                 const clz = options.glyphMarginClassName;
-                if (clz && (!clz.includes('codicon-') || clz.includes('codicon-testing-') || clz.includes('codicon-merge-') || clz.includes('codicon-arrow-') || clz.includes('codicon-loading') || clz.includes('codicon-fold'))) {
+                if (clz && (!clz.includes('codicon-') || clz.includes('codicon-testing-') || clz.includes('codicon-merge-') || clz.includes('codicon-arrow-') || clz.includes('codicon-loading') || clz.includes('codicon-fold') || clz.includes('codicon-inline-chat'))) {
                     return false;
                 }
             }
@@ -735,7 +735,7 @@ class InlineBreakpointWidget {
             }
         }));
         this.toDispose.push(dom.addDisposableListener(this.domNode, dom.EventType.CONTEXT_MENU, e => {
-            const event = ( new StandardMouseEvent(e));
+            const event = ( new StandardMouseEvent(dom.getWindow(this.domNode), e));
             const actions = this.getContextMenuActions();
             this.contextMenuService.showContextMenu({
                 getAnchor: () => event,

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

@@ -89,8 +89,9 @@ let BreakpointsView = class BreakpointsView extends ViewPane {
             )),
             ( new ExceptionBreakpointInputRenderer(this, this.debugService, this.contextViewService)),
             this.instantiationService.createInstance(FunctionBreakpointsRenderer, this.menu, this.breakpointSupportsCondition, this.breakpointItemType),
-            this.instantiationService.createInstance(DataBreakpointsRenderer),
             ( new FunctionBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.labelService)),
+            this.instantiationService.createInstance(DataBreakpointsRenderer, this.menu, this.breakpointSupportsCondition, this.breakpointItemType),
+            ( new DataBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.labelService)),
             this.instantiationService.createInstance(InstructionBreakpointsRenderer),
         ], {
             identityProvider: { getId: (element) => element.getId() },
@@ -121,7 +122,7 @@ let BreakpointsView = class BreakpointsView extends ViewPane {
             if (!e.element) {
                 return;
             }
-            if (e.browserEvent instanceof MouseEvent && e.browserEvent.button === 1) {
+            if (dom.isMouseEvent(e.browserEvent) && e.browserEvent.button === 1) {
                 return;
             }
             if (e.element instanceof Breakpoint) {
@@ -129,9 +130,9 @@ let BreakpointsView = class BreakpointsView extends ViewPane {
             }
             if (e.element instanceof InstructionBreakpoint) {
                 const disassemblyView = await this.editorService.openEditor(DisassemblyViewInput.instance);
-                disassemblyView.goToInstructionAndOffset(e.element.instructionReference, e.element.offset, e.browserEvent instanceof MouseEvent && e.browserEvent.detail === 2);
+                disassemblyView.goToInstructionAndOffset(e.element.instructionReference, e.element.offset, dom.isMouseEvent(e.browserEvent) && e.browserEvent.detail === 2);
             }
-            if (e.browserEvent instanceof MouseEvent && e.browserEvent.detail === 2 && e.element instanceof FunctionBreakpoint && e.element !== this.inputBoxData?.breakpoint) {
+            if (dom.isMouseEvent(e.browserEvent) && e.browserEvent.detail === 2 && e.element instanceof FunctionBreakpoint && e.element !== this.inputBoxData?.breakpoint) {
                 this.renderInputBox({ breakpoint: e.element, type: 'name' });
             }
         }));
@@ -342,6 +343,10 @@ class BreakpointsDelegate {
             return ExceptionBreakpointsRenderer.ID;
         }
         if (element instanceof DataBreakpoint) {
+            const inputBoxBreakpoint = this.view.inputBoxData?.breakpoint;
+            if (inputBoxBreakpoint && inputBoxBreakpoint.getId() === element.getId()) {
+                return DataBreakpointInputRenderer.ID;
+            }
             return DataBreakpointsRenderer.ID;
         }
         if (element instanceof InstructionBreakpoint) {
@@ -515,7 +520,7 @@ let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
             data.condition.textContent = ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/breakpointsView',
                 'expressionAndHitCount',
-                "Expression: {0} | Hit Count: {1}",
+                "Condition: {0} | Hit Count: {1}",
                 functionBreakpoint.condition,
                 functionBreakpoint.hitCondition
             ));
@@ -550,7 +555,10 @@ FunctionBreakpointsRenderer = FunctionBreakpointsRenderer_1 = ( __decorate([
 ], FunctionBreakpointsRenderer));
 let DataBreakpointsRenderer = class DataBreakpointsRenderer {
     static { DataBreakpointsRenderer_1 = this; }
-    constructor(debugService, labelService) {
+    constructor(menu, breakpointSupportsCondition, breakpointItemType, debugService, labelService) {
+        this.menu = menu;
+        this.breakpointSupportsCondition = breakpointSupportsCondition;
+        this.breakpointItemType = breakpointItemType;
         this.debugService = debugService;
         this.labelService = labelService;
     }
@@ -571,6 +579,9 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         dom.append(data.breakpoint, data.checkbox);
         data.name = dom.append(data.breakpoint, $('span.name'));
         data.accessType = dom.append(data.breakpoint, $('span.access-type'));
+        data.condition = dom.append(data.breakpoint, $('span.condition'));
+        data.actionBar = ( new ActionBar(data.breakpoint));
+        data.toDispose.push(data.actionBar);
         return data;
     }
     renderElement(dataBreakpoint, _index, data) {
@@ -597,14 +608,33 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         else {
             data.accessType.textContent = '';
         }
+        if (dataBreakpoint.condition && dataBreakpoint.hitCondition) {
+            data.condition.textContent = ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/breakpointsView',
+                'expressionAndHitCount',
+                "Condition: {0} | Hit Count: {1}",
+                dataBreakpoint.condition,
+                dataBreakpoint.hitCondition
+            ));
+        }
+        else {
+            data.condition.textContent = dataBreakpoint.condition || dataBreakpoint.hitCondition || '';
+        }
+        const primary = [];
+        this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
+        this.breakpointItemType.set('dataBreakpoint');
+        createAndFillInActionBarActions(this.menu, { arg: dataBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, 'inline');
+        data.actionBar.clear();
+        data.actionBar.push(primary, { icon: true, label: false });
+        breakpointIdToActionBarDomeNode.set(dataBreakpoint.getId(), data.actionBar.domNode);
     }
     disposeTemplate(templateData) {
         dispose(templateData.toDispose);
     }
 };
 DataBreakpointsRenderer = DataBreakpointsRenderer_1 = ( __decorate([
-    ( __param(0, IDebugService)),
-    ( __param(1, ILabelService))
+    ( __param(3, IDebugService)),
+    ( __param(4, ILabelService))
 ], DataBreakpointsRenderer));
 let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
     static { InstructionBreakpointsRenderer_1 = this; }
@@ -784,6 +814,119 @@ class FunctionBreakpointInputRenderer {
         dispose(templateData.toDispose);
     }
 }
+class DataBreakpointInputRenderer {
+    constructor(view, debugService, contextViewService, labelService) {
+        this.view = view;
+        this.debugService = debugService;
+        this.contextViewService = contextViewService;
+        this.labelService = labelService;
+    }
+    static { this.ID = 'databreakpointinput'; }
+    get templateId() {
+        return DataBreakpointInputRenderer.ID;
+    }
+    renderTemplate(container) {
+        const template = Object.create(null);
+        const toDispose = [];
+        const breakpoint = dom.append(container, $('.breakpoint'));
+        template.icon = $('.icon');
+        template.checkbox = createCheckbox(toDispose);
+        dom.append(breakpoint, template.icon);
+        dom.append(breakpoint, template.checkbox);
+        this.view.breakpointInputFocused.set(true);
+        const inputBoxContainer = dom.append(breakpoint, $('.inputBoxContainer'));
+        const inputBox = ( new InputBox(
+            inputBoxContainer,
+            this.contextViewService,
+            { inputBoxStyles: defaultInputBoxStyles }
+        ));
+        const wrapUp = (success) => {
+            template.updating = true;
+            try {
+                this.view.breakpointInputFocused.set(false);
+                const id = template.breakpoint.getId();
+                if (success) {
+                    if (template.type === 'condition') {
+                        this.debugService.updateDataBreakpoint(id, { condition: inputBox.value });
+                    }
+                    if (template.type === 'hitCount') {
+                        this.debugService.updateDataBreakpoint(id, { hitCondition: inputBox.value });
+                    }
+                }
+                else {
+                    this.view.renderInputBox(undefined);
+                }
+            }
+            finally {
+                template.updating = false;
+            }
+        };
+        toDispose.push(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e) => {
+            const isEscape = e.equals(9 );
+            const isEnter = e.equals(3 );
+            if (isEscape || isEnter) {
+                e.preventDefault();
+                e.stopPropagation();
+                wrapUp(isEnter);
+            }
+        }));
+        toDispose.push(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
+            if (!template.updating) {
+                wrapUp(!!inputBox.value);
+            }
+        }));
+        template.inputBox = inputBox;
+        template.toDispose = toDispose;
+        return template;
+    }
+    renderElement(dataBreakpoint, _index, data) {
+        data.breakpoint = dataBreakpoint;
+        data.type = this.view.inputBoxData?.type || 'condition';
+        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService);
+        data.icon.className = ThemeIcon.asClassName(icon);
+        data.icon.title = message ? message : '';
+        data.checkbox.checked = dataBreakpoint.enabled;
+        data.checkbox.disabled = true;
+        data.inputBox.value = '';
+        let placeholder = '';
+        let ariaLabel = '';
+        if (data.type === 'condition') {
+            data.inputBox.value = dataBreakpoint.condition || '';
+            placeholder = ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/breakpointsView',
+                'dataBreakpointExpressionPlaceholder',
+                "Break when expression evaluates to true"
+            ));
+            ariaLabel = ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/breakpointsView',
+                'dataBreakPointExpresionAriaLabel',
+                "Type expression. Data breakpoint will break when expression evaluates to true"
+            ));
+        }
+        else if (data.type === 'hitCount') {
+            data.inputBox.value = dataBreakpoint.hitCondition || '';
+            placeholder = ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/breakpointsView',
+                'dataBreakpointHitCountPlaceholder',
+                "Break when hit count is met"
+            ));
+            ariaLabel = ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/breakpointsView',
+                'dataBreakPointHitCountAriaLabel',
+                "Type hit count. Data breakpoint will break when hit count is met."
+            ));
+        }
+        data.inputBox.setAriaLabel(ariaLabel);
+        data.inputBox.setPlaceHolder(placeholder);
+        setTimeout(() => {
+            data.inputBox.focus();
+            data.inputBox.select();
+        }, 0);
+    }
+    disposeTemplate(templateData) {
+        dispose(templateData.toDispose);
+    }
+}
 class ExceptionBreakpointInputRenderer {
     constructor(view, debugService, contextViewService) {
         this.view = view;
@@ -986,7 +1129,7 @@ function getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint$1,
             messages.push(( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/breakpointsView',
                 'expression',
-                "Expression condition: {0}",
+                "Condition: {0}",
                 breakpoint$1.condition
             )));
         }
@@ -1070,7 +1213,7 @@ function getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint$1,
             messages.push(( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/breakpointsView',
                 'expression',
-                "Expression condition: {0}",
+                "Condition: {0}",
                 breakpoint$1.condition
             )));
         }
@@ -1438,7 +1581,7 @@ registerAction2(class extends ViewAction {
                     id: MenuId.DebugBreakpointsContext,
                     group: 'navigation',
                     order: 20,
-                    when: ( CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('functionBreakpoint'))
+                    when: ( ContextKeyExpr.or(( CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('functionBreakpoint')), ( CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('dataBreakpoint'))))
                 }]
         });
     }

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

@@ -329,6 +329,7 @@ let CallStackView = class CallStackView extends ViewPane {
         this.tree.layout(height, width);
     }
     focus() {
+        super.focus();
         this.tree.domFocus();
     }
     collapseAll() {

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

@@ -36,6 +36,7 @@ import { Repl } from './repl.js';
 import { StatusBarColorProvider } from './statusbarColorProvider.js';
 import { VIEW_MEMORY_ID, SET_VARIABLE_ID, COPY_VALUE_ID, COPY_EVALUATE_PATH_ID, ADD_TO_WATCH_ID, BREAK_WHEN_VALUE_IS_READ_ID, BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, VariablesView } from './variablesView.js';
 import { WatchExpressionsView, ADD_WATCH_LABEL, ADD_WATCH_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID } from './watchExpressionsView.js';
+import { WelcomeView } from './welcomeView.js';
 import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_DEBUGGERS_AVAILABLE, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, REPL_VIEW_ID, VIEWLET_ID, VARIABLES_VIEW_ID, CONTEXT_DEBUG_UX, WATCH_VIEW_ID, CALLSTACK_VIEW_ID, BREAKPOINTS_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_HAS_DEBUGGED, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, DISASSEMBLY_VIEW_ID, INTERNAL_CONSOLE_OPTIONS_SCHEMA, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { DebugContentProvider } from '../common/debugContentProvider.js';
 import { DebugLifecycle } from '../common/debugLifecycle.js';
@@ -107,11 +108,11 @@ const registerDebugCommandPaletteItem = (id, title, when, precondition) => {
         }
     });
 };
-registerDebugCommandPaletteItem(TERMINATE_THREAD_ID, { value: ( nls.localizeWithPath(
+registerDebugCommandPaletteItem(TERMINATE_THREAD_ID, ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'terminateThread',
     "Terminate Thread"
-)), original: 'Terminate Thread' }, CONTEXT_IN_DEBUG_MODE);
+)), CONTEXT_IN_DEBUG_MODE);
 registerDebugCommandPaletteItem(STEP_OVER_ID, STEP_OVER_LABEL, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugCommandPaletteItem(STEP_INTO_ID, STEP_INTO_LABEL, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugCommandPaletteItem(STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, CONTEXT_IN_DEBUG_MODE, ( ContextKeyExpr.and(CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')))));
@@ -119,29 +120,29 @@ registerDebugCommandPaletteItem(STEP_OUT_ID, STEP_OUT_LABEL, CONTEXT_IN_DEBUG_MO
 registerDebugCommandPaletteItem(PAUSE_ID, PAUSE_LABEL, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('running')));
 registerDebugCommandPaletteItem(STOP_ID, STOP_LABEL, CONTEXT_IN_DEBUG_MODE, ( ContextKeyExpr.or(( CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()), CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)));
 registerDebugCommandPaletteItem(CONTINUE_ID, CONTINUE_LABEL, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugCommandPaletteItem(FOCUS_REPL_ID, { value: ( nls.localizeWithPath(
+registerDebugCommandPaletteItem(FOCUS_REPL_ID, ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     { comment: ['Debug is a noun in this context, not a verb.'], key: 'debugFocusConsole' },
     "Focus on Debug Console View"
-)), original: 'Focus on Debug Console View' });
-registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, { value: ( nls.localizeWithPath(
+)));
+registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'jumpToCursor',
     "Jump to Cursor"
-)), original: 'Jump to Cursor' }, CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
-registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, { value: ( nls.localizeWithPath(
+)), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
+registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'SetNextStatement',
     "Set Next Statement"
-)), original: 'Set Next Statement' }, CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
-registerDebugCommandPaletteItem(RunToCursorAction.ID, { value: RunToCursorAction.LABEL, original: 'Run to Cursor' }, CONTEXT_DEBUGGERS_AVAILABLE);
-registerDebugCommandPaletteItem(SelectionToReplAction.ID, { value: SelectionToReplAction.LABEL, original: 'Evaluate in Debug Console' }, CONTEXT_IN_DEBUG_MODE);
-registerDebugCommandPaletteItem(SelectionToWatchExpressionsAction.ID, { value: SelectionToWatchExpressionsAction.LABEL, original: 'Add to Watch' });
-registerDebugCommandPaletteItem(TOGGLE_INLINE_BREAKPOINT_ID, { value: ( nls.localizeWithPath(
+)), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
+registerDebugCommandPaletteItem(RunToCursorAction.ID, RunToCursorAction.LABEL, CONTEXT_DEBUGGERS_AVAILABLE);
+registerDebugCommandPaletteItem(SelectionToReplAction.ID, SelectionToReplAction.LABEL, CONTEXT_IN_DEBUG_MODE);
+registerDebugCommandPaletteItem(SelectionToWatchExpressionsAction.ID, SelectionToWatchExpressionsAction.LABEL);
+registerDebugCommandPaletteItem(TOGGLE_INLINE_BREAKPOINT_ID, ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'inlineBreakpoint',
     "Inline Breakpoint"
-)), original: 'Inline Breakpoint' });
+)));
 registerDebugCommandPaletteItem(SELECT_AND_START_ID, SELECT_AND_START_LABEL, ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 ))))));
 registerDebugCommandPaletteItem(NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL);
 registerDebugCommandPaletteItem(PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL);
@@ -257,11 +258,11 @@ registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_EXPRESSION_COMMAND_ID
     "Remove Expression"
 )), 20, ( CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression')), undefined, 'inline', watchExpressionRemove);
 registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, 20, undefined, undefined, 'z_commands');
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, { submenu: MenuId.EditorTitleRun, rememberDefaultAction: true, title: { value: ( nls.localizeWithPath(
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { submenu: MenuId.EditorTitleRun, rememberDefaultAction: true, title: ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'run',
     "Run or Debug..."
-)), original: 'Run or Debug...', }, icon: debugRun, group: 'navigation', order: -1 });
+)), icon: debugRun, group: 'navigation', order: -1 });
 MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     submenu: MenuId.MenubarDebugMenu,
     title: {
@@ -290,11 +291,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
 });
 const VIEW_CONTAINER = ( Registry.as(Extensions$2.ViewContainersRegistry)).registerViewContainer({
     id: DEBUG_PANEL_ID,
-    title: { value: ( nls.localizeWithPath(
+    title: ( nls.localize2WithPath(
         'vs/workbench/contrib/debug/browser/debug.contribution',
         { comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' },
         "Debug Console"
-    )), original: 'Debug Console' },
+    )),
     icon: debugConsoleViewIcon,
     ctorDescriptor: ( new SyncDescriptor(
         ViewPaneContainer,
@@ -306,7 +307,7 @@ const VIEW_CONTAINER = ( Registry.as(Extensions$2.ViewContainersRegistry)).regis
 }, 1 , { doNotRegisterOpenCommand: true });
 ( Registry.as(Extensions$2.ViewsRegistry)).registerViews([{
         id: REPL_VIEW_ID,
-        name: ( nls.localizeWithPath(
+        name: ( nls.localize2WithPath(
             'vs/workbench/contrib/debug/browser/debug.contribution',
             { comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' },
             "Debug Console"
@@ -329,11 +330,11 @@ const VIEW_CONTAINER = ( Registry.as(Extensions$2.ViewContainersRegistry)).regis
     }], VIEW_CONTAINER);
 const viewContainer = ( Registry.as(Extensions$2.ViewContainersRegistry)).registerViewContainer({
     id: VIEWLET_ID,
-    title: { value: ( nls.localizeWithPath(
+    title: ( nls.localize2WithPath(
         'vs/workbench/contrib/debug/browser/debug.contribution',
         'run and debug',
         "Run and Debug"
-    )), original: 'Run and Debug' },
+    )),
     openCommandActionDescriptor: {
         id: VIEWLET_ID,
         mnemonicTitle: ( nls.localizeWithPath(
@@ -350,23 +351,24 @@ const viewContainer = ( Registry.as(Extensions$2.ViewContainersRegistry)).regist
     order: 3,
 }, 0 );
 const viewsRegistry = ( Registry.as(Extensions$2.ViewsRegistry));
-viewsRegistry.registerViews([{ id: VARIABLES_VIEW_ID, name: ( nls.localizeWithPath(
+viewsRegistry.registerViews([{ id: VARIABLES_VIEW_ID, name: ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'variables',
     "Variables"
 )), containerIcon: variablesViewIcon, ctorDescriptor: ( new SyncDescriptor(VariablesView)), order: 10, weight: 40, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusVariablesView' }, when: ( CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
-viewsRegistry.registerViews([{ id: WATCH_VIEW_ID, name: ( nls.localizeWithPath('vs/workbench/contrib/debug/browser/debug.contribution', 'watch', "Watch")), containerIcon: watchViewIcon, ctorDescriptor: ( new SyncDescriptor(WatchExpressionsView)), order: 20, weight: 10, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusWatchView' }, when: ( CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
-viewsRegistry.registerViews([{ id: CALLSTACK_VIEW_ID, name: ( nls.localizeWithPath(
+viewsRegistry.registerViews([{ id: WATCH_VIEW_ID, name: ( nls.localize2WithPath('vs/workbench/contrib/debug/browser/debug.contribution', 'watch', "Watch")), containerIcon: watchViewIcon, ctorDescriptor: ( new SyncDescriptor(WatchExpressionsView)), order: 20, weight: 10, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusWatchView' }, when: ( CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
+viewsRegistry.registerViews([{ id: CALLSTACK_VIEW_ID, name: ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'callStack',
     "Call Stack"
 )), containerIcon: callStackViewIcon, ctorDescriptor: ( new SyncDescriptor(CallStackView)), order: 30, weight: 30, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusCallStackView' }, when: ( CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
-viewsRegistry.registerViews([{ id: BREAKPOINTS_VIEW_ID, name: ( nls.localizeWithPath(
+viewsRegistry.registerViews([{ id: BREAKPOINTS_VIEW_ID, name: ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'breakpoints',
     "Breakpoints"
 )), containerIcon: breakpointsViewIcon, ctorDescriptor: ( new SyncDescriptor(BreakpointsView)), order: 40, weight: 20, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusBreakpointsView' }, when: ( ContextKeyExpr.or(CONTEXT_BREAKPOINTS_EXIST, ( CONTEXT_DEBUG_UX.isEqualTo('default')), CONTEXT_HAS_DEBUGGED)) }], viewContainer);
-viewsRegistry.registerViews([{ id: LOADED_SCRIPTS_VIEW_ID, name: ( nls.localizeWithPath(
+viewsRegistry.registerViews([{ id: WelcomeView.ID, name: WelcomeView.LABEL, containerIcon: runViewIcon, ctorDescriptor: ( new SyncDescriptor(WelcomeView)), order: 1, weight: 40, canToggleVisibility: true, when: ( CONTEXT_DEBUG_UX.isEqualTo('simple')) }], viewContainer);
+viewsRegistry.registerViews([{ id: LOADED_SCRIPTS_VIEW_ID, name: ( nls.localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'loadedScripts',
     "Loaded Scripts"
@@ -438,8 +440,7 @@ configurationRegistry.registerConfiguration({
                 'vs/workbench/contrib/debug/browser/debug.contribution',
                 { comment: ['This is the description for a setting'], key: 'toolBarLocation' },
                 "Controls the location of the debug toolbar. Either `floating` in all views, `docked` in the debug view, `commandCenter` (requires `{0}`), or `hidden`.",
-                '#window.commandCenter#',
-                '#window.titleBarStyle#'
+                '#window.commandCenter#'
             )),
             default: 'floating',
             markdownEnumDescriptions: [
@@ -731,9 +732,19 @@ configurationRegistry.registerConfiguration({
             description: ( nls.localizeWithPath(
                 'vs/workbench/contrib/debug/browser/debug.contribution',
                 'debug.enableStatusBarColor',
-                "Color status bar when debugger is active"
+                "Color of the Status bar when debugger is active."
             )),
             default: true
+        },
+        'debug.hideLauncherWhileDebugging': {
+            type: 'boolean',
+            markdownDescription: ( nls.localizeWithPath(
+                'vs/workbench/contrib/debug/browser/debug.contribution',
+                { comment: ['This is the description for a setting'], key: 'debug.hideLauncherWhileDebugging' },
+                "Hide 'Start Debugging' control in title bar of 'Run and Debug' view while debugging is active. Only relevant when `{0}` is not `docked`.",
+                '#debug.toolBarLocation#'
+            )),
+            default: false
         }
     }
 });

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

@@ -310,7 +310,7 @@ let AdapterManager = class AdapterManager extends Disposable {
             await this.activateDebuggers('onDebugInitialConfigurations');
             candidates = this.debuggers
                 .filter(a => a.enabled)
-                .filter(dbg => dbg.hasInitialConfiguration() || dbg.hasConfigurationProvider());
+                .filter(dbg => dbg.hasInitialConfiguration() || dbg.hasDynamicConfigurationProviders() || dbg.hasConfigurationProvider());
         }
         if (candidates.length === 0 && languageLabel) {
             if (languageLabel.indexOf(' ') >= 0) {

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

@@ -2,17 +2,17 @@ import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { List } from 'monaco-editor/esm/vs/base/browser/ui/list/listWidget.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { IListService } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { IDebugService, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_IN_DEBUG_REPL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, REPL_VIEW_ID, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_INPUT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { IDebugService, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_IN_DEBUG_REPL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, REPL_VIEW_ID, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_INPUT_FOCUSED, EDITOR_CONTRIBUTION_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint } from '../common/debugModel.js';
 import { isCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
-import { MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { MenuRegistry, MenuId, registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
 import { IContextKeyService, ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { openBreakpointSource } from './breakpointsView.js';
 import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
 import { InputFocusedContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
-import { PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { ResourceContextKey, ActiveEditorContext, PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { ITextResourcePropertiesService } from 'monaco-editor/esm/vs/editor/common/services/textResourceConfiguration.js';
 import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
@@ -22,6 +22,7 @@ import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
 import { isWeb, isWindows } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { showLoadedScriptMenu } from '../common/loadedScriptsPicker.js';
 import { showDebugSessionMenu } from './debugSessionPicker.js';
+import { TEXT_FILE_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 
 const ADD_CONFIGURATION_ID = 'debug.addConfiguration';
 const TOGGLE_INLINE_BREAKPOINT_ID = 'editor.debug.action.toggleInlineBreakpoint';
@@ -117,6 +118,11 @@ const DEBUG_CONFIGURE_LABEL = ( nls.localizeWithPath(
     "Open '{0}'",
     'launch.json'
 ));
+const DEBUG_START_LABEL = { value: ( nls.localizeWithPath(
+    'vs/workbench/contrib/debug/browser/debugCommands',
+    'startDebug',
+    "Start Debugging"
+)), original: 'Start Debugging' };
 const NEXT_DEBUG_CONSOLE_LABEL = { value: ( nls.localizeWithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'nextDebugConsole',
@@ -879,6 +885,37 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     }
 });
+registerAction2(class AddConfigurationAction extends Action2 {
+    constructor() {
+        super({
+            id: ADD_CONFIGURATION_ID,
+            title: { value: ( nls.localizeWithPath(
+                'vs/workbench/contrib/debug/browser/debugCommands',
+                'addConfiguration',
+                "Add Configuration..."
+            )), original: 'Add Configuration...' },
+            category: DEBUG_COMMAND_CATEGORY,
+            f1: true,
+            menu: {
+                id: MenuId.EditorContent,
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.regex(ResourceContextKey.Path.key, /\.vscode[/\\]launch\.json$/)), ( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID))))
+            }
+        });
+    }
+    async run(accessor, launchUri) {
+        const manager = accessor.get(IDebugService).getConfigurationManager();
+        const launch = manager.getLaunches().find(l => ( l.uri.toString()) === launchUri) || manager.selectedConfiguration.launch;
+        if (launch) {
+            const { editor, created } = await launch.openConfigFile({ preserveFocus: false });
+            if (editor && !created) {
+                const codeEditor = editor.getControl();
+                if (codeEditor) {
+                    await codeEditor.getContribution(EDITOR_CONTRIBUTION_ID)?.addLaunchConfiguration();
+                }
+            }
+        }
+    }
+});
 const inlineBreakpointHandler = (accessor) => {
     const debugService = accessor.get(IDebugService);
     const editorService = accessor.get(IEditorService);
@@ -937,4 +974,4 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 
-export { ADD_CONFIGURATION_ID, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_STACK_TRACE_ID, DEBUG_COMMAND_CATEGORY, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_START_COMMAND_ID, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, FOCUS_REPL_ID, FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, REVERSE_CONTINUE_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_BACK_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID };
+export { ADD_CONFIGURATION_ID, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_STACK_TRACE_ID, DEBUG_COMMAND_CATEGORY, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, FOCUS_REPL_ID, FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, REVERSE_CONTINUE_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_BACK_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID };

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

@@ -203,6 +203,7 @@ let ConfigurationManager = class ConfigurationManager {
                             await this.selectConfiguration(launch, config.name);
                             this.removeRecentDynamicConfigurations(config.name, config.type);
                         }));
+                        disposables.add(input.onDidHide(() => resolve(undefined)));
                     }));
                     const nestedPicks = await Promise.all(picks);
                     const items = flatten(nestedPicks);