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

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

@@ -1,9 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { ElementsDragAndDropData } from 'vscode/vscode/vs/base/browser/ui/list/listView';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { ListDragOverEffectPosition, ListDragOverEffectType } from 'vscode/vscode/vs/base/browser/ui/list/list';
+import { ElementsDragAndDropData, ListViewTargetSector } from 'vscode/vscode/vs/base/browser/ui/list/listView';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { localize } from 'vscode/vscode/vs/nls';
-import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { getFlatContextMenuActions, getContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -17,14 +19,14 @@ import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/l
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { ViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewPane, ViewAction } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_ITEM_TYPE, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_CAN_VIEW_MEMORY, WATCH_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { Expression, Variable, VisualizedExpression } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { Expression, Variable, VisualizedExpression } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { renderViewTree, AbstractExpressionDataSource, AbstractExpressionsRenderer } from './baseDebugView.js';
-import { DebugExpressionRenderer } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
-import { watchExpressionsAdd, watchExpressionsRemoveAll } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { DebugExpressionRenderer } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
+import { watchExpressionsAdd, watchExpressionsRemoveAll } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { VariablesRenderer, VisualizedVariableRenderer } from './variablesView.js';
 
 var WatchExpressionsRenderer_1;
@@ -38,10 +40,10 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
         this.needsRefresh = false;
         this.menu = menuService.createMenu(MenuId.DebugWatchContext, contextKeyService);
         this._register(this.menu);
-        this.watchExpressionsUpdatedScheduler = ( (new RunOnceScheduler(() => {
+        this.watchExpressionsUpdatedScheduler = ( new RunOnceScheduler(() => {
             this.needsRefresh = false;
             this.tree.updateChildren();
-        }, 50)));
+        }, 50));
         this.watchExpressionsExist = CONTEXT_WATCH_EXPRESSIONS_EXIST.bindTo(contextKeyService);
         this.variableReadonly = CONTEXT_VARIABLE_IS_READONLY.bindTo(contextKeyService);
         this.watchExpressionsExist.set(this.debugService.getModel().getWatchExpressions().length > 0);
@@ -54,12 +56,12 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
         container.classList.add('debug-watch');
         const treeContainer = renderViewTree(container);
         const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer, this.expressionRenderer);
-        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'WatchExpressions', treeContainer, ( (new WatchExpressionsDelegate())), [
+        this.tree = this.instantiationService.createInstance((WorkbenchAsyncDataTree), 'WatchExpressions', treeContainer, ( new WatchExpressionsDelegate()), [
             expressionsRenderer,
             this.instantiationService.createInstance(VariablesRenderer, this.expressionRenderer),
             this.instantiationService.createInstance(VisualizedVariableRenderer, this.expressionRenderer),
         ], this.instantiationService.createInstance(WatchExpressionsDataSource), {
-            accessibilityProvider: ( (new WatchExpressionsAccessibilityProvider())),
+            accessibilityProvider: ( new WatchExpressionsAccessibilityProvider()),
             identityProvider: { getId: (element) => element.getId() },
             keyboardNavigationLabelProvider: {
                 getKeyboardNavigationLabel: (e) => {
@@ -69,7 +71,7 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
                     return e.name;
                 }
             },
-            dnd: ( (new WatchExpressionsDragAndDrop(this.debugService))),
+            dnd: ( new WatchExpressionsDragAndDrop(this.debugService)),
             overrideStyles: this.getLocationBasedColors().listOverrideStyles
         });
         this._register(this.tree);
@@ -165,10 +167,9 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
         const element = e.element;
         const selection = this.tree.getSelection();
         this.watchItemType.set(element instanceof Expression ? 'expression' : element instanceof Variable ? 'variable' : undefined);
-        const actions = [];
         const attributes = element instanceof Variable ? element.presentationHint?.attributes : undefined;
         this.variableReadonly.set(!!attributes && attributes.indexOf('readOnly') >= 0 || !!element?.presentationHint?.lazy);
-        createAndFillInContextMenuActions(this.menu, { arg: element, shouldForwardArgs: true }, actions);
+        const actions = getFlatContextMenuActions(this.menu.getActions({ arg: element, shouldForwardArgs: true }));
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
             getActions: () => actions,
@@ -176,20 +177,20 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
         });
     }
 };
