fixed multiline functions and members now get interpolated correctly

- they previously broke string declarations

Author: RandomHashTags

Sources/HTMLKitUtilities/ParseData.swift

@@ -295,10 +295,10 @@ extension HTMLKitUtilities {
                         break
                 }
             }
-            return .interpolation("\(function)")
+            return .interpolation(merge_func_into_single_line(function))
         }
         if let member:MemberAccessExprSyntax = expression.memberAccess {
-            return .interpolation("\(member)")
+            return .interpolation(merge_member_into_single_line(member))
         }
         if let array:ArrayExprSyntax = expression.array {
             let separator:String
@@ -389,6 +389,53 @@ extension HTMLKitUtilities {
         let data:HTMLKitUtilities.ElementData = HTMLKitUtilities.parseArguments(context: context, children: macro.arguments.children(viewMode: .all))
         return (data.innerHTML.map({ String(describing: $0) }).joined(), data.encoding)
     }
+
+    // MARK: Merge
+    static func merge_member_into_single_line(_ member: MemberAccessExprSyntax) -> String {
+        var string:String = "\(member)"
+        string.removeAll { $0.isWhitespace }
+        return string
+    }
+    static func merge_func_into_single_line(_ function: FunctionCallExprSyntax) -> String {
+        var string:String = "\(function.calledExpression)"
+        string.removeAll { $0.isWhitespace }
+        var args:String = ""
+        var is_first:Bool = true
+        for argument in function.arguments {
+            var arg:String
+            if let label = argument.label {
+                arg = "\(label)"
+                while arg.first?.isWhitespace ?? false {
+                    arg.removeFirst()
+                }
+                if !is_first {
+                    arg.insert(",", at: arg.startIndex)
+                }
+                arg += ": "
+                var expr:String
+                if let f:FunctionCallExprSyntax = argument.expression.functionCall {
+                    expr = merge_func_into_single_line(f)
+                } else if let m:MemberAccessExprSyntax = argument.expression.memberAccess {
+                    expr = merge_member_into_single_line(m)
+                } else {
+                    expr = "\(argument.expression)"
+                }
+                while expr.first?.isWhitespace ?? false {
+                    expr.removeFirst()
+                }
+                arg += expr
+            } else {
+                arg = "\(argument)"
+                while arg.first?.isWhitespace ?? false {
+                    arg.removeFirst()
+                }
+            }
+            args += arg
+            is_first = false
+        }
+        args = "(" + args + ")"
+        return string + args
+    }
 }
 
 // MARK: Misc

Tests/HTMLKitTests/InterpolationTests.swift

@@ -19,15 +19,94 @@ struct InterpolationTests {
         #expect(string == "<a href=\"\(test)\">Test</a>")
     }
 
-    @Test func multiline_with_interpolation() {
-        let test:String = "again"
+    @Test func multiline_decl_interpolation() {
+        let test:String = "prophecy"
         let string:String = #html(
             div(
                 "dune ",
                 test
             )
         )
-        #expect(string == "<div>dune again</div>")
+        #expect(string == "<div>dune prophecy</div>")
+    }
+
+    @Test func multiline_func_interpolation() {
+        var string:String = #html(
+            div(
+                "Bikini Bottom: ",
+                InterpolationTests.spongebobCharacter(
+                    "spongebob"
+                ),
+                ", ",
+                InterpolationTests.spongebobCharacter("patrick"
+                ),
+                ", ",
+                InterpolationTests.spongebobCharacter(
+                    "squidward"),
+                ", ",
+                InterpolationTests
+                .spongebobCharacter(
+                    "krabs"
+                ),
+                ", ",
+                InterpolationTests.sandyCheeks (),
+                ", ",
+                InterpolationTests
+                .spongebobCharacter(
+                    "pearl krabs"
+                )
+            )
+        )
+        #expect(string == "<div>Bikini Bottom: Spongebob Squarepants, Patrick Star, Squidward Tentacles, Mr. Krabs, Sandy Cheeks, Pearl Krabs</div>")
+
+        string = #html(
+            div(
+                "Don't forget ",
+                InterpolationTests.BikiniBottom.gary(),
+                "!"
+            )
+        )
+        #expect(string == "<div>Don&#39t forget Gary!</div>")
+
+        string = #html(
+            div(
+                InterpolationTests
+                .spongebob(
+                    isBoob:false,
+                    isSquare:
+                    true,
+                    middleName: Shrek
+                        .isLife
+                        .rawValue,
+                    lastName: InterpolationTests
+                        .sandyCheeks()
+                )
+            )
+        )
+        #expect(string == "<div>Spongeboob</div>")
+    }
+
+    @Test func multiline_member_interpolation() {
+        var string:String = #html(
+            div(
+                "Shrek ",
+                Shrek.isLove.rawValue,
+                ", Shrek ",
+                Shrek
+                .isLife.rawValue
+            )
+        )
+        #expect(string == "<div>Shrek isLove, Shrek isLife</div>")
+
+        string = #html(
+            div(
+                "Shrek ",
+                InterpolationTests.Shrek.isLove.rawValue,
+                ", Shrek ",
+                InterpolationTests.Shrek.isLife.rawValue
+            )
+        )
+        #expect(string == "<div>Shrek isLove, Shrek isLife</div>")
     }
 
     @Test func flatten() {
@@ -72,15 +151,28 @@ extension InterpolationTests {
 }
 
 extension InterpolationTests {
+    enum BikiniBottom {
+        static func gary() -> String { "Gary" }
+    }
     static let spongebob:String = "Spongebob Squarepants"
     static let patrick:String = "Patrick Star"
     static func spongebobCharacter(_ string: String) -> String {
         switch string {
         case "spongebob": return "Spongebob Squarepants"
         case "patrick":   return "Patrick Star"
+        case "squidward": return "Squidward Tentacles"
+        case "krabs":     return "Mr. Krabs"
+        case "pearl krabs": return "Pearl Krabs"
+        case "karen":     return "Karen"
         default:          return "Plankton"
         }
     }
+    static func sandyCheeks() -> String {
+        return "Sandy Cheeks"
+    }
+    static func spongebob(isBoob: Bool, isSquare: Bool, middleName: String, lastName: String) -> String {
+        return "Spongeboob"
+    }
 
     @Test func third_party_literal() {
         var string:String = #html(div(attributes: [.title(InterpolationTests.spongebob)]))
@@ -89,11 +181,11 @@ extension InterpolationTests {
         string = #html(div(attributes: [.title(InterpolationTests.patrick)]))
         #expect(string == "<div title=\"Patrick Star\"></div>")
 
-        var static_string:StaticString = #html(div(attributes: [.title("Mr. Crabs")]))
-        #expect(static_string == "<div title=\"Mr. Crabs\"></div>")
+        var static_string:StaticString = #html(div(attributes: [.title("Mr. Krabs")]))
+        #expect(static_string == "<div title=\"Mr. Krabs\"></div>")
 
-        static_string = #html(div(attributes: [.title("Mr. Crabs")]))
-        #expect(static_string == "<div title=\"Mr. Crabs\"></div>")
+        static_string = #html(div(attributes: [.title("Mr. Krabs")]))
+        #expect(static_string == "<div title=\"Mr. Krabs\"></div>")
     }
     @Test func third_party_func() {
         let string:String = #html(div(attributes: [.title(InterpolationTests.spongebobCharacter("patrick"))]))