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

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

@@ -19,21 +19,25 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IExtensionHostDebugService } from 'vscode/vscode/vs/platform/debug/common/extensionHostDebug.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { FileChangeType } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
+import { EditorsOrder } from 'vscode/vscode/vs/workbench/common/editor';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { AdapterManager } from './debugAdapterManager.js';
 import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 import { ConfigurationManager } from './debugConfigurationManager.js';
 import { DebugMemoryFileSystemProvider } from './debugMemory.js';
 import { DebugSession } from './debugSession.js';
-import { DebugTaskRunner } from './debugTaskRunner.js';
-import { CALLSTACK_VIEW_ID, DEBUG_MEMORY_SCHEME, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_STATE, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_UX, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DISASSEMBLY_VIEW_FOCUS, getStateLabel, debuggerDisabledMessage, VIEWLET_ID, REPL_VIEW_ID, DEBUG_SCHEME } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { DebugTaskRunner, TaskRunResult } from './debugTaskRunner.js';
+import { State, CALLSTACK_VIEW_ID, DEBUG_MEMORY_SCHEME, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_STATE, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_UX, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DISASSEMBLY_VIEW_FOCUS, getStateLabel, debuggerDisabledMessage, VIEWLET_ID, REPL_VIEW_ID, DEBUG_SCHEME } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { DebugCompoundRoot } from '../common/debugCompoundRoot.js';
 import { DebugModel, Breakpoint, FunctionBreakpoint, DataBreakpoint, InstructionBreakpoint } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { Source } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugSource';
@@ -47,6 +51,7 @@ import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 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 { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
@@ -122,7 +127,7 @@ let DebugService = class DebugService {
             }
         }));
         this.disposables.add(Event.any(this.adapterManager.onDidRegisterDebugger, this.configurationManager.onDidSelectConfiguration)(() => {
-            const debugUxValue = (this.state !== 0  || (this.configurationManager.getAllConfigurations().length > 0 && this.adapterManager.hasEnabledDebuggers())) ? 'default' : 'simple';
+            const debugUxValue = (this.state !== State.Inactive || (this.configurationManager.getAllConfigurations().length > 0 && this.adapterManager.hasEnabledDebuggers())) ? 'default' : 'simple';
             this.debugUx.set(debugUxValue);
             this.debugStorage.storeDebugUxState(debugUxValue);
         }));
@@ -153,6 +158,9 @@ let DebugService = class DebugService {
                 }
             }
         }));