-WatchExpressionsView = ( (__decorate([
-    ( (__param(1, IContextMenuService))),
-    ( (__param(2, IDebugService))),
-    ( (__param(3, IKeybindingService))),
-    ( (__param(4, IInstantiationService))),
-    ( (__param(5, IViewDescriptorService))),
-    ( (__param(6, IConfigurationService))),
-    ( (__param(7, IContextKeyService))),
-    ( (__param(8, IOpenerService))),
-    ( (__param(9, IThemeService))),
-    ( (__param(10, ITelemetryService))),
-    ( (__param(11, IHoverService))),
-    ( (__param(12, IMenuService)))
-], WatchExpressionsView)));
+WatchExpressionsView = ( __decorate([
+    ( __param(1, IContextMenuService)),
+    ( __param(2, IDebugService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IViewDescriptorService)),
+    ( __param(6, IConfigurationService)),
+    ( __param(7, IContextKeyService)),
+    ( __param(8, IOpenerService)),
+    ( __param(9, IThemeService)),
+    ( __param(10, ITelemetryService)),
+    ( __param(11, IHoverService)),
+    ( __param(12, IMenuService))
+], WatchExpressionsView));
 class WatchExpressionsDelegate {
     getHeight(_element) {
         return 22;
@@ -216,9 +217,9 @@ class WatchExpressionsDataSource extends AbstractExpressionDataSource {
             const debugService = element;
             const watchExpressions = debugService.getModel().getWatchExpressions();
             const viewModel = debugService.getViewModel();
-            return Promise.all(( (watchExpressions.map(we => !!we.name && !useCachedEvaluation
+            return Promise.all(( watchExpressions.map(we => !!we.name && !useCachedEvaluation
                 ? we.evaluate(viewModel.focusedSession, viewModel.focusedStackFrame, 'watch').then(() => we)
-                : Promise.resolve(we)))));
+                : Promise.resolve(we))));
         }
         return element.getChildren();
     }
@@ -282,7 +283,7 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         if (settingValue) {
             return {
                 initialValue: expression.value,
-                ariaLabel: ( localize(6104, "Type new value")),
+                ariaLabel: ( localize(5487, "Type new value")),
                 onFinish: async (value, success) => {
                     if (success && value) {
                         const focusedFrame = this.debugService.getViewModel().focusedStackFrame;
@@ -296,8 +297,8 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         }
         return {
             initialValue: expression.name ? expression.name : '',
-            ariaLabel: ( localize(6105, "Type watch expression")),
-            placeholder: ( localize(6106, "Expression to watch")),
+            ariaLabel: ( localize(5488, "Type watch expression")),
+            placeholder: ( localize(5489, "Expression to watch")),
             onFinish: (value, success) => {
                 if (success && value) {
                     this.debugService.renameWatchExpression(expression.getId(), value);
@@ -315,21 +316,20 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         const contextKeyService = getContextForWatchExpressionMenu(this.contextKeyService, expression);
         const context = expression;
         const menu = this.menuService.getMenuActions(MenuId.DebugWatchContext, contextKeyService, { arg: context, shouldForwardArgs: false });
-        const primary = [];
-        createAndFillInContextMenuActions(menu, { primary, secondary: [] }, 'inline');
+        const { primary } = getContextMenuActions(menu, 'inline');
         actionBar.clear();
         actionBar.context = context;
         actionBar.push(primary, { icon: true, label: false });
     }
 };
-WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( (__decorate([
-    ( (__param(1, IMenuService))),
-    ( (__param(2, IContextKeyService))),
-    ( (__param(3, IDebugService))),
-    ( (__param(4, IContextViewService))),
-    ( (__param(5, IHoverService))),
-    ( (__param(6, IConfigurationService)))
-], WatchExpressionsRenderer)));
+WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( __decorate([
+    ( __param(1, IMenuService)),
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IDebugService)),
+    ( __param(4, IContextViewService)),
+    ( __param(5, IHoverService)),
+    ( __param(6, IConfigurationService))
+], WatchExpressionsRenderer));
 function getContextForWatchExpressionMenu(parentContext, expression) {
     return parentContext.createOverlay([
         [CONTEXT_CAN_VIEW_MEMORY.key, expression.memoryReference !== undefined],
@@ -338,13 +338,13 @@ function getContextForWatchExpressionMenu(parentContext, expression) {
 }
 class WatchExpressionsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(6107, "Debug Watch Expressions"));
+        return localize(5490, "Debug Watch Expressions");
     }
     getAriaLabel(element) {
         if (element instanceof Expression) {
-            return ( localize(6108, "{0}, value {1}", element.name, element.value));
+            return localize(5491, "{0}, value {1}", element.name, element.value);
         }
-        return ( localize(6109, "{0}, value {1}", element.name, element.value));
+        return localize(5492, "{0}, value {1}", element.name, element.value);
     }
 }
 class WatchExpressionsDragAndDrop {
@@ -361,22 +361,22 @@ class WatchExpressionsDragAndDrop {
         }
         let dropEffectPosition = undefined;
         if (targetIndex === undefined) {
-            dropEffectPosition = "drop-target-after" ;
+            dropEffectPosition = ListDragOverEffectPosition.After;
             targetIndex = -1;
         }
         else {
             switch (targetSector) {
-                case 0 :
-                case 1 :
-                    dropEffectPosition = "drop-target-before" ;
+                case ListViewTargetSector.TOP:
+                case ListViewTargetSector.CENTER_TOP:
+                    dropEffectPosition = ListDragOverEffectPosition.Before;
                     break;
-                case 2 :
-                case 3 :
-                    dropEffectPosition = "drop-target-after" ;
+                case ListViewTargetSector.CENTER_BOTTOM:
+                case ListViewTargetSector.BOTTOM:
+                    dropEffectPosition = ListDragOverEffectPosition.After;
                     break;
             }
         }
-        return { accept: true, effect: { type: 1 , position: dropEffectPosition }, feedback: [targetIndex] };
+        return { accept: true, effect: { type: ListDragOverEffectType.Move, position: dropEffectPosition }, feedback: [targetIndex] };
     }
     getDragURI(element) {
         if (!(element instanceof Expression) || element === this.debugService.getViewModel().getSelectedExpression()?.expression) {
@@ -396,7 +396,7 @@ class WatchExpressionsDragAndDrop {
         }
         const draggedElement = data.elements[0];
         if (!(draggedElement instanceof Expression)) {
-            throw ( (new Error('Invalid dragged element')));
+            throw ( new Error('Invalid dragged element'));
         }
         const watches = this.debugService.getModel().getWatchExpressions();
         const sourcePosition = watches.indexOf(draggedElement);
@@ -404,8 +404,8 @@ class WatchExpressionsDragAndDrop {
         if (targetElement instanceof Expression) {
             targetPosition = watches.indexOf(targetElement);
             switch (targetSector) {
-                case 3 :
-                case 2 :
+                case ListViewTargetSector.BOTTOM:
+                case ListViewTargetSector.CENTER_BOTTOM:
                     targetPosition++;
                     break;
             }
@@ -425,7 +425,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'watch.collapse',
             viewId: WATCH_VIEW_ID,
-            title: ( localize(6110, "Collapse All")),
+            title: ( localize(5493, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
@@ -433,7 +433,7 @@ registerAction2(class Collapse extends ViewAction {
                 id: MenuId.ViewTitle,
                 order: 30,
                 group: 'navigation',
-                when: ( (ContextKeyExpr.equals('view', WATCH_VIEW_ID)))
+                when: ( ContextKeyExpr.equals('view', WATCH_VIEW_ID))
             }
         });
     }
@@ -442,7 +442,7 @@ registerAction2(class Collapse extends ViewAction {
     }
 });
 const ADD_WATCH_ID = 'workbench.debug.viewlet.action.addWatchExpression';
-const ADD_WATCH_LABEL = ( localize(6111, "Add Expression"));
+const ADD_WATCH_LABEL = ( localize(5494, "Add Expression"));
 registerAction2(class AddWatchExpressionAction extends Action2 {
     constructor() {
         super({
@@ -453,7 +453,7 @@ registerAction2(class AddWatchExpressionAction extends Action2 {
             menu: {
                 id: MenuId.ViewTitle,
                 group: 'navigation',
-                when: ( (ContextKeyExpr.equals('view', WATCH_VIEW_ID)))
+                when: ( ContextKeyExpr.equals('view', WATCH_VIEW_ID))
             }
         });
     }
@@ -463,7 +463,7 @@ registerAction2(class AddWatchExpressionAction extends Action2 {
     }
 });
 const REMOVE_WATCH_EXPRESSIONS_COMMAND_ID = 'workbench.debug.viewlet.action.removeAllWatchExpressions';
-const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize(6112, "Remove All Expressions"));
+const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize(5495, "Remove All Expressions"));
 registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
     constructor() {
         super({
@@ -476,7 +476,7 @@ registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
                 id: MenuId.ViewTitle,
                 order: 20,
                 group: 'navigation',
-                when: ( (ContextKeyExpr.equals('view', WATCH_VIEW_ID)))
+                when: ( ContextKeyExpr.equals('view', WATCH_VIEW_ID))
             }
         });
     }

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

@@ -0,0 +1,26 @@
+import { ILocalizedString } from "vscode/vscode/vs/platform/action/common/action";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IHoverService } from "vscode/vscode/vs/platform/hover/browser/hover.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IOpenerService } from "vscode/vscode/vs/platform/opener/common/opener.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.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-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+export declare class WelcomeView extends ViewPane {
+    private readonly debugService;
+    private readonly editorService;
+    static readonly ID = "workbench.debug.welcome";
+    static readonly LABEL: ILocalizedString;
+    private debugStartLanguageContext;
+    private debuggerInterestedContext;
+    constructor(options: IViewletViewOptions, themeService: IThemeService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, debugService: IDebugService, editorService: IEditorService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, openerService: IOpenerService, storageSevice: IStorageService, telemetryService: ITelemetryService, hoverService: IHoverService);
+    shouldShowWelcome(): boolean;
+}

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

@@ -1,43 +1,45 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isMacintosh, isWeb } from 'vscode/vscode/vs/base/common/platform';
+import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { localize2, localize } from 'vscode/vscode/vs/nls';
-import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { Extensions, ViewContentGroups } from 'vscode/vscode/vs/workbench/common/views';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vscode/vscode/vs/workbench/browser/actions/workspaceActions';
-import { isMacintosh, isWeb } from 'vscode/vscode/vs/base/common/platform';
-import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { DEBUG_START_COMMAND_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { OpenFileFolderAction, OpenFileAction, OpenFolderAction } from '@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common/vscode/vs/workbench/browser/actions/workspaceActions';
+import { ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { Extensions, ViewContentGroups } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
+import { DEBUG_START_COMMAND_ID, DEBUG_CONFIGURE_COMMAND_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 
 const debugStartLanguageKey = 'debugStartLanguage';
-const CONTEXT_DEBUG_START_LANGUAGE = ( (new RawContextKey(debugStartLanguageKey, undefined)));
-const CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR = ( (new RawContextKey('debuggerInterestedInActiveEditor', false)));
+const CONTEXT_DEBUG_START_LANGUAGE = ( new RawContextKey(debugStartLanguageKey, undefined));
+const CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR = ( new RawContextKey('debuggerInterestedInActiveEditor', false));
 let WelcomeView = class WelcomeView extends ViewPane {
     static { this.ID = 'workbench.debug.welcome'; }
-    static { this.LABEL = ( localize2(6113, "Run")); }
+    static { this.LABEL = ( localize2(5496, "Run")); }
     constructor(options, themeService, keybindingService, contextMenuService, configurationService, contextKeyService, debugService, editorService, instantiationService, viewDescriptorService, openerService, storageSevice, telemetryService, hoverService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.debugService = debugService;
         this.editorService = editorService;
         this.debugStartLanguageContext = CONTEXT_DEBUG_START_LANGUAGE.bindTo(contextKeyService);
         this.debuggerInterestedContext = CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR.bindTo(contextKeyService);
-        const lastSetLanguage = storageSevice.get(debugStartLanguageKey, 1 );
+        const lastSetLanguage = storageSevice.get(debugStartLanguageKey, StorageScope.WORKSPACE);
         this.debugStartLanguageContext.set(lastSetLanguage);
         const setContextKey = () => {
             let editorControl = this.editorService.activeTextEditorControl;
@@ -50,13 +52,13 @@ let WelcomeView = class WelcomeView extends ViewPane {
                 if (language && this.debugService.getAdapterManager().someDebuggerInterestedInLanguage(language)) {
                     this.debugStartLanguageContext.set(language);
                     this.debuggerInterestedContext.set(true);
-                    storageSevice.store(debugStartLanguageKey, language, 1 , 1 );
+                    storageSevice.store(debugStartLanguageKey, language, StorageScope.WORKSPACE, StorageTarget.MACHINE);
                     return;
                 }
             }
             this.debuggerInterestedContext.set(false);
         };
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         this._register(disposables);
         this._register(editorService.onDidActiveEditorChange(() => {
             disposables.clear();
@@ -83,77 +85,62 @@ let WelcomeView = class WelcomeView extends ViewPane {
         return true;
     }
 };
-WelcomeView = ( (__decorate([
-    ( (__param(1, IThemeService))),
-    ( (__param(2, IKeybindingService))),
-    ( (__param(3, IContextMenuService))),
-    ( (__param(4, IConfigurationService))),
-    ( (__param(5, IContextKeyService))),
-    ( (__param(6, IDebugService))),
-    ( (__param(7, IEditorService))),
-    ( (__param(8, IInstantiationService))),
-    ( (__param(9, IViewDescriptorService))),
-    ( (__param(10, IOpenerService))),
-    ( (__param(11, IStorageService))),
-    ( (__param(12, ITelemetryService))),
-    ( (__param(13, IHoverService)))
-], WelcomeView)));
-const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
+WelcomeView = ( __decorate([
+    ( __param(1, IThemeService)),
+    ( __param(2, IKeybindingService)),
+    ( __param(3, IContextMenuService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IDebugService)),
+    ( __param(7, IEditorService)),
+    ( __param(8, IInstantiationService)),
+    ( __param(9, IViewDescriptorService)),
+    ( __param(10, IOpenerService)),
+    ( __param(11, IStorageService)),
+    ( __param(12, ITelemetryService)),
+    ( __param(13, IHoverService))
+], WelcomeView));
+const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6114,
+        5497,
         "[Open a file](command:{0}) which can be debugged or run.",
         (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFileAction.ID
     )),
-    when: ( (ContextKeyExpr.and(
-        CONTEXT_DEBUGGERS_AVAILABLE,
-         (CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR.toNegated())
-    ))),
+    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR.toNegated()))),
     group: ViewContentGroups.Open,
 });
 let debugKeybindingLabel = '';
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${( localize(6115, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
+    content: `[${( localize(5498, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
     when: CONTEXT_DEBUGGERS_AVAILABLE,
     group: ViewContentGroups.Debug,
     order: 1
 });
-viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${( localize(6116, "Show all automatic debug configurations"))}](command:${SELECT_AND_START_ID}).`,
-    when: CONTEXT_DEBUGGERS_AVAILABLE,
-    group: ViewContentGroups.Debug,
-    order: 10
-});
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6117,
+        5499,
         "To customize Run and Debug [create a launch.json file](command:{0}).",
-        DEBUG_CONFIGURE_COMMAND_ID
+        `${DEBUG_CONFIGURE_COMMAND_ID}?${encodeURIComponent(JSON.stringify([{ addNew: true }]))}`
     )),
-    when: ( (ContextKeyExpr.and(
-        CONTEXT_DEBUGGERS_AVAILABLE,
-         (WorkbenchStateContext.notEqualsTo('empty'))
-    ))),
+    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( WorkbenchStateContext.notEqualsTo('empty')))),
     group: ViewContentGroups.Debug
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6118,
+        5500,
         "To customize Run and Debug, [open a folder](command:{0}) and create a launch.json file.",
         (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID
     )),
-    when: ( (ContextKeyExpr.and(
-        CONTEXT_DEBUGGERS_AVAILABLE,
-         (WorkbenchStateContext.isEqualTo('empty'))
-    ))),
+    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( WorkbenchStateContext.isEqualTo('empty')))),
     group: ViewContentGroups.Debug
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6119,
+        5501,
         "All debug extensions are disabled. Enable a debug extension or install a new one from the Marketplace."
     )),
