Merge pull request #23 from mattpolzin/fix-reserved-words-in-paths2

attempt to fix keyword escaping

Author: mattpolzin

Sources/JSONAPISwiftGen/Swift Generators/Test Generators/TestFunctionName.swift

@@ -141,13 +141,18 @@ public struct TestFunctionName: Equatable, RawRepresentable {
 
     /// For swift names, we remove braces, escape reserved words, and convert spaces to underscores.
     internal static func swiftName(from string: String) -> String {
-        return string
+        let name = string
             .replacingOccurrences(of: "{", with: "")
             .replacingOccurrences(of: "}", with: "")
             .replacingOccurrences(of: " ", with: "_")
-            .replacingOccurrences(of: "do", with: "`do`")
-            .replacingOccurrences(of: "try", with: "`try`")
-            .replacingOccurrences(of: "continue", with: "`continue`")
+        return Self.escapedKeyword(name)
+    }
+
+    internal static func escapedKeyword(_ string: String) -> String {
+        if string == "do" { return "`do`" }
+        if string == "try" { return "`try`" }
+        if string == "continue" { return "`continue`" }
+        return string
     }
 
     public static var testPrefix = "test__"

Tests/JSONAPISwiftGenTests/TestFunctionNameTests.swift

@@ -105,6 +105,16 @@ final class TestFunctionNameTests: XCTestCase {
         XCTAssertFalse(t1.fullyQualifiedTestFunctionName.contains(".try."))
     }
 
+    func test_onlyEscapeKeywords() {
+        let t1 = TestFunctionName(
+            path: .init(["go", "domain"]),
+            endpoint: .post,
+            direction: .request,
+            context: TestFunctionLocalContext(functionName: "_hello_world➎")!
+        )
+        XCTAssertTrue(t1.fullyQualifiedTestFunctionName.contains("domain"))
+    }
+
     func test_statusCodeExtraction() {
         let test1 = TestFunctionName(
             path: .init(["hello_world", "v2"]),