Fix some ctest issues (#4866)

* Avoid overwriting of existing tests

* Remove flickering of test tree

* Ensure uri and label are updated if necessary

* Update changelog.md

* Update changelog.md

---------

Co-authored-by: Ottmar Zittlau <[email protected]>

Author: mcodilla

CHANGELOG.md

@@ -94,6 +94,7 @@ Bug Fixes:
 - Fix bug in which CTest is unable to run large amount of tests in parallel due to regex exceeding command line length limits [#4829](https://github.com/microsoft/vscode-cmake-tools/issues/4829) [@theuke](https://github.com/theuke)
 - Fix malformed devcontainer.json used for working with GitHub Codespaces and similar environments [#4588](https://github.com/microsoft/vscode-cmake-tools/pull/4588) [@kaladron](https://github.com/kaladron)
 - Fix hang in `buildWithResult` tool when there isn't a configure preset selected. [#4857](https://github.com/microsoft/vscode-cmake-tools/issues/4857)
+- Fix hiding of tests if test suite name and target name are the same when setting "Test Suite Delimiter" to `\` [#4408](https://github.com/microsoft/vscode-cmake-tools/issues/4408) [@ottmar-zittlau](https://github.com/ottmar-zittlau)
 
 ## 1.22.28
 

src/ctest.ts

@@ -1017,7 +1017,17 @@ export class CTestDriver implements vscode.Disposable {
                 parentSuiteItem = suiteItem;
             }
         }
-        const testItem = initializedTestExplorer.createTestItem(testName, testLabel, uri);
+        const existing = parentSuiteItem.children.get(testName);
+        let testItem: vscode.TestItem;
+        if (existing && existing.uri?.toString() === uri?.toString()) {
+            testItem = existing;
+            if (testItem.label !== testLabel) {
+                testItem.label = testLabel;
+            }
+        } else {
+            // Create or recreate testItem if the uri is stale or it does not already exist
+            testItem = initializedTestExplorer.createTestItem(testName, testLabel, uri);
+        }
         return { test: testItem, parentSuite: parentSuiteItem };
     }
 
@@ -1030,20 +1040,22 @@ export class CTestDriver implements vscode.Disposable {
             log.error(localize('folder.not.found.in.test.explorer', 'Folder is not found in Test Explorer: {0}', sourceDir));
             return;
         }
-        // Clear all children and re-add later
-        testExplorerRoot.children.replace([]);
+
+        // Keep track of all currently active test ids to remove the invalid ones afterwards
+        const activeTestIDs = new Set<string>();
 
         if (!ctestArgs) {
             // Happens when testPreset is not selected
             const testItem = initializedTestExplorer.createTestItem(testPresetRequired, localize('test.preset.required', 'Select a test preset to discover tests'));
-            testExplorerRoot.children.add(testItem);
+            testExplorerRoot.children.replace([testItem]);
             return;
         }
 
         if (testType === "LegacyCTest" && this.legacyTests !== undefined) {
             // Legacy CTest tests
             for (const test of this.legacyTests) {
                 testExplorerRoot.children.add(initializedTestExplorer.createTestItem(test.name, test.name));
+                activeTestIDs.add(test.name);
             }
         } else if (testType === "CTestInfo" && this.tests !== undefined) {
             if (this.tests && this.tests.kind === 'ctestInfo') {
@@ -1077,12 +1089,24 @@ export class CTestDriver implements vscode.Disposable {
                     if (testTags.length !== 0) {
                         testItem.tags = [...testItem.tags, ...testTags];
                     }
-
                     parentSuiteItem.children.add(testItem);
+                    activeTestIDs.add(testItem.id);
                 });
             };
         }
 
+        const removeDeletedTests = (collection: vscode.TestItemCollection) => {
+            collection.forEach((item: vscode.TestItem, collection: vscode.TestItemCollection) => {
+                if (item.children.size > 0) {
+                    removeDeletedTests(item.children);
+                }
+                if (item.children.size === 0 && !activeTestIDs.has(item.id)) {
+                    collection.delete(item.id);
+                }
+            });
+        };
+
+        removeDeletedTests(testExplorerRoot.children);
     }
 
     /**