-    when: ( (CONTEXT_DEBUG_EXTENSION_AVAILABLE.toNegated())),
+    when: ( CONTEXT_DEBUG_EXTENSION_AVAILABLE.toNegated()),
     group: ViewContentGroups.Debug
 });
 

package/vscode/src/vs/workbench/contrib/debug/common/breakpoints.d.ts

@@ -0,0 +1,10 @@
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IBreakpointContribution } from "vscode/vscode/vs/workbench/contrib/debug/common/debug";
+export declare class Breakpoints {
+    private readonly breakpointContribution;
+    private readonly contextKeyService;
+    private breakpointsWhen;
+    constructor(breakpointContribution: IBreakpointContribution, contextKeyService: IContextKeyService);
+    get language(): string;
+    get enabled(): boolean;
+}

package/vscode/src/vs/workbench/contrib/debug/common/breakpoints.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 

package/vscode/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.d.ts

@@ -0,0 +1,16 @@
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IAccessibilityService } from "vscode/vscode/vs/platform/accessibility/common/accessibility.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+export declare class DebugWatchAccessibilityAnnouncer extends Disposable implements IWorkbenchContribution {
+    private readonly _debugService;
+    private readonly _logService;
+    private readonly _accessibilityService;
+    private readonly _configurationService;
+    static ID: string;
+    private readonly _listener;
+    constructor(_debugService: IDebugService, _logService: ILogService, _accessibilityService: IAccessibilityService, _configurationService: IConfigurationService);
+    private _setListener;
+}

