better error handling

MahdiBM · Jul 16, 2024 · 1b86e4b · 1b86e4b
1 parent a733432
commit 1b86e4b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/Sources/EnumeratorMacroImpl/EnumeratorMacroType.swift b/Sources/EnumeratorMacroImpl/EnumeratorMacroType.swift
@@ -34,7 +34,7 @@ extension EnumeratorMacroType: MemberMacro {
         if exprList.isEmpty {
             throw MacroError.expectedAtLeastOneArgument
         }
-        let templates = exprList.compactMap { 
+        let templates = exprList.compactMap {
             element -> (template: String, syntax: StringLiteralExprSyntax)? in
             guard let stringLiteral = element.expression.as(StringLiteralExprSyntax.self) else {
                 context.diagnose(
@@ -45,15 +45,18 @@ extension EnumeratorMacroType: MemberMacro {
                 )
                 return nil
             }
+            var hadBadSegment = false
             for segment in stringLiteral.segments where !segment.is(StringSegmentSyntax.self) {
                 context.diagnose(
                     Diagnostic(
                         node: segment,
                         message: MacroError.allArgumentsMustBeNonInterpolatedStringLiterals
                     )
                 )
-                return nil
+                hadBadSegment = true
             }
+            if hadBadSegment { return nil }
+
             let template = stringLiteral.segments.description
             return (template, stringLiteral)
         }

diff --git a/Tests/EnumeratorMacroTests/EnumeratorMacroTests.swift b/Tests/EnumeratorMacroTests/EnumeratorMacroTests.swift
@@ -425,6 +425,7 @@ final class EnumeratorMacroTests: XCTestCase {
                 {{#cases}}
                 case \(name)
                 {{/cases}}
+                \(comments)
             }
             """)
             enum TestEnum {
@@ -440,18 +441,32 @@ final class EnumeratorMacroTests: XCTestCase {
                 case testCase(testValue: String)
             }
             """#,
-            diagnostics: [.init(
-                id: .init(
-                    domain: "EnumeratorMacro.MacroError",
-                    id: "allArgumentsMustBeNonInterpolatedStringLiterals"
+            diagnostics: [
+                .init(
+                    id: .init(
+                        domain: "EnumeratorMacro.MacroError",
+                        id: "allArgumentsMustBeNonInterpolatedStringLiterals"
+                    ),
+                    message: """
+                    All arguments must be non-interpolated string literals.
+                    """,
+                    line: 4,
+                    column: 10,
+                    severity: .error
                 ),
-                message: """
-                All arguments must be non-interpolated string literals.
-                """,
-                line: 4,
-                column: 10,
-                severity: .error
-            )],
+                .init(
+                    id: .init(
+                        domain: "EnumeratorMacro.MacroError",
+                        id: "allArgumentsMustBeNonInterpolatedStringLiterals"
+                    ),
+                    message: """
+                    All arguments must be non-interpolated string literals.
+                    """,
+                    line: 6,
+                    column: 5,
+                    severity: .error
+                )
+            ],
             macros: EnumeratorMacroEntryPoint.macros
         )
     }