Add line terminator to XCTest filter regex

assets/test/defaultPackage/Tests/PackageTests/PackageTests.swift

@@ -100,3 +100,8 @@ struct MixedSwiftTestingSuite {
 }
 
 #endif
+
+final class DuplicateSuffixTests: XCTestCase {
+  func testPassing() throws {}
+  func testPassingSuffix() throws {}
+}

src/TestExplorer/TestRunArguments.ts

@@ -200,7 +200,7 @@ export class TestRunArguments {
                 // Only add leaf items to the list of arguments to pass to the test runner.
                 if (this.isLeafTestItem(testItem, !!isXCTest)) {
                     if (isXCTest) {
-                        xcTestArgs.push(testItem.id);
+                        xcTestArgs.push(`${testItem.id}$`);
                     } else {
                         swiftTestArgs.push(testItem.id);
                     }

src/debugger/buildConfig.ts

@@ -449,7 +449,13 @@ export class TestingConfigurationFactory {
     }
 
     private addTestsToArgs(args: string[]): string[] {
-        return [...args, ...this.testList.flatMap(arg => ["--filter", regexEscapedString(arg)])];
+        return [
+            ...args,
+            ...this.testList.flatMap(arg => [
+                "--filter",
+                regexEscapedString(arg, new Set(["$", "^"])),
+            ]),
+        ];
     }
 
     private addXCTestExecutableTestsToArgs(args: string[]): string[] {

src/utilities/utilities.ts

@@ -306,10 +306,10 @@ const regexEscapedCharacters = new Set(["(", ")", "[", "]", ".", "$", "^", "?",
  * @param string A string to escape
  * @returns The escaped string
  */
-export function regexEscapedString(string: string): string {
+export function regexEscapedString(string: string, omitting?: Set<string>): string {
     let result = "";
     for (const c of string) {
-        if (regexEscapedCharacters.has(c)) {
+        if (regexEscapedCharacters.has(c) && (!omitting || !omitting.has(c))) {
             result += `\\${c}`;
         } else {
             result += c;

test/suite/testexplorer/TestExplorerIntegration.test.ts

@@ -148,6 +148,8 @@ suite("Test Explorer Suite", function () {
                     ["testPassing()", "testFailing()", "testDisabled()"],
                     "testWithKnownIssue()",
                     "testWithKnownIssueAndUnknownIssue()",
+                    "DuplicateSuffixTests",
+                    ["testPassing()", "testPassingSuffix()"],
                 ],
             ]);
         } else if (workspaceContext.swiftVersion.isLessThanOrEqual(new Version(5, 10, 0))) {
@@ -158,6 +160,8 @@ suite("Test Explorer Suite", function () {
                 [
                     "DebugReleaseTestSuite",
                     ["testDebug", "testRelease"],
+                    "DuplicateSuffixTests",
+                    ["testPassing", "testPassingSuffix"],
                     "FailingXCTestSuite",
                     ["testFailing"],
                     "MixedXCTestSuite",
@@ -331,6 +335,21 @@ suite("Test Explorer Suite", function () {
             });
         });
 
+        suite("Only runs specified test", async function () {
+            const passingRun = await runTest(
+                testExplorer.controller,
+                TestKind.standard,
+                "PackageTests.DuplicateSuffixTests/testPassing"
+            );
+
+            assertTestResults(passingRun, {
+                passed: [
+                    "PackageTests.DuplicateSuffixTests",
+                    "PackageTests.DebugReleaseTestSuite/testPassing",
+                ],
+            });
+        });
+
         suite("Runs multiple", function () {
             const numIterations = 5;
             const windowMock = mockNamespace(vscode, "window");

test/suite/utilities/utilities.test.ts

@@ -175,6 +175,13 @@ suite("Utilities Test Suite", () => {
             );
         });
 
+        test("should escape a string that omits some characters", () => {
+            assert.strictEqual(
+                regexEscapedString(".^$|()?[]/:", new Set(["^", "$", "a"])),
+                "\\.^$\\|\\(\\)\\?\\[\\]\\/\\:"
+            );
+        });
+
         test("should return an empty string when input is an empty string", () => {
             assert.strictEqual(regexEscapedString(""), "");
         });