@codingame/monaco-vscode-debug-service-override 9.0.2 → 10.0.0

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

@@ -15,7 +15,6 @@ import { MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/commo
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -26,23 +25,22 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 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 { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { renderViewTree, AbstractExpressionDataSource, AbstractExpressionsRenderer, renderExpressionValue, renderVariable } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
-import { COPY_VALUE_LABEL, COPY_VALUE_ID, COPY_EVALUATE_PATH_LABEL, COPY_EVALUATE_PATH_ID, ADD_TO_WATCH_LABEL, ADD_TO_WATCH_ID } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { LinkDetector } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
-import { CONTEXT_VARIABLES_FOCUSED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, DebugVisualizationType, DataBreakpointSetType, VARIABLES_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
+import { CONTEXT_VARIABLES_FOCUSED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, VARIABLES_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { getContextForVariable } from '../common/debugContext.js';
 import { Variable, VisualizedExpression, Expression, StackFrame, ErrorScope, Scope, getUriForDebugMemory } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { IDebugVisualizerService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers.service';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
-import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { renderViewTree, AbstractExpressionDataSource, AbstractExpressionsRenderer } from './baseDebugView.js';
+import { COPY_VALUE_LABEL, COPY_VALUE_ID, COPY_EVALUATE_PATH_LABEL, COPY_EVALUATE_PATH_ID, ADD_TO_WATCH_LABEL, ADD_TO_WATCH_ID } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
+import { DebugExpressionRenderer } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
 
 var VisualizedVariableRenderer_1, VariablesRenderer_1;
 const $ = $$1;
@@ -83,10 +81,10 @@ let VariablesView = class VariablesView extends ViewPane {
         this.element.classList.add('debug-pane');
         container.classList.add('debug-variables');
         const treeContainer = renderViewTree(container);
-        const linkDetector = this.instantiationService.createInstance(LinkDetector);
+        const expressionRenderer = this.instantiationService.createInstance(DebugExpressionRenderer);
         this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'VariablesView', treeContainer, ( (new VariablesDelegate())), [
-            this.instantiationService.createInstance(VariablesRenderer, linkDetector),
-            this.instantiationService.createInstance(VisualizedVariableRenderer, linkDetector),
+            this.instantiationService.createInstance(VariablesRenderer, expressionRenderer),
+            this.instantiationService.createInstance(VisualizedVariableRenderer, expressionRenderer),
             ( (new ScopesRenderer())),
             ( (new ScopeErrorRenderer())),
         ], this.instantiationService.createInstance(VariablesDataSource), {
@@ -333,9 +331,9 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
             tree.updateChildren(parent, false, false);
         });
     }
-    constructor(linkDetector, debugService, contextViewService, hoverService, menuService, contextKeyService) {
+    constructor(expressionRenderer, debugService, contextViewService, hoverService, menuService, contextKeyService) {
         super(debugService, contextViewService, hoverService);
-        this.linkDetector = linkDetector;
+        this.expressionRenderer = expressionRenderer;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
     }
@@ -353,18 +351,18 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
             text += ':';
         }
         data.label.set(text, highlights, viz.name);
-        renderExpressionValue(data.elementDisposable, viz, data.value, {
+        data.elementDisposable.add(this.expressionRenderer.renderValue(data.value, viz, {
             showChanged: false,
             maxValueLength: 1024,
             colorize: true,
-            linkDetector: this.linkDetector
-        }, this.hoverService);
+            session: expression.getSession(),
+        }));
     }
     getInputBoxOptions(expression) {
         const viz = expression;
         return {
             initialValue: expression.value,
-            ariaLabel: ( localize(6062, "Type new variable value")),
+            ariaLabel: ( localize(6087, "Type new variable value")),
             validationOptions: {
                 validation: () => viz.errorMessage ? ({ content: viz.errorMessage }) : null
             },
@@ -387,7 +385,7 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
         const primary = [];
         createAndFillInContextMenuActions(menu, { primary, secondary: [] }, 'inline');
         if (viz.original) {
-            const action = ( (new Action('debugViz', ( localize(6063, 'Remove Visualizer')), ThemeIcon.asClassName(Codicon.eye), true, () => this.debugService.getViewModel().setVisualizedExpression(viz.original, undefined))));
+            const action = ( (new Action('debugViz', ( localize(6088, 'Remove Visualizer')), ThemeIcon.asClassName(Codicon.eye), true, () => this.debugService.getViewModel().setVisualizedExpression(viz.original, undefined))));
             action.checked = true;
             primary.push(action);
             actionBar.domNode.style.display = 'initial';
@@ -407,37 +405,32 @@ VisualizedVariableRenderer = VisualizedVariableRenderer_1 = ( (__decorate([
 let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRenderer {
     static { VariablesRenderer_1 = this; }
     static { this.ID = 'variable'; }
-    constructor(linkDetector, menuService, contextKeyService, visualization, contextMenuService, commandService, debugService, contextViewService, hoverService, configurationService) {
+    constructor(expressionRenderer, menuService, contextKeyService, visualization, contextMenuService, debugService, contextViewService, hoverService) {
         super(debugService, contextViewService, hoverService);
-        this.linkDetector = linkDetector;
+        this.expressionRenderer = expressionRenderer;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this.visualization = visualization;
         this.contextMenuService = contextMenuService;
-        this.commandService = commandService;
-        this.configurationService = configurationService;
     }
     get templateId() {
         return VariablesRenderer_1.ID;
     }
     renderExpression(expression, data, highlights) {
-        const showType = this.configurationService.getValue('debug').showVariableTypes;
-        renderVariable(data.elementDisposable, this.commandService, this.hoverService, expression, data, true, highlights, this.linkDetector, showType);
+        data.elementDisposable.add(this.expressionRenderer.renderVariable(data, expression, {
+            highlights,
+            showChanged: true,
+        }));
     }
     renderElement(node, index, data) {
         data.elementDisposable.clear();
-        data.elementDisposable.add(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration('debug.showVariableTypes')) {
-                super.renderExpressionElement(node.element, node, data);
-            }
-        }));
         super.renderExpressionElement(node.element, node, data);
     }
     getInputBoxOptions(expression) {
         const variable = expression;
         return {
             initialValue: expression.value,
-            ariaLabel: ( localize(6062, "Type new variable value")),
+            ariaLabel: ( localize(6087, "Type new variable value")),
             validationOptions: {
                 validation: () => variable.errorMessage ? ({ content: variable.errorMessage }) : null
             },
@@ -481,7 +474,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
                 actionBar.push(actions[0], { icon: true, label: false });
             }
             else {
-                actionBar.push(( (new Action('debugViz', ( localize(6064, 'Visualize Variable...')), ThemeIcon.asClassName(Codicon.eye), undefined, () => this.pickVisualizer(actions, originalExpression, data)))), { icon: true, label: false });
+                actionBar.push(( (new Action('debugViz', ( localize(6089, 'Visualize Variable...')), ThemeIcon.asClassName(Codicon.eye), undefined, () => this.pickVisualizer(actions, originalExpression, data)))), { icon: true, label: false });
             }
         });
     }
@@ -497,7 +490,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
             if (token.isCancellationRequested) {
                 return;
             }
-            if (resolved.type === DebugVisualizationType.Command) {
+            if (resolved.type === 0 ) {
                 viz.execute();
             }
             else {
@@ -514,22 +507,20 @@ VariablesRenderer = VariablesRenderer_1 = ( (__decorate([
     ( (__param(2, IContextKeyService))),
     ( (__param(3, IDebugVisualizerService))),
     ( (__param(4, IContextMenuService))),
-    ( (__param(5, ICommandService))),
-    ( (__param(6, IDebugService))),
-    ( (__param(7, IContextViewService))),
-    ( (__param(8, IHoverService))),
-    ( (__param(9, IConfigurationService)))
+    ( (__param(5, IDebugService))),
+    ( (__param(6, IContextViewService))),
+    ( (__param(7, IHoverService)))
 ], VariablesRenderer)));
 class VariablesAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(6065, "Debug Variables"));
+        return ( localize(6090, "Debug Variables"));
     }
     getAriaLabel(element) {
         if (element instanceof Scope) {
-            return ( localize(6066, "Scope {0}", element.name));
+            return ( localize(6091, "Scope {0}", element.name));
         }
         if (element instanceof Variable) {
-            return ( localize(6067, "{0}, value {1}", element.name, element.value));
+            return ( localize(6092, "{0}, value {1}", element.name, element.value));
         }
         return null;
     }
@@ -632,9 +623,9 @@ CommandsRegistry.registerCommand({
 async function tryInstallHexEditor(extensionsWorkbenchService, notificationService) {
     try {
         await extensionsWorkbenchService.install(HEX_EDITOR_EXTENSION_ID, {
-            justification: ( localize(6068, "Inspecting binary data requires this extension.")),
+            justification: ( localize(6093, "Inspecting binary data requires this extension.")),
             enable: true
-        }, ProgressLocation.Notification);
+        }, 15 );
         return true;
     }
     catch (error) {
@@ -648,7 +639,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: DataBreakpointSetType.Variable, dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'write' });
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'write' });
         }
     }
 });
@@ -658,7 +649,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: DataBreakpointSetType.Variable, dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'readWrite' });
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'readWrite' });
         }
     }
 });
