optimised SimulatorFocus usage for tests

Author: Ievgenii.Mykhalevskyi

src/Debug/DebugAdapterTracker.ts

@@ -33,6 +33,9 @@ export class DebugAdapterTracker implements vscode.DebugAdapterTracker {
     private get isCoverage(): boolean {
         return this.debugSession.configuration.isCoverage;
     }
+    private get processExe(): string {
+        return this.debugSession.configuration.processExe;
+    }
     private get context() {
         return DebugConfigurationProvider.getContextForSession(this.sessionID)!;
     }
@@ -48,15 +51,15 @@ export class DebugAdapterTracker implements vscode.DebugAdapterTracker {
         this.debugSession = debugSession;
         this.problemResolver = problemResolver;
         this._stream = fs.createWriteStream(getFilePathInWorkspace(this.logPath), { flags: "a+" });
-        this.simulatorInteractor = new SimulatorFocus(this.context.commandContext);
+        this.simulatorInteractor = new SimulatorFocus();
     }
 
     private get logPath(): string {
         return this.debugSession.configuration.logPath;
     }
 
     onWillStartSession() {
-        this.simulatorInteractor.init();
+        this.simulatorInteractor.init(this.context.commandContext.projectEnv, this.processExe);
         console.log("Session is starting");
         vscode.debug.activeDebugSession;
         this.disList.push(

src/Debug/DebugConfigurationProvider.ts

@@ -167,12 +167,16 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
                 if (testToRun.length === 0) {
                     continue;
                 }
+                const device = await context.projectEnv.debugDeviceID;
                 const debugSession: vscode.DebugConfiguration = {
                     type: "xcode-lldb",
                     name: `Xcode: Testing: ${session.target}`,
                     request: "launch",
                     target: "tests",
-                    isDebuggable: isDebuggable,
+                    isDebuggable:
+                        device.platform === "macOS" && session.host.includes("-Runner.app")
+                            ? false
+                            : isDebuggable, // for macOS, we can not debug UITests as it freezes for some reason
                     sessionId: sessionId,
                     testsToRun: testToRun,
                     buildBeforeLaunch: "never",
@@ -386,6 +390,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
                 deviceID: deviceID.id,
                 xctestrun: dbgConfig.xctestrun,
                 isCoverage: dbgConfig.isCoverage,
+                processExe: processExe,
             };
             return debugSession;
         } else {
@@ -434,6 +439,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
                 deviceID: deviceID.id,
                 xctestrun: dbgConfig.xctestrun,
                 isCoverage: dbgConfig.isCoverage,
+                processExe: processExe,
             };
             return debugSession;
         }

src/Debug/SimulatorFocus.ts

@@ -1,19 +1,21 @@
 import { execSync } from "child_process";
-import { CommandContext } from "../CommandManagement/CommandContext";
-import { DeviceID } from "../env";
+import { DeviceID, ProjectEnv } from "../env";
+import path from "path";
 
 export class SimulatorFocus {
-    private context: CommandContext;
     private deviceID?: DeviceID;
     private productName?: string;
 
-    constructor(context: CommandContext) {
-        this.context = context;
-    }
+    constructor() {}
 
-    async init() {
-        this.deviceID = await this.context.projectEnv.debugDeviceID;
-        this.productName = await this.context.projectEnv.productName;
+    async init(projectEnv: ProjectEnv, processExe: string) {
+        this.deviceID = await projectEnv.debugDeviceID;
+        this.productName = processExe.split(path.sep).at(0);
+        if (this.productName === undefined) {
+            this.productName = await projectEnv.productName;
+        } else if (this.productName.endsWith(".app")) {
+            this.productName = this.productName.slice(0, -".app".length);
+        }
     }
 
     focus() {