Improve DebugSessions label computation

also:
* add missing parameter to DebugServiceImpl
* remove unenecessary addition from Theia DebugConfiguration

Co-authored-by: colin-grant-work <[email protected]>

Contributed on behalf of STMicroelectronics

Author: jfaltermeier

packages/debug/src/browser/debug-session.tsx

@@ -749,19 +749,14 @@ export class DebugSession implements CompositeTreeElement {
     }
 
     get label(): string {
-        const showWSFolderInLabel = this.workspaceService.isMultiRootWorkspaceOpened && this.options.workspaceFolderUri;
-        if (showWSFolderInLabel) {
-            const wsFolder = this.labelProvider.getName(new URI(this.options.workspaceFolderUri));
-            if (InternalDebugSessionOptions.is(this.options) && this.options.id) {
-                return this.configuration.name + ' (' + (this.options.id + 1) + ' - ' + wsFolder + ')';
-            }
-            return this.configuration.name + ' (' + wsFolder + ')';
-        } else {
-            if (InternalDebugSessionOptions.is(this.options) && this.options.id) {
-                return this.configuration.name + ' (' + (this.options.id + 1) + ')';
-            }
-            return this.configuration.name;
+        const suffixes = [];
+        if (InternalDebugSessionOptions.is(this.options) && this.options.id) {
+            suffixes.push(String(this.options.id + 1));
+        }
+        if (this.workspaceService.isMultiRootWorkspaceOpened && this.options.workspaceFolderUri) {
+            suffixes.push(this.labelProvider.getName(new URI(this.options.workspaceFolderUri)));
         }
+        return suffixes.length === 0 ? this.configuration.name : this.configuration.name + `(${suffixes.join(' - ')})`;
     }
 
     get visible(): boolean {

packages/debug/src/common/debug-configuration.ts

@@ -77,9 +77,6 @@ export interface DebugConfiguration {
 
     /** Indicates if it's a dynamic debug configuration */
     dynamic?: boolean;
-
-    /** The worspace folder used for looking up tasks, resolving variables, etc. */
-    workspaceFolderUri?: string;
 }
 export namespace DebugConfiguration {
     export function is(arg: DebugConfiguration | any): arg is DebugConfiguration {

packages/debug/src/node/debug-service-impl.ts

@@ -65,7 +65,7 @@ export class DebugServiceImpl implements DebugService {
     }
 
     protected readonly sessions = new Set<string>();
-    async createDebugSession(config: DebugConfiguration): Promise<string> {
+    async createDebugSession(config: DebugConfiguration, _workspaceFolderUri?: string): Promise<string> {
         const session = await this.sessionManager.create(config, this.registry);
         this.sessions.add(session.id);
         return session.id;