+        this.disposables.add(extensionService.onWillStop(evt => {
+            evt.veto(this.stopSession(undefined).then(() => false), ( localizeWithPath(_moduleId, 2, 'Stopping debug sessions...')));
+        }));
         this.initContextKeys(contextKeyService);
     }
     initContextKeys(contextKeyService) {
@@ -195,7 +203,7 @@ let DebugService = class DebugService {
         if (focusedSession) {
             return focusedSession.state;
         }
-        return this.initializing ? 1  : 0 ;
+        return this.initializing ? State.Initializing : State.Inactive;
     }
     get initializingOptions() {
         return this._initializingOptions;
@@ -232,8 +240,8 @@ let DebugService = class DebugService {
         if (this.previousState !== state) {
             this.contextKeyService.bufferChangeEvents(() => {
                 this.debugState.set(getStateLabel(state));
-                this.inDebugMode.set(state !== 0 );
-                const debugUxValue = (((state !== 0  && state !== 1) ) || (this.adapterManager.hasEnabledDebuggers() && this.configurationManager.selectedConfiguration.name)) ? 'default' : 'simple';
+                this.inDebugMode.set(state !== State.Inactive);
+                const debugUxValue = ((state !== State.Inactive && state !== State.Initializing) || (this.adapterManager.hasEnabledDebuggers() && this.configurationManager.selectedConfiguration.name)) ? 'default' : 'simple';
                 this.debugUx.set(debugUxValue);
                 this.debugStorage.storeDebugUxState(debugUxValue);
             });
@@ -262,11 +270,11 @@ let DebugService = class DebugService {
     async startDebugging(launch, configOrName, options, saveBeforeStart = !options?.parentSession) {
         const message = options && options.noDebug ? ( localizeWithPath(
             _moduleId,
-            2,
+            3,
             "Running executes build tasks and program code from your workspace."
         )) : ( localizeWithPath(
             _moduleId,
-            3,
+            4,
             "Debugging executes build tasks and program code from your workspace."
         ));
         const trust = await this.workspaceTrustRequestService.requestWorkspaceTrust({ message });
@@ -298,13 +306,13 @@ let DebugService = class DebugService {
                 if (!compound.configurations) {
                     throw ( (new Error(localizeWithPath(
                         _moduleId,
-                        4,
+                        5,
                         "Compound must have \"configurations\" attribute set in order to start multiple configurations."
                     ))));
                 }
                 if (compound.preLaunchTask) {
                     const taskResult = await this.taskRunner.runTaskAndCheckErrors(launch?.workspace || this.contextService.getWorkspace(), compound.preLaunchTask);
-                    if (taskResult === 0 ) {
+                    if (taskResult === TaskRunResult.Failure) {
                         this.endInitializingState();
                         return false;
                     }
@@ -329,13 +337,13 @@ let DebugService = class DebugService {
                         else {
                             throw ( (new Error(launchesContainingName.length === 0 ? localizeWithPath(
                                 _moduleId,
-                                5,
+                                6,
                                 "Could not find launch configuration '{0}' in the workspace.",
                                 name
                             )
                                 : localizeWithPath(
                                 _moduleId,
-                                6,
+                                7,
                                 "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.",
                                 name
                             ))));
@@ -349,7 +357,7 @@ let DebugService = class DebugService {
                         else {
                             throw ( (new Error(localizeWithPath(
                                 _moduleId,
-                                7,
+                                8,
                                 "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.",
                                 configData.folder,
                                 configData.name,
@@ -366,11 +374,11 @@ let DebugService = class DebugService {
             if (configOrName && !config) {
                 const message = !!launch ? ( localizeWithPath(
                     _moduleId,
-                    8,
+                    9,
                     "Configuration '{0}' is missing in 'launch.json'.",
                     typeof configOrName === 'string' ? configOrName : configOrName.name
                 )) :
-                    ( localizeWithPath(_moduleId, 9, "'launch.json' does not exist for passed workspace folder."));
+                    ( localizeWithPath(_moduleId, 10, "'launch.json' does not exist for passed workspace folder."));
                 throw ( (new Error(message)));
             }
             const result = await this.createSession(launch, config, options);
@@ -427,7 +435,7 @@ let DebugService = class DebugService {
                 }
                 const workspace = launch?.workspace || this.contextService.getWorkspace();
                 const taskResult = await this.taskRunner.runTaskAndCheckErrors(workspace, resolvedConfig.preLaunchTask);
-                if (taskResult === 0 ) {
+                if (taskResult === TaskRunResult.Failure) {
                     return false;
                 }
                 const cfg = await this.configurationManager.resolveDebugConfigurationWithSubstitutedVariables(launch && launch.workspace ? launch.workspace.uri : undefined, resolvedConfig.type, resolvedConfig, initCancellationToken.token);
@@ -444,14 +452,14 @@ let DebugService = class DebugService {
                     if (configByProviders.request !== 'attach' && configByProviders.request !== 'launch') {
                         message = configByProviders.request ? ( localizeWithPath(
                             _moduleId,
-                            10,
+                            11,
                             "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.",
                             'request',
                             configByProviders.request
                         ))
                             : ( localizeWithPath(
                             _moduleId,
-                            11,
+                            12,
                             "Attribute '{0}' is missing from the chosen debug configuration.",
                             'request'
                         ));
@@ -459,18 +467,18 @@ let DebugService = class DebugService {
                     else {
                         message = resolvedConfig.type ? ( localizeWithPath(
                             _moduleId,
-                            12,
+                            13,
                             "Configured debug type '{0}' is not supported.",
                             resolvedConfig.type
                         )) :
                             ( localizeWithPath(
                                 _moduleId,
-                                13,
+                                14,
                                 "Missing property 'type' for the chosen launch configuration."
                             ));
                     }
                     const actionList = [];
-                    actionList.push(( (new Action('installAdditionalDebuggers', ( localizeWithPath(_moduleId, 14, "Install {0} Extension", resolvedConfig.type)), undefined, true, async () => this.commandService.executeCommand('debug.installAdditionalDebuggers', resolvedConfig?.type)))));
+                    actionList.push(( (new Action('installAdditionalDebuggers', ( localizeWithPath(_moduleId, 15, "Install {0} Extension", resolvedConfig.type)), undefined, true, async () => this.commandService.executeCommand('debug.installAdditionalDebuggers', resolvedConfig?.type)))));
                     await this.showError(message, actionList);
                     return false;
                 }
@@ -489,10 +497,10 @@ let DebugService = class DebugService {
                 if (err && err.message) {
                     await this.showError(err.message);
                 }
-                else if (this.contextService.getWorkbenchState() === 1 ) {
+                else if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
                     await this.showError(( localizeWithPath(
                         _moduleId,
-                        15,
+                        16,
                         "The active file can not be debugged. Make sure it is saved and that you have a debug extension installed for that file type."
                     )));
                 }
@@ -512,7 +520,7 @@ let DebugService = class DebugService {
         if (options?.startedByUser && ( (this.model.getSessions().some(s => s.getLabel() === session.getLabel()))) && configuration.resolved.suppressMultipleSessionWarning !== true) {
             const result = await this.dialogService.confirm({ message: ( localizeWithPath(
                 _moduleId,
-                16,
+                17,
                 "'{0}' is already running. Do you want to start another instance?",
                 session.getLabel()
             )) });
@@ -524,7 +532,7 @@ let DebugService = class DebugService {
         this._onWillNewSession.fire(session);
         const openDebug = this.configurationService.getValue('debug').openDebug;
         if (!configuration.resolved.noDebug && (openDebug === 'openOnSessionStart' || (openDebug !== 'neverOpen' && this.viewModel.firstSessionStart)) && !session.suppressDebugView) {
-            await this.paneCompositeService.openPaneComposite(VIEWLET_ID, 0 );
+            await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar);
         }
         try {
             await this.launchOrAttachToSession(session);
@@ -582,12 +590,12 @@ let DebugService = class DebugService {
         const listenerDisposables = ( (new DisposableStore()));
         this.disposables.add(listenerDisposables);
         const sessionRunningScheduler = listenerDisposables.add(( (new RunOnceScheduler(() => {
-            if (session.state === 3  && this.viewModel.focusedSession === session) {
+            if (session.state === State.Running && this.viewModel.focusedSession === session) {
                 this.viewModel.setFocus(undefined, this.viewModel.focusedThread, session, false);
             }
         }, 200))));
         listenerDisposables.add(session.onDidChangeState(() => {
-            if (session.state === 3  && this.viewModel.focusedSession === session) {
+            if (session.state === State.Running && this.viewModel.focusedSession === session) {
                 sessionRunningScheduler.schedule();
             }
             if (session === this.viewModel.focusedSession) {
@@ -604,7 +612,7 @@ let DebugService = class DebugService {
                 if (adapterExitEvent.error) {
                     this.notificationService.error(( localizeWithPath(
                         _moduleId,
-                        17,
+                        18,
                         "Debug adapter process has terminated unexpectedly ({0})",
                         adapterExitEvent.error.message || ( (adapterExitEvent.error.toString()))
                     )));
@@ -612,7 +620,7 @@ let DebugService = class DebugService {
                 this.telemetry.logDebugSessionStop(session, adapterExitEvent);
             }
             const extensionDebugSession = getExtensionHostDebugSession(session);
-            if (extensionDebugSession && extensionDebugSession.state === 3  && extensionDebugSession.configuration.noDebug) {
+            if (extensionDebugSession && extensionDebugSession.state === State.Running && extensionDebugSession.configuration.noDebug) {
                 this.extensionHostDebugService.close(extensionDebugSession.getId());
             }
             if (session.configuration.postDebugTask) {
@@ -627,7 +635,7 @@ let DebugService = class DebugService {
             this.endInitializingState();
             this.cancelTokens(session.getId());
             if (this.configurationService.getValue('debug').closeReadonlyTabsOnEnd) {
-                const editorsToClose = this.editorService.getEditors(1 ).filter(({ editor }) => {
+                const editorsToClose = this.editorService.getEditors(EditorsOrder.SEQUENTIAL).filter(({ editor }) => {
                     return editor.resource?.scheme === DEBUG_SCHEME && session.getId() === Source.getEncodedDebugData(editor.resource).sessionId;
                 });
                 this.editorService.closeEditors(editorsToClose);
@@ -640,8 +648,8 @@ let DebugService = class DebugService {
             }
             if (this.model.getSessions().length === 0) {
                 this.viewModel.setMultiSessionView(false);
-                if (this.layoutService.isVisible("workbench.parts.sidebar" ) && this.configurationService.getValue('debug').openExplorerOnEnd) {
-                    this.paneCompositeService.openPaneComposite(VIEWLET_ID$1, 0 );
+                if (this.layoutService.isVisible(Parts.SIDEBAR_PART) && this.configurationService.getValue('debug').openExplorerOnEnd) {
+                    this.paneCompositeService.openPaneComposite(VIEWLET_ID$1, ViewContainerLocation.Sidebar);
                 }
                 const dataBreakpoints = this.model.getDataBreakpoints().filter(dbp => !dbp.canPersist);
                 dataBreakpoints.forEach(dbp => this.model.removeDataBreakpoints(dbp.getId()));
@@ -662,13 +670,13 @@ let DebugService = class DebugService {
         const isAutoRestart = !!restartData;
         const runTasks = async () => {
             if (isAutoRestart) {
-                return Promise.resolve(1 );
+                return Promise.resolve(TaskRunResult.Success);
             }
             const root = session.root || this.contextService.getWorkspace();
             await this.taskRunner.runTask(root, session.configuration.preRestartTask);
             await this.taskRunner.runTask(root, session.configuration.postDebugTask);
             const taskResult1 = await this.taskRunner.runTaskAndCheckErrors(root, session.configuration.preLaunchTask);
-            if (taskResult1 !== 1 ) {
+            if (taskResult1 !== TaskRunResult.Success) {
                 return taskResult1;
             }
             return this.taskRunner.runTaskAndCheckErrors(root, session.configuration.postRestartTask);
@@ -676,7 +684,7 @@ let DebugService = class DebugService {
         const extensionDebugSession = getExtensionHostDebugSession(session);
         if (extensionDebugSession) {
             const taskResult = await runTasks();
-            if (taskResult === 1 ) {
+            if (taskResult === TaskRunResult.Success) {
                 this.extensionHostDebugService.reload(extensionDebugSession.getId());
             }
             return;
@@ -687,7 +695,6 @@ let DebugService = class DebugService {
         if (launch) {
             unresolved = launch.getConfiguration(session.configuration.name);
             if (unresolved && !equals(unresolved, session.unresolvedConfiguration)) {
-                unresolved.type = session.configuration.type;
                 unresolved.noDebug = session.configuration.noDebug;
                 needsToSubstitute = true;
             }
@@ -700,7 +707,7 @@ let DebugService = class DebugService {
             if (resolvedByProviders) {
                 resolved = await this.substituteVariables(launch, resolvedByProviders);
                 if (resolved && !initCancellationToken.token.isCancellationRequested) {
-                    resolved = await this.configurationManager.resolveDebugConfigurationWithSubstitutedVariables(launch && launch.workspace ? launch.workspace.uri : undefined, unresolved.type, resolved, initCancellationToken.token);
+                    resolved = await this.configurationManager.resolveDebugConfigurationWithSubstitutedVariables(launch && launch.workspace ? launch.workspace.uri : undefined, resolved.type, resolved, initCancellationToken.token);
                 }
             }
             else {
@@ -730,7 +737,7 @@ let DebugService = class DebugService {
         };
         if (session.capabilities.supportsRestartRequest) {
             const taskResult = await runTasks();
-            if (taskResult === 1 ) {
+            if (taskResult === TaskRunResult.Success) {
                 await doRestart(async () => {
                     await session.restart();
                     return true;
@@ -750,7 +757,7 @@ let DebugService = class DebugService {
                  (new Promise((c, e) => {
                     setTimeout(async () => {
                         const taskResult = await runTasks();
-                        if (taskResult !== 1 ) {
+                        if (taskResult !== TaskRunResult.Success) {
                             return c(false);
                         }
                         if (!resolved) {
@@ -841,7 +848,7 @@ let DebugService = class DebugService {
                             const lineContent = control.getModel().getLineContent(lineNumber);
                             alert(( localizeWithPath(
                                 _moduleId,
-                                18,
+                                19,
                                 "{0}, debugging paused {1}, {2}:{3}",
                                 lineContent,
                                 thread && thread.stoppedDetails ? `, reason ${thread.stoppedDetails.reason}` : '',
@@ -916,7 +923,7 @@ let DebugService = class DebugService {
         if (ariaAnnounce) {
             breakpoints.forEach(bp => status(( localizeWithPath(
                 _moduleId,
-                19,
+                20,
                 "Added breakpoint, line {0}, file {1}",
                 bp.lineNumber,
                 uri.fsPath
@@ -943,7 +950,7 @@ let DebugService = class DebugService {
         const toRemove = breakpoints.filter(bp => !id || bp.getId() === id);
         toRemove.forEach(bp => status(( localizeWithPath(
             _moduleId,
-            20,
+            21,
             "Removed breakpoint, line {0}, file {1}",
             bp.lineNumber,
             bp.uri.fsPath
@@ -960,8 +967,13 @@ let DebugService = class DebugService {
         this.model.setBreakpointsActivated(activated);
         return this.sendAllBreakpoints();
     }
-    addFunctionBreakpoint(name, id, mode) {
-        this.model.addFunctionBreakpoint(name || '', id, mode);
+    async addFunctionBreakpoint(opts, id) {
+        this.model.addFunctionBreakpoint(opts ?? { name: '' }, id);
+        if (opts) {
+            this.debugStorage.storeBreakpoints(this.model);
+            await this.sendFunctionBreakpoints();
+            this.debugStorage.storeBreakpoints(this.model);
+        }
     }
     async updateFunctionBreakpoint(id, update) {
         this.model.updateFunctionBreakpoint(id, update);
@@ -1103,13 +1115,13 @@ let DebugService = class DebugService {
         });
     }
     onFileChanges(fileChangesEvent) {
-        const toRemove = this.model.getBreakpoints().filter(bp => fileChangesEvent.contains(bp.originalUri, 2 ));
+        const toRemove = this.model.getBreakpoints().filter(bp => fileChangesEvent.contains(bp.originalUri, FileChangeType.DELETED));
         if (toRemove.length) {
             this.model.removeBreakpoints(toRemove);
         }
         const toSend = [];
         for (const uri of this.breakpointsToSendOnResourceSaved) {
-            if (fileChangesEvent.contains(uri, 0 )) {
+            if (fileChangesEvent.contains(uri, FileChangeType.UPDATED)) {
                 toSend.push(uri);
             }
         }
@@ -1135,7 +1147,7 @@ let DebugService = class DebugService {
             return { threadToContinue, breakpointToRemove };
         };
         const removeTempBreakPoint = (state) => {
-            if (state === 2  || state === 0 ) {
+            if (state === State.Stopped || state === State.Inactive) {
                 if (breakpointToRemove) {
                     this.removeBreakpoints(breakpointToRemove.getId());
                 }
@@ -1144,7 +1156,7 @@ let DebugService = class DebugService {
             return false;
         };
         await addTempBreakPoint();
-        if (this.state === 0 ) {
+        if (this.state === State.Inactive) {
             const { launch, name, getConfig } = this.getConfigurationManager().selectedConfiguration;
             const config = await getConfig();
             const configOrName = config ? Object.assign(deepClone(config), {}) : name;
@@ -1155,7 +1167,7 @@ let DebugService = class DebugService {
             });
             await this.startDebugging(launch, configOrName, undefined, true);
         }
-        if (this.state === 2 ) {
+        if (this.state === State.Stopped) {
             const focusedSession = this.getViewModel().focusedSession;
             if (!focusedSession || !threadToContinue) {
                 return;
@@ -1187,33 +1199,40 @@ let DebugService = class DebugService {
             }))), 2000);
             listener.dispose();
         }
+        let Score;
+        ( ((function(Score) {
+            Score[Score["Focused"] = 0] = "Focused";
+            Score[Score["Verified"] = 1] = "Verified";
+            Score[Score["VerifiedAndPausedInFile"] = 2] = "VerifiedAndPausedInFile";
+            Score[Score["VerifiedAndFocused"] = 3] = "VerifiedAndFocused";
+        })(Score || (Score = {}))));
         let bestThread = viewModel.focusedThread;
-        let bestScore = 0 ;
+        let bestScore = Score.Focused;
         for (const sessionId of breakpoint.sessionsThatVerified) {
             const session = debugModel.getSession(sessionId);
             if (!session) {
                 continue;
             }
             const threads = session.getAllThreads().filter(t => t.stopped);
-            if (bestScore < 3 ) {
+            if (bestScore < Score.VerifiedAndFocused) {
                 if (viewModel.focusedThread && threads.includes(viewModel.focusedThread)) {
                     bestThread = viewModel.focusedThread;
-                    bestScore = 3 ;
+                    bestScore = Score.VerifiedAndFocused;
                 }
             }
-            if (bestScore < 2 ) {
+            if (bestScore < Score.VerifiedAndPausedInFile) {
                 const pausedInThisFile = threads.find(t => {
                     const top = t.getTopStackFrame();
                     return top && this.uriIdentityService.extUri.isEqual(top.source.uri, uri);
                 });
                 if (pausedInThisFile) {
                     bestThread = pausedInThisFile;
-                    bestScore = 2 ;
+                    bestScore = Score.VerifiedAndPausedInFile;
                 }
             }
-            if (bestScore < 1 ) {
+            if (bestScore < Score.Verified) {
                 bestThread = threads[0];
-                bestScore = 2 ;
+                bestScore = Score.VerifiedAndPausedInFile;
             }
         }
         return { thread: bestThread, breakpoint };
@@ -1248,7 +1267,7 @@ function getStackFrameThreadAndSessionToFocus(model, stackFrame, thread, session
         }
         else {
             const sessions = model.getSessions();
-            const stoppedSession = sessions.find(s => s.state === 2 );
+            const stoppedSession = sessions.find(s => s.state === State.Stopped);
             session = stoppedSession || sessions.find(s => s !== avoidSession && s !== avoidSession?.parentSession) || (sessions.length ? sessions[0] : undefined);
         }
     }

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

@@ -19,11 +19,13 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { TelemetryLevel } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { ITelemetryService, ICustomEndpointTelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { RawDebugSession } from './rawDebugSession.js';
-import { VIEWLET_ID, isFrameDeemphasized } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { State, VIEWLET_ID, isFrameDeemphasized } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { MemoryRegion, ExpressionContainer, Thread } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { Source } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugSource';
@@ -99,7 +101,7 @@ let DebugSession = class DebugSession {
             toDispose.add(compoundRoot.onDidSessionStop(() => this.terminate()));
         }
         this.passFocusScheduler = ( (new RunOnceScheduler(() => {
-            if (( (this.debugService.getModel().getSessions().some(s => s.state === 2 ))) || ( (this.getAllThreads().some(t => t.stopped)))) {
+            if (( (this.debugService.getModel().getSessions().some(s => s.state === State.Stopped))) || ( (this.getAllThreads().some(t => t.stopped)))) {
                 if (typeof this.lastContinuedThreadId === 'number') {
                     const thread = this.debugService.getViewModel().focusedThread;
                     if (thread && thread.threadId === this.lastContinuedThreadId && !thread.stopped) {
@@ -110,7 +112,7 @@ let DebugSession = class DebugSession {
                 }
                 else {
                     const session = this.debugService.getViewModel().focusedSession;
-                    if (session && session.getId() === this.getId() && session.state !== 2 ) {
+                    if (session && session.getId() === this.getId() && session.state !== State.Stopped) {
                         this.debugService.focusStackFrame(undefined);
                     }
                 }
@@ -187,19 +189,19 @@ let DebugSession = class DebugSession {
     }
     get state() {
         if (!this.initialized) {
-            return 1 ;
+            return State.Initializing;
         }
         if (!this.raw) {
-            return 0 ;
+            return State.Inactive;
         }
         const focusedThread = this.debugService.getViewModel().focusedThread;
         if (focusedThread && focusedThread.session === this) {
-            return focusedThread.stopped ? 2  : 3 ;
+            return focusedThread.stopped ? State.Stopped : State.Running;
         }
         if (( (this.getAllThreads().some(t => t.stopped)))) {
-            return 2 ;
+            return State.Stopped;
         }
-        return 3 ;
+        return State.Running;
     }
     get capabilities() {
         return this.raw ? this.raw.capabilities : Object.create(null);
@@ -282,7 +284,7 @@ let DebugSession = class DebugSession {
                 'launch or attach'
             ))));
         }
-        if (this.parentSession && this.parentSession.state === 0 ) {
+        if (this.parentSession && this.parentSession.state === State.Inactive) {
             throw canceled();
         }
         config.__sessionId = this.getId();
@@ -1000,7 +1002,7 @@ let DebugSession = class DebugSession {
                 }
                 if (event.body.category === 'telemetry') {
                     const telemetryEndpoint = this.raw.dbgr.getCustomTelemetryEndpoint();
-                    if (telemetryEndpoint && this.telemetryService.telemetryLevel !== 0 ) {
+                    if (telemetryEndpoint && this.telemetryService.telemetryLevel !== TelemetryLevel.NONE) {
                         let data = event.body.data;
                         if (!telemetryEndpoint.sendErrorTelemetry && event.body.data) {
                             data = filterExceptionsFromTelemetry(event.body.data);
@@ -1143,7 +1145,7 @@ let DebugSession = class DebugSession {
                         }
                         if (thread.stoppedDetails && !token.isCancellationRequested) {
                             if (thread.stoppedDetails.reason === 'breakpoint' && this.configurationService.getValue('debug').openDebug === 'openOnDebugBreak' && !this.suppressDebugView) {
-                                await this.paneCompositeService.openPaneComposite(VIEWLET_ID, 0 );
+                                await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar);
                             }
                             if (this.configurationService.getValue('debug').focusWindowOnBreak && !this.workbenchEnvironmentService.extensionTestsLocationURI) {
                                 const activeWindow = getActiveWindow();

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

@@ -1,8 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 
 const _moduleId = "vs/workbench/contrib/debug/browser/debugStatus";
@@ -12,7 +14,7 @@ let DebugStatusContribution = class DebugStatusContribution {
         this.debugService = debugService;
         this.toDispose = [];
         const addStatusBarEntry = () => {
-            this.entryAccessor = this.statusBarService.addEntry(this.entry, 'status.debug', 0 , 30 );
+            this.entryAccessor = this.statusBarService.addEntry(this.entry, 'status.debug', StatusbarAlignment.LEFT, 30 );
         };
         const setShowInStatusBar = () => {
             this.showInStatusBar = configurationService.getValue('debug').showInStatusBar;
@@ -22,7 +24,7 @@ let DebugStatusContribution = class DebugStatusContribution {
         };
         setShowInStatusBar();
         this.toDispose.push(this.debugService.onDidChangeState(state => {
-            if (state !== 0  && this.showInStatusBar === 'onFirstSessionStart' && !this.entryAccessor) {
+            if (state !== State.Inactive && this.showInStatusBar === 'onFirstSessionStart' && !this.entryAccessor) {
                 addStatusBarEntry();
             }
         }));