@@ -668,7 +659,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: DataBreakpointSetType.Variable, dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'read' });
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'read' });
         }
     }
 });
@@ -697,7 +688,7 @@ registerAction2(class extends ViewAction {
         super({
             id: 'variables.collapse',
             viewId: VARIABLES_VIEW_ID,
-            title: ( localize(6069, "Collapse All")),
+            title: ( localize(6094, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {

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

@@ -1,6 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-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 { ElementsDragAndDropData } 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';
@@ -20,13 +19,13 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { renderViewTree, AbstractExpressionDataSource, AbstractExpressionsRenderer, renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
-import { watchExpressionsAdd, watchExpressionsRemoveAll } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
-import { LinkDetector } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
-import { VariablesRenderer, VisualizedVariableRenderer } from './variablesView.js';
 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 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { renderViewTree, AbstractExpressionDataSource, AbstractExpressionsRenderer } from './baseDebugView.js';
+import { DebugExpressionRenderer } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
+import { watchExpressionsAdd, watchExpressionsRemoveAll } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { VariablesRenderer, VisualizedVariableRenderer } from './variablesView.js';
 
 var WatchExpressionsRenderer_1;
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
@@ -47,18 +46,18 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
         this.variableReadonly = CONTEXT_VARIABLE_IS_READONLY.bindTo(contextKeyService);
         this.watchExpressionsExist.set(this.debugService.getModel().getWatchExpressions().length > 0);
         this.watchItemType = CONTEXT_WATCH_ITEM_TYPE.bindTo(contextKeyService);
+        this.expressionRenderer = instantiationService.createInstance(DebugExpressionRenderer);
     }
     renderBody(container) {
         super.renderBody(container);
         this.element.classList.add('debug-pane');
         container.classList.add('debug-watch');
         const treeContainer = renderViewTree(container);
-        const linkDetector = this.instantiationService.createInstance(LinkDetector);
-        const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer, linkDetector);
+        const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer, this.expressionRenderer);
         this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'WatchExpressions', treeContainer, ( (new WatchExpressionsDelegate())), [
             expressionsRenderer,
-            this.instantiationService.createInstance(VariablesRenderer, linkDetector),
-            this.instantiationService.createInstance(VisualizedVariableRenderer, linkDetector),
+            this.instantiationService.createInstance(VariablesRenderer, this.expressionRenderer),
+            this.instantiationService.createInstance(VisualizedVariableRenderer, this.expressionRenderer),
         ], this.instantiationService.createInstance(WatchExpressionsDataSource), {
             accessibilityProvider: ( (new WatchExpressionsAccessibilityProvider())),
             identityProvider: { getId: (element) => element.getId() },
@@ -226,9 +225,9 @@ class WatchExpressionsDataSource extends AbstractExpressionDataSource {
 let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
     static { WatchExpressionsRenderer_1 = this; }
     static { this.ID = 'watchexpression'; }
-    constructor(linkDetector, menuService, contextKeyService, debugService, contextViewService, hoverService, configurationService) {
+    constructor(expressionRenderer, menuService, contextKeyService, debugService, contextViewService, hoverService, configurationService) {
         super(debugService, contextViewService, hoverService);
-        this.linkDetector = linkDetector;
+        this.expressionRenderer = expressionRenderer;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
@@ -271,18 +270,18 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
             title = expression.value;
         }
         data.label.set(text, highlights, title);
-        renderExpressionValue(data.elementDisposable, expression, data.value, {
+        data.elementDisposable.add(this.expressionRenderer.renderValue(data.value, expression, {
             showChanged: true,
             maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-            linkDetector: this.linkDetector,
-            colorize: true
-        }, this.hoverService);
+            colorize: true,
+            session: expression.getSession(),
+        }));
     }
     getInputBoxOptions(expression, settingValue) {
         if (settingValue) {
             return {
                 initialValue: expression.value,
-                ariaLabel: ( localize(6070, "Type new value")),
+                ariaLabel: ( localize(6095, "Type new value")),
                 onFinish: async (value, success) => {
                     if (success && value) {
                         const focusedFrame = this.debugService.getViewModel().focusedStackFrame;
@@ -296,8 +295,8 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         }
         return {
             initialValue: expression.name ? expression.name : '',
-            ariaLabel: ( localize(6071, "Type watch expression")),
-            placeholder: ( localize(6072, "Expression to watch")),
+            ariaLabel: ( localize(6096, "Type watch expression")),
+            placeholder: ( localize(6097, "Expression to watch")),
             onFinish: (value, success) => {
                 if (success && value) {
                     this.debugService.renameWatchExpression(expression.getId(), value);
@@ -338,13 +337,13 @@ function getContextForWatchExpressionMenu(parentContext, expression) {
 }
 class WatchExpressionsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(6073, "Debug Watch Expressions"));
+        return ( localize(6098, "Debug Watch Expressions"));
     }
     getAriaLabel(element) {
         if (element instanceof Expression) {
-            return ( localize(6074, "{0}, value {1}", element.name, element.value));
+            return ( localize(6099, "{0}, value {1}", element.name, element.value));
         }
-        return ( localize(6075, "{0}, value {1}", element.name, element.value));
+        return ( localize(6100, "{0}, value {1}", element.name, element.value));
     }
 }
 class WatchExpressionsDragAndDrop {
@@ -361,22 +360,22 @@ class WatchExpressionsDragAndDrop {
         }
         let dropEffectPosition = undefined;
         if (targetIndex === undefined) {
-            dropEffectPosition = ListDragOverEffectPosition.After;
+            dropEffectPosition = "drop-target-after" ;
             targetIndex = -1;
         }
         else {
             switch (targetSector) {
-                case ListViewTargetSector.TOP:
-                case ListViewTargetSector.CENTER_TOP:
-                    dropEffectPosition = ListDragOverEffectPosition.Before;
+                case 0 :
+                case 1 :
+                    dropEffectPosition = "drop-target-before" ;
                     break;
-                case ListViewTargetSector.CENTER_BOTTOM:
-                case ListViewTargetSector.BOTTOM:
-                    dropEffectPosition = ListDragOverEffectPosition.After;
+                case 2 :
+                case 3 :
+                    dropEffectPosition = "drop-target-after" ;
                     break;
             }
         }
-        return { accept: true, effect: { type: ListDragOverEffectType.Move, position: dropEffectPosition }, feedback: [targetIndex] };
+        return { accept: true, effect: { type: 1 , position: dropEffectPosition }, feedback: [targetIndex] };
     }
     getDragURI(element) {
         if (!(element instanceof Expression) || element === this.debugService.getViewModel().getSelectedExpression()?.expression) {
@@ -404,8 +403,8 @@ class WatchExpressionsDragAndDrop {
         if (targetElement instanceof Expression) {
             targetPosition = watches.indexOf(targetElement);
             switch (targetSector) {
-                case ListViewTargetSector.BOTTOM:
-                case ListViewTargetSector.CENTER_BOTTOM:
+                case 3 :
+                case 2 :
                     targetPosition++;
                     break;
             }
@@ -425,7 +424,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'watch.collapse',
             viewId: WATCH_VIEW_ID,
-            title: ( localize(6076, "Collapse All")),
+            title: ( localize(6101, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
@@ -442,7 +441,7 @@ registerAction2(class Collapse extends ViewAction {
     }
 });
 const ADD_WATCH_ID = 'workbench.debug.viewlet.action.addWatchExpression';
-const ADD_WATCH_LABEL = ( localize(6077, "Add Expression"));
+const ADD_WATCH_LABEL = ( localize(6102, "Add Expression"));
 registerAction2(class AddWatchExpressionAction extends Action2 {
     constructor() {
         super({
@@ -463,7 +462,7 @@ registerAction2(class AddWatchExpressionAction extends Action2 {
     }
 });
 const REMOVE_WATCH_EXPRESSIONS_COMMAND_ID = 'workbench.debug.viewlet.action.removeAllWatchExpressions';
-const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize(6078, "Remove All Expressions"));
+const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize(6103, "Remove All Expressions"));
 registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
     constructor() {
         super({

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

@@ -19,7 +19,6 @@ import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/context
 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 { 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';
@@ -31,14 +30,14 @@ const CONTEXT_DEBUG_START_LANGUAGE = ( (new RawContextKey(debugStartLanguageKey,
 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(6079, "Run")); }
+    static { this.LABEL = ( localize2(6104, "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, StorageScope.WORKSPACE);
+        const lastSetLanguage = storageSevice.get(debugStartLanguageKey, 1 );
         this.debugStartLanguageContext.set(lastSetLanguage);
         const setContextKey = () => {
             let editorControl = this.editorService.activeTextEditorControl;
@@ -51,7 +50,7 @@ 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, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+                    storageSevice.store(debugStartLanguageKey, language, 1 , 1 );
                     return;
                 }
             }
@@ -102,7 +101,7 @@ WelcomeView = ( (__decorate([
 const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6080,
+        6105,
         "[Open a file](command:{0}) which can be debugged or run.",
         (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFileAction.ID
     )),
@@ -114,20 +113,20 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 let debugKeybindingLabel = '';
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${( localize(6081, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
+    content: `[${( localize(6106, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
     when: CONTEXT_DEBUGGERS_AVAILABLE,
     group: ViewContentGroups.Debug,
     order: 1
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${( localize(6082, "Show all automatic debug configurations"))}](command:${SELECT_AND_START_ID}).`,
+    content: `[${( localize(6107, "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(
-        6083,
+        6108,
         "To customize Run and Debug [create a launch.json file](command:{0}).",
         DEBUG_CONFIGURE_COMMAND_ID
     )),
@@ -139,7 +138,7 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6084,
+        6109,
         "To customize Run and Debug, [open a folder](command:{0}) and create a launch.json file.",
         (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID
     )),
@@ -151,7 +150,7 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 });
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
     content: ( localize(
-        6085,
+        6110,
         "All debug extensions are disabled. Enable a debug extension or install a new one from the Marketplace."
     )),
     when: ( (CONTEXT_DEBUG_EXTENSION_AVAILABLE.toNegated())),

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

@@ -49,14 +49,14 @@ let DebugContentProvider = class DebugContentProvider {
             session = this.debugService.getViewModel().focusedSession;
         }
         if (!session) {
-            return Promise.reject(( (new ErrorNoTelemetry(( localize(6086, "Unable to resolve the resource without a debug session"))))));
+            return Promise.reject(( (new ErrorNoTelemetry(( localize(6111, "Unable to resolve the resource without a debug session"))))));
         }
         const createErrModel = (errMsg) => {
             this.debugService.sourceIsNotAvailable(resource);
             const languageSelection = this.languageService.createById(PLAINTEXT_LANGUAGE_ID);
             const message = errMsg
-                ? ( localize(6087, "Could not load source '{0}': {1}.", resource.path, errMsg))
-                : ( localize(6088, "Could not load source '{0}'.", resource.path));
+                ? ( localize(6112, "Could not load source '{0}': {1}.", resource.path, errMsg))
+                : ( localize(6113, "Could not load source '{0}'.", resource.path));
             return this.modelService.createModel(message, languageSelection, resource);
         };
         return session.loadSource(resource).then(response => {

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

@@ -30,20 +30,20 @@ let DebugLifecycle = class DebugLifecycle {
         let message;
         if (numSessions === 1) {
             message = ( localize(
-                6089,
+                6114,
                 "There is an active debug session, are you sure you want to stop it?"
             ));
         }
         else {
             message = ( localize(
-                6090,
+                6115,
                 "There are active debug sessions, are you sure you want to stop them?"
             ));
         }
         const res = await this.dialogService.confirm({
             message,
             type: 'warning',
-            primaryButton: ( localize(6091, "&&Stop Debugging"))
+            primaryButton: ( localize(6116, "&&Stop Debugging"))
         });
         return !res.confirmed;
     }