Improve active target type handling in ManageSolutionController and update related tests

Author: arneschmid

src/generic/text-file.test.ts

@@ -371,13 +371,16 @@ describe('TextFile', () => {
         testDataHandler.rmDir(unicodeDir);
     });
 
-    it('primes external stamp on first change check', async () => {
+    it('primes external stamp when checked before load/save', async () => {
+        fsUtils.writeTextFile(TEST_FILE, initialContent);
         const tf = new TextFile(TEST_FILE);
-        tf.text = initialContent;
-        const saveResult = await tf.save();
-        expect(saveResult).toBe(ETextFileResult.Success);
 
         expect(tf.hasExternalFileChanged()).toBe(false);
+
+        fsUtils.writeTextFile(TEST_FILE, `${changedContent}!`);
+        await new Promise(resolve => setTimeout(resolve, 500));
+
+        expect(tf.hasExternalFileChanged()).toBe(true);
     });
 
     it('detects external on-disk updates and then re-baselines', async () => {
@@ -389,7 +392,7 @@ describe('TextFile', () => {
         tf.refreshExternalFileStamp();
         expect(tf.hasExternalFileChanged()).toBe(false);
 
-        fsUtils.writeTextFile(TEST_FILE, changedContent);
+        fsUtils.writeTextFile(TEST_FILE, `${changedContent}!`);
         await new Promise(resolve => setTimeout(resolve, 500));
 
         expect(tf.hasExternalFileChanged()).toBe(true);

src/views/manage-solution/manage-solution-controller.test.ts

@@ -145,6 +145,28 @@ describe('manage-solution-controller', () => {
         expect(controller.activeTargetTypeName).toBe(initialName);
     });
 
+    it('should recover from persisted empty active target type using first known target', async () => {
+        const controller = new ManageSolutionController();
+        await controller.loadSolution('test-resources/solutions/solution-with-debuggers.csolution');
+
+        controller.activeTargetTypeName = '';
+        const updated = await controller.ensureActiveTargetTypeName();
+
+        expect(updated).toBe(true);
+        expect(controller.activeTargetTypeName).toBe(controller.solutionData.targets[0].name);
+    });
+
+    it('should clear persisted invalid active target type when no target types are available', async () => {
+        const controller = new ManageSolutionController();
+        await controller.loadSolution('test-resources/solutions/solution-with-debuggers.csolution');
+
+        controller.activeTargetTypeName = 'invalid-target';
+        const updated = await (controller as any).ensureActiveTargetTypeNameInKnownTargets([]);
+
+        expect(updated).toBe(true);
+        expect(controller.cmsisJsonFile.activeTargetTypeName).toBeUndefined();
+    });
+
     it('should get active target set name', async () => {
         const controller = new ManageSolutionController();
         await controller.loadSolution('test-resources/solutions/solution-with-debuggers.csolution');

src/views/manage-solution/manage-solution-controller.ts

@@ -169,12 +169,23 @@ export class ManageSolutionController {
 
     private async ensureActiveTargetTypeNameInKnownTargets(knownTargetNames: string[]): Promise<boolean> {
         const configuredTargetTypeName = this.cmsisJsonFile.activeTargetTypeName;
-        if (configuredTargetTypeName && !knownTargetNames.includes(configuredTargetTypeName)) {
-            this.activeTargetTypeName = this.csolutionYml.getTargetType()?.name || '';
-            await this.cmsisJsonFile.save();
-            return true;
+        const hasConfiguredTargetType = configuredTargetTypeName !== undefined;
+        const configuredTargetInvalid = configuredTargetTypeName === ''
+            || (configuredTargetTypeName !== undefined && !knownTargetNames.includes(configuredTargetTypeName));
+
+        if (!hasConfiguredTargetType || !configuredTargetInvalid) {
+            return false;
+        }
+
+        const fallbackTargetTypeName = knownTargetNames[0];
+        if (fallbackTargetTypeName) {
+            this.activeTargetTypeName = fallbackTargetTypeName;
+        } else {
+            this.cmsisJsonFile.delete(`targetSet.${this.cmsisJsonFile.solutionDisplayName}.activeTargetType`);
         }
-        return false;
+
+        await this.cmsisJsonFile.save();
+        return true;
     }
 
     /**