@codingame/monaco-vscode-debug-service-override 5.3.0 → 6.0.1

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

@@ -6,6 +6,7 @@ import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { HistoryNavigator } from 'vscode/vscode/vs/base/common/history';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { removeAnsiEscapeCodes } from 'vscode/vscode/vs/base/common/strings';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
@@ -15,10 +16,10 @@ import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { EditorAction, registerEditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
+import { EDITOR_FONT_DEFAULTS, EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { CompletionItemKinds } from 'vscode/vscode/vs/editor/common/languages';
+import { CompletionItemInsertTextRule, CompletionItemKinds, CompletionItemKind } from 'vscode/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ITextResourcePropertiesService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
@@ -36,9 +37,11 @@ import { registerAndCreateHistoryNavigationContext } from 'vscode/vscode/vs/plat
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+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 { resolveColorValue } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
@@ -62,7 +65,7 @@ import { debugConsoleEvaluationPrompt, debugConsoleClearAll } from 'vscode/vscod
 import { LinkDetector } from './linkDetector.js';
 import { ReplFilter } from './replFilter.js';
 import { ReplDelegate, ReplVariablesRenderer, ReplOutputElementRenderer, ReplEvaluationInputsRenderer, ReplGroupRenderer, ReplEvaluationResultsRenderer, ReplRawObjectsRenderer, ReplDataSource, ReplAccessibilityProvider } from './replViewer.js';
-import { DEBUG_SCHEME, CONTEXT_MULTI_SESSION_REPL, CONTEXT_IN_DEBUG_REPL, REPL_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { DEBUG_SCHEME, CONTEXT_MULTI_SESSION_REPL, State, CONTEXT_IN_DEBUG_REPL, REPL_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplGroup, ReplEvaluationResult } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
@@ -89,13 +92,13 @@ let Repl = class Repl extends FilterViewPane {
     static { this.REFRESH_DELAY = 50; }
     static { this.URI = ( URI.parse(`${DEBUG_SCHEME}:replinput`)); }
     constructor(options, debugService, instantiationService, storageService, themeService, modelService, contextKeyService, codeEditorService, viewDescriptorService, contextMenuService, configurationService, textResourcePropertiesService, editorService, keybindingService, openerService, telemetryService, hoverService, menuService, languageFeaturesService, logService) {
-        const filterText = storageService.get(FILTER_VALUE_STORAGE_KEY, 1 , '');
+        const filterText = storageService.get(FILTER_VALUE_STORAGE_KEY, StorageScope.WORKSPACE, '');
         super({
             ...options,
             filterOptions: {
                 placeholder: ( localizeWithPath(_moduleId, 0, "Filter (e.g. text, !exclude, \\escape)")),
                 text: filterText,
-                history: JSON.parse(storageService.get(FILTER_HISTORY_STORAGE_KEY, 1 , '[]')),
+                history: JSON.parse(storageService.get(FILTER_HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')),
             }
         }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.debugService = debugService;
@@ -112,7 +115,7 @@ let Repl = class Repl extends FilterViewPane {
         this.menu = menuService.createMenu(MenuId.DebugConsoleContext, contextKeyService);
         this._register(this.menu);
         this.history = ( (new HistoryNavigator(
-            JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, 1 , '[]')),
+            JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')),
             50
         )));
         this.filter = ( (new ReplFilter()));
@@ -137,7 +140,7 @@ let Repl = class Repl extends FilterViewPane {
         }));
         this._register(this.debugService.onWillNewSession(async (newSession) => {
             const input = this.tree?.getInput();
-            if (!input || input.state === 0 ) {
+            if (!input || input.state === State.Inactive) {
                 await this.selectSession(newSession);
             }
             this.multiSessionRepl.set(this.isMultiSessionView);
@@ -218,7 +221,7 @@ let Repl = class Repl extends FilterViewPane {
                                         let insertTextRules = undefined;
                                         let insertText = item.text || item.label;
                                         if (typeof item.selectionStart === 'number') {
-                                            insertTextRules = 4 ;
+                                            insertTextRules = CompletionItemInsertTextRule.InsertAsSnippet;
                                             const selectionLength = typeof item.selectionLength === 'number' ? item.selectionLength : 0;
                                             const placeholder = selectionLength > 0 ? '${1:' + insertText.substring(item.selectionStart, item.selectionStart + selectionLength) + '}$0' : '$0';
                                             insertText = insertText.substring(0, item.selectionStart) + placeholder + insertText.substring(item.selectionStart + selectionLength);
@@ -242,7 +245,7 @@ let Repl = class Repl extends FilterViewPane {
                                 history.forEach((h, i) => suggestions.push({
                                     label: h,
                                     insertText: h,
-                                    kind: 18 ,
+                                    kind: CompletionItemKind.Text,
                                     range: computeRange(h.length),
                                     sortText: 'ZZZ' + String(history.length - i).padStart(idxLength, '0')
                                 }));
@@ -264,7 +267,7 @@ let Repl = class Repl extends FilterViewPane {
     }
     get isReadonly() {
         const session = this.tree?.getInput();
-        if (session && session.state !== 0 ) {
+        if (session && session.state !== State.Inactive) {
             return false;
         }
         return true;
@@ -306,7 +309,7 @@ let Repl = class Repl extends FilterViewPane {
                 lineHeight: this.replOptions.replConfiguration.lineHeight,
                 fontFamily: this.replOptions.replConfiguration.fontFamily === 'default' ? EDITOR_FONT_DEFAULTS.fontFamily : this.replOptions.replConfiguration.fontFamily
             });
-            const replInputLineHeight = this.replInput.getOption(67 );
+            const replInputLineHeight = this.replInput.getOption(EditorOption.lineHeight);
             this.styleElement.textContent = `
 				.repl .repl-input-wrapper .repl-input-chevron {
 					line-height: ${replInputLineHeight}px
@@ -369,7 +372,7 @@ let Repl = class Repl extends FilterViewPane {
         const session = this.tree?.getInput();
         if (session) {
             session.removeReplExpressions();
-            if (session.state === 0 ) {
+            if (session.state === State.Inactive) {
                 sessionsToIgnore.add(session);
                 await this.selectSession();
                 this.multiSessionRepl.set(this.isMultiSessionView);
@@ -636,24 +639,24 @@ let Repl = class Repl extends FilterViewPane {
     saveState() {
         const replHistory = this.history.getHistory();
         if (replHistory.length) {
-            this.storageService.store(HISTORY_STORAGE_KEY, JSON.stringify(replHistory), 1 , 1 );
+            this.storageService.store(HISTORY_STORAGE_KEY, JSON.stringify(replHistory), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(HISTORY_STORAGE_KEY, 1 );
+            this.storageService.remove(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE);
         }
         const filterHistory = this.filterWidget.getHistory();
         if (filterHistory.length) {
-            this.storageService.store(FILTER_HISTORY_STORAGE_KEY, JSON.stringify(filterHistory), 1 , 1 );
+            this.storageService.store(FILTER_HISTORY_STORAGE_KEY, JSON.stringify(filterHistory), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(FILTER_HISTORY_STORAGE_KEY, 1 );
+            this.storageService.remove(FILTER_HISTORY_STORAGE_KEY, StorageScope.WORKSPACE);
         }
         const filterValue = this.filterWidget.getFilterText();
         if (filterValue) {
-            this.storageService.store(FILTER_VALUE_STORAGE_KEY, filterValue, 1 , 1 );
+            this.storageService.store(FILTER_VALUE_STORAGE_KEY, filterValue, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(FILTER_VALUE_STORAGE_KEY, 1 );
+            this.storageService.remove(FILTER_VALUE_STORAGE_KEY, StorageScope.WORKSPACE);
         }
         super.saveState();
     }
@@ -743,8 +746,8 @@ class AcceptReplInputAction extends EditorAction {
             precondition: CONTEXT_IN_DEBUG_REPL,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 3 ,
-                weight: 100
+                primary: KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -763,8 +766,8 @@ class FilterReplAction extends EditorAction {
             precondition: CONTEXT_IN_DEBUG_REPL,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 36 ,
-                weight: 100
+                primary: KeyMod.CtrlCmd | KeyCode.KeyF,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -828,9 +831,9 @@ registerAction2(class extends ViewAction {
     }
     async runInView(accessor, view, session) {
         const debugService = accessor.get(IDebugService);
-        if (session && session.state !== 0  && session !== debugService.getViewModel().focusedSession) {
-            if (session.state !== 2 ) {
-                const stopppedChildSession = debugService.getModel().getSessions().find(s => s.parentSession === session && s.state === 2 );
+        if (session && session.state !== State.Inactive && session !== debugService.getViewModel().focusedSession) {
+            if (session.state !== State.Stopped) {
+                const stopppedChildSession = debugService.getModel().getSessions().find(s => s.parentSession === session && s.state === State.Stopped);
                 if (stopppedChildSession) {
                     session = stopppedChildSession;
                 }
@@ -893,7 +896,7 @@ registerAction2(class extends ViewAction {
             id: 'debug.replPaste',
             title: ( localizeWithPath(_moduleId, 11, "Paste")),
             viewId: REPL_VIEW_ID,
-            precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(0 )))),
+            precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Inactive)))),
             menu: {
                 id: MenuId.DebugConsoleContext,
                 group: '2_cutcopypaste',

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

@@ -1,5 +1,6 @@
 import { matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
 import { splitGlobAware } from 'vscode/vscode/vs/base/common/glob';
+import { TreeVisibility } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
 import { ReplEvaluationInput, ReplEvaluationResult } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 
@@ -28,7 +29,7 @@ class ReplFilter {
     }
     filter(element, parentVisibility) {
         if (element instanceof ReplEvaluationInput || element instanceof ReplEvaluationResult || element instanceof Variable) {
-            return 1 ;
+            return TreeVisibility.Visible;
         }
         let includeQueryPresent = false;
         let includeQueryMatched = false;
@@ -44,7 +45,7 @@ class ReplFilter {
                 }
             }
         }
-        return includeQueryPresent ? includeQueryMatched : ((typeof parentVisibility !== 'undefined' ? parentVisibility : 1) );
+        return includeQueryPresent ? includeQueryMatched : (typeof parentVisibility !== 'undefined' ? parentVisibility : TreeVisibility.Visible);
     }
 }
 

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { registerColor, asCssVariableName, asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { registerColor, ColorTransformType, asCssVariableName, asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
@@ -11,6 +11,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
+import { State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { STATUS_BAR_FOREGROUND, STATUS_BAR_BORDER, COMMAND_CENTER_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
@@ -51,10 +52,10 @@ const STATUS_BAR_DEBUGGING_BORDER = registerColor('statusBar.debuggingBorder', {
     "Status bar border color separating to the sidebar and editor when a program is being debugged. The status bar is shown in the bottom of the window"
 )));
 const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', {
-    dark: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: 2 , factor: 0.258 },
-    hcDark: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: 2 , factor: 0.258 },
-    light: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: 2 , factor: 0.258 },
-    hcLight: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: 2 , factor: 0.258 }
+    dark: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
+    hcDark: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
+    light: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 },
+    hcLight: { value: STATUS_BAR_DEBUGGING_BACKGROUND, op: ColorTransformType.Transparent, factor: 0.258 }
 }, ( localizeWithPath(
     _moduleId,
     3,
@@ -121,7 +122,7 @@ StatusBarColorProvider = ( (__decorate([
     ( (__param(4, IConfigurationService)))
 ], StatusBarColorProvider)));
 function isStatusbarInDebugMode(state, sessions) {
-    if (state === 0  || state === 1  || sessions.every(s => s.suppressDebugStatusbar || s.configuration?.noDebug)) {
+    if (state === State.Inactive || state === State.Initializing || sessions.every(s => s.suppressDebugStatusbar || s.configuration?.noDebug)) {
         return false;
     }
     return true;

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

@@ -26,6 +26,7 @@ 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';
@@ -33,7 +34,7 @@ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.
 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 './linkDetector.js';
-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 { 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 { 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';
@@ -495,7 +496,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
             if (token.isCancellationRequested) {
                 return;
             }
-            if (resolved.type === 0 ) {
+            if (resolved.type === DebugVisualizationType.Command) {
                 viz.execute();
             }
             else {
@@ -631,7 +632,7 @@ async function tryInstallHexEditor(extensionsWorkbenchService, notificationServi
         await extensionsWorkbenchService.install(HEX_EDITOR_EXTENSION_ID, {
             justification: ( localizeWithPath(_moduleId, 6, "Inspecting binary data requires this extension.")),
             enable: true
-        }, 15 );
+        }, ProgressLocation.Notification);
         return true;
     }
     catch (error) {
@@ -645,7 +646,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'write' });
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: DataBreakpointSetType.Variable, dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'write' });
         }
     }
 });
@@ -655,7 +656,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'readWrite' });
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: DataBreakpointSetType.Variable, dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'readWrite' });
         }
     }
 });
@@ -665,7 +666,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'read' });
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: DataBreakpointSetType.Variable, dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'read' });
         }
     }
 });

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { ElementsDragAndDropData } from 'vscode/vscode/vs/base/browser/ui/list/listView';
+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 { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -338,22 +339,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) {
@@ -381,8 +382,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;
             }

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

@@ -19,6 +19,7 @@ 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';
@@ -38,7 +39,7 @@ let WelcomeView = class WelcomeView extends ViewPane {
         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;
@@ -51,7 +52,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, 1 , 1 );
+                    storageSevice.store(debugStartLanguageKey, language, StorageScope.WORKSPACE, StorageTarget.MACHINE);
                     return;
                 }
             }

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

@@ -8,6 +8,7 @@ import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/arrays';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { Breakpoint, FunctionBreakpoint, ExceptionBreakpoint, DataBreakpoint, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
@@ -32,7 +33,7 @@ let DebugStorage = class DebugStorage extends Disposable {
         this.exceptionBreakpoints = observableValue(this, this.loadExceptionBreakpoints());
         this.dataBreakpoints = observableValue(this, this.loadDataBreakpoints());
         this.watchExpressions = observableValue(this, this.loadWatchExpressions());
-        this._register(storageService.onDidChangeValue(1 , undefined, this._store)(e => {
+        this._register(storageService.onDidChangeValue(StorageScope.WORKSPACE, undefined, this._store)(e => {
             if (e.external) {
                 switch (e.key) {
                     case DEBUG_BREAKPOINTS_KEY:
@@ -50,15 +51,15 @@ let DebugStorage = class DebugStorage extends Disposable {
         }));
     }
     loadDebugUxState() {
-        return this.storageService.get(DEBUG_UX_STATE_KEY, 1 , 'default');
+        return this.storageService.get(DEBUG_UX_STATE_KEY, StorageScope.WORKSPACE, 'default');
     }
     storeDebugUxState(value) {
-        this.storageService.store(DEBUG_UX_STATE_KEY, value, 1 , 1 );
+        this.storageService.store(DEBUG_UX_STATE_KEY, value, StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     loadBreakpoints() {
         let result;
         try {
-            result = ( JSON.parse(this.storageService.get(DEBUG_BREAKPOINTS_KEY, 1 , '[]')).map((breakpoint) => {
+            result = ( JSON.parse(this.storageService.get(DEBUG_BREAKPOINTS_KEY, StorageScope.WORKSPACE, '[]')).map((breakpoint) => {
                 breakpoint.uri = URI.revive(breakpoint.uri);
                 return ( new Breakpoint(
                     breakpoint,
@@ -75,7 +76,7 @@ let DebugStorage = class DebugStorage extends Disposable {
     loadFunctionBreakpoints() {
         let result;
         try {
-            result = ( JSON.parse(this.storageService.get(DEBUG_FUNCTION_BREAKPOINTS_KEY, 1 , '[]')).map((fb) => {
+            result = ( JSON.parse(this.storageService.get(DEBUG_FUNCTION_BREAKPOINTS_KEY, StorageScope.WORKSPACE, '[]')).map((fb) => {
                 return ( new FunctionBreakpoint(fb, fb.id));
             }));
         }
@@ -85,7 +86,7 @@ let DebugStorage = class DebugStorage extends Disposable {
     loadExceptionBreakpoints() {
         let result;
         try {
-            result = ( JSON.parse(this.storageService.get(DEBUG_EXCEPTION_BREAKPOINTS_KEY, 1 , '[]')).map((exBreakpoint) => {
+            result = ( JSON.parse(this.storageService.get(DEBUG_EXCEPTION_BREAKPOINTS_KEY, StorageScope.WORKSPACE, '[]')).map((exBreakpoint) => {
                 return ( new ExceptionBreakpoint(exBreakpoint, exBreakpoint.id));
             }));
         }
@@ -95,7 +96,7 @@ let DebugStorage = class DebugStorage extends Disposable {
     loadDataBreakpoints() {
         let result;
         try {
-            result = ( JSON.parse(this.storageService.get(DEBUG_DATA_BREAKPOINTS_KEY, 1 , '[]')).map((dbp) => {
+            result = ( JSON.parse(this.storageService.get(DEBUG_DATA_BREAKPOINTS_KEY, StorageScope.WORKSPACE, '[]')).map((dbp) => {
                 return ( new DataBreakpoint(dbp, dbp.id));
             }));
         }
@@ -105,7 +106,7 @@ let DebugStorage = class DebugStorage extends Disposable {
     loadWatchExpressions() {
         let result;
         try {
-            result = ( JSON.parse(this.storageService.get(DEBUG_WATCH_EXPRESSIONS_KEY, 1 , '[]')).map((watchStoredData) => {
+            result = ( JSON.parse(this.storageService.get(DEBUG_WATCH_EXPRESSIONS_KEY, StorageScope.WORKSPACE, '[]')).map((watchStoredData) => {
                 return ( new Expression(watchStoredData.name, watchStoredData.id));
             }));
         }
@@ -113,47 +114,47 @@ let DebugStorage = class DebugStorage extends Disposable {
         return result || [];
     }
     loadChosenEnvironments() {
-        return JSON.parse(this.storageService.get(DEBUG_CHOSEN_ENVIRONMENTS_KEY, 1 , '{}'));
+        return JSON.parse(this.storageService.get(DEBUG_CHOSEN_ENVIRONMENTS_KEY, StorageScope.WORKSPACE, '{}'));
     }
     storeChosenEnvironments(environments) {
-        this.storageService.store(DEBUG_CHOSEN_ENVIRONMENTS_KEY, JSON.stringify(environments), 1 , 1 );
+        this.storageService.store(DEBUG_CHOSEN_ENVIRONMENTS_KEY, JSON.stringify(environments), StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     storeWatchExpressions(watchExpressions) {
         if (watchExpressions.length) {
-            this.storageService.store(DEBUG_WATCH_EXPRESSIONS_KEY, JSON.stringify(( watchExpressions.map(we => ({ name: we.name, id: we.getId() })))), 1 , 1 );
+            this.storageService.store(DEBUG_WATCH_EXPRESSIONS_KEY, JSON.stringify(( watchExpressions.map(we => ({ name: we.name, id: we.getId() })))), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(DEBUG_WATCH_EXPRESSIONS_KEY, 1 );
+            this.storageService.remove(DEBUG_WATCH_EXPRESSIONS_KEY, StorageScope.WORKSPACE);
         }
     }
     storeBreakpoints(debugModel) {
         const breakpoints = debugModel.getBreakpoints();
         if (breakpoints.length) {
-            this.storageService.store(DEBUG_BREAKPOINTS_KEY, JSON.stringify(breakpoints), 1 , 1 );
+            this.storageService.store(DEBUG_BREAKPOINTS_KEY, JSON.stringify(breakpoints), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(DEBUG_BREAKPOINTS_KEY, 1 );
+            this.storageService.remove(DEBUG_BREAKPOINTS_KEY, StorageScope.WORKSPACE);
         }
         const functionBreakpoints = debugModel.getFunctionBreakpoints();
         if (functionBreakpoints.length) {
-            this.storageService.store(DEBUG_FUNCTION_BREAKPOINTS_KEY, JSON.stringify(functionBreakpoints), 1 , 1 );
+            this.storageService.store(DEBUG_FUNCTION_BREAKPOINTS_KEY, JSON.stringify(functionBreakpoints), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(DEBUG_FUNCTION_BREAKPOINTS_KEY, 1 );
+            this.storageService.remove(DEBUG_FUNCTION_BREAKPOINTS_KEY, StorageScope.WORKSPACE);
         }
         const dataBreakpoints = debugModel.getDataBreakpoints().filter(dbp => dbp.canPersist);
         if (dataBreakpoints.length) {
-            this.storageService.store(DEBUG_DATA_BREAKPOINTS_KEY, JSON.stringify(dataBreakpoints), 1 , 1 );
+            this.storageService.store(DEBUG_DATA_BREAKPOINTS_KEY, JSON.stringify(dataBreakpoints), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(DEBUG_DATA_BREAKPOINTS_KEY, 1 );
+            this.storageService.remove(DEBUG_DATA_BREAKPOINTS_KEY, StorageScope.WORKSPACE);
         }
         const exceptionBreakpoints = debugModel.getExceptionBreakpoints();
         if (exceptionBreakpoints.length) {
-            this.storageService.store(DEBUG_EXCEPTION_BREAKPOINTS_KEY, JSON.stringify(exceptionBreakpoints), 1 , 1 );
+            this.storageService.store(DEBUG_EXCEPTION_BREAKPOINTS_KEY, JSON.stringify(exceptionBreakpoints), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(DEBUG_EXCEPTION_BREAKPOINTS_KEY, 1 );
+            this.storageService.remove(DEBUG_EXCEPTION_BREAKPOINTS_KEY, StorageScope.WORKSPACE);
         }
     }
 };

package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js

@@ -3,6 +3,8 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isUndefinedOrNull, isString } from 'vscode/vscode/vs/base/common/types';
 import { isCodeEditor, isDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { AbstractVariableResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/variableResolver';
 
@@ -131,15 +133,15 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
             return Promise.resolve(undefined);
         }
         let inputs = [];
-        if (this.workspaceContextService.getWorkbenchState() !== 1  && section) {
+        if (this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && section) {
             const overrides = folder ? { resource: folder.uri } : {};
             const result = this.configurationService.inspect(section, overrides);
             if (result && (result.userValue || result.workspaceValue || result.workspaceFolderValue)) {
                 switch (target) {
-                    case 2 :
+                    case ConfigurationTarget.USER:
                         inputs = result.userValue?.inputs;
                         break;
-                    case 5 :
+                    case ConfigurationTarget.WORKSPACE:
                         inputs = result.workspaceValue?.inputs;
                         break;
                     default: inputs = result.workspaceFolderValue?.inputs;

package/vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';