package/vscode/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.js

@@ -1,10 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { Expression } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { Expression } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
 
 let DebugWatchAccessibilityAnnouncer = class DebugWatchAccessibilityAnnouncer extends Disposable {
     static { this.ID = 'workbench.contrib.debugWatchAccessibilityAnnouncer'; }

package/vscode/src/vs/workbench/contrib/debug/common/debugCompoundRoot.d.ts

@@ -0,0 +1,6 @@
+export declare class DebugCompoundRoot {
+    private stopped;
+    private stopEmitter;
+    onDidSessionStop: import("vscode/vscode/vs/base/common/event").Event<void>;
+    sessionStopped(): void;
+}

package/vscode/src/vs/workbench/contrib/debug/common/debugCompoundRoot.js

@@ -1,3 +1,4 @@
+
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 
 class DebugCompoundRoot {

package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.d.ts

@@ -0,0 +1,21 @@
+import { URI as uri } from "vscode/vscode/vs/base/common/uri";
+import { ITextModel } from "vscode/vscode/vs/editor/common/model";
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+import { ILanguageService } from "vscode/vscode/vs/editor/common/languages/language";
+import { ITextModelService, ITextModelContentProvider } from "vscode/vscode/vs/editor/common/services/resolverService";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { IEditorWorkerService } from "vscode/vscode/vs/editor/common/services/editorWorker";
+export declare class DebugContentProvider implements IWorkbenchContribution, ITextModelContentProvider {
+    private readonly debugService;
+    private readonly modelService;
+    private readonly languageService;
+    private readonly editorWorkerService;
+    private static INSTANCE;
+    private readonly pendingUpdates;
+    constructor(textModelResolverService: ITextModelService, debugService: IDebugService, modelService: IModelService, languageService: ILanguageService, editorWorkerService: IEditorWorkerService);
+    dispose(): void;
+    provideTextContent(resource: uri): Promise<ITextModel> | null;
+    static refreshDebugContent(resource: uri): void;
+    private createOrUpdateContentModel;
+}