Skip to content

Commit

Permalink
better code, more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@MahdiBM
MahdiBM committed Jul 12, 2024
1 parent 5d29e61 commit 124c757
Show file tree
Hide file tree
Showing 2 changed files with 239 additions and 28 deletions.
36 changes: 24 additions & 12 deletions Sources/EnumeratorMacroImpl/EnumeratorMacroType.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import SwiftDiagnostics
import SwiftSyntax
import SwiftSyntaxMacros
import SwiftParser
import SwiftParserDiagnostics
import Mustache
import Foundation

Expand Down Expand Up @@ -89,23 +90,34 @@ extension EnumeratorMacroType: MemberMacro {
let decls = SourceFileSyntax.parse(
from: &parser
).statements.compactMap { statement -> DeclSyntax? in
if statement.hasError {
context.diagnose(
Diagnostic(
let diagnostics = ParseDiagnosticsGenerator.diagnostics(for: statement)
let hasError = diagnostics.contains(where: { $0.diagMessage.severity == .error })
if hasError {
context.diagnose(.init(
node: codeSyntax,
message: MacroError.renderedSyntaxContainsErrors(statement.description)
))
}
for diagnostic in diagnostics {
if diagnostic.diagMessage.severity == .error {
context.diagnose(.init(
node: codeSyntax,
message: MacroError.renderedSyntaxContainsErrors(statement.description)
)
)
position: diagnostic.position,
message: diagnostic.diagMessage,
highlights: diagnostic.highlights,
notes: diagnostic.notes,
fixIts: diagnostic.fixIts
))
} else if let /*fixIt*/_ = diagnostic.fixIts.first {
/// TODO: Apply the fixit
}
}
if hasError {
return nil
}
switch DeclSyntax(statement.item) {
case let .some(declSyntax):
if declSyntax.hasWarning {
return declSyntax
// TODO: try to fix the warnings using SwiftSyntax-provided functions
} else {
return declSyntax
}
return declSyntax
case .none:
context.diagnose(
Diagnostic(
Expand Down
231 changes: 215 additions & 16 deletions Tests/EnumeratorMacroTests/EnumeratorMacroTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,93 @@ final class EnumeratorMacroTests: XCTestCase {
)
}

func testDiagnosesNoArguments() throws {
assertMacroExpansion(
#"""
@Enumerator
enum TestEnum {
case a
}
"""#,
expandedSource: #"""
enum TestEnum {
case a
}
"""#,
diagnostics: [.init(
id: .init(
domain: "EnumeratorMacro.MacroError",
id: "macroDeclarationHasNoArguments"
),
message: """
The macro declaration needs to have at least 1 String-Literal argument
""",
line: 1,
column: 1,
severity: .error
)],
macros: EnumeratorMacroEntryPoint.macros
)
}

func testDiagnosesEmptyArguments() throws {
assertMacroExpansion(
#"""
@Enumerator
enum TestEnum {
case a
}
"""#,
expandedSource: #"""
enum TestEnum {
case a
}
"""#,
diagnostics: [.init(
id: .init(
domain: "EnumeratorMacro.MacroError",
id: "macroDeclarationHasNoArguments"
),
message: """
The macro declaration needs to have at least 1 String-Literal argument
""",
line: 1,
column: 1,
severity: .error
)],
macros: EnumeratorMacroEntryPoint.macros
)
}

func testDiagnosesUnacceptableArguments() throws {
assertMacroExpansion(
#"""
@Enumerator(myVariable)
enum TestEnum {
case a
}
"""#,
expandedSource: #"""
enum TestEnum {
case a
}
"""#,
diagnostics: [.init(
id: .init(
domain: "EnumeratorMacro.MacroError",
id: "allArgumentsMustBeStringLiterals"
),
message: """
All arguments must be string literals, but found: myVariable
""",
line: 1,
column: 1,
severity: .error
)],
macros: EnumeratorMacroEntryPoint.macros
)
}

func testDiagnosesBadMustacheTemplate() throws {
assertMacroExpansion(
#"""
Expand Down Expand Up @@ -339,26 +426,138 @@ final class EnumeratorMacroTests: XCTestCase {
case testCase(testValue: String)
}
"""#,
diagnostics: [.init(
id: .init(
domain: "EnumeratorMacro.MacroError",
id: "renderedSyntaxContainsErrors"
diagnostics: [
.init(
id: .init(
domain: "EnumeratorMacro.MacroError",
id: "renderedSyntaxContainsErrors"
),
message: """
Rendered syntax contains errors:
enum Subtype: String {
case "a"
case "b"
case "testCase"
}
""",
line: 1,
column: 13,
severity: .error
),
message: """
Rendered syntax contains errors:
enum Subtype: String {
case "a"
case "b"
case "testCase"
}
""",
line: 1,
column: 13,
severity: .error
)],
.init(
id: .init(
domain: "SwiftParser",
id: "MissingNodesError"
),
message: """
expected identifier in enum case
""",
line: 2,
column: 17,
severity: .error,
fixIts: [.init(
message: "insert identifier"
)]
),
.init(
id: .init(
domain: "SwiftParser",
id: "UnexpectedNodesError"
),
message: """
unexpected code '"a"' before enum case
""",
line: 2,
column: 17,
severity: .error
),
.init(
id: .init(
domain: "SwiftParser",
id: "MissingNodesError"
),
message: """
expected identifier in enum case
""",
line: 3,
column: 7,
severity: .error,
fixIts: [.init(
message: "insert identifier"
)]
),
.init(
id: .init(
domain: "SwiftParser",
id: "UnexpectedNodesError"
),
message: """
unexpected code '"b"' before enum case
""",
line: 3,
column: 7,
severity: .error
),
.init(
id: .init(
domain: "SwiftParser",
id: "MissingNodesError"
),
message: """
expected identifier in enum case
""",
line: 4,
column: 5,
severity: .error,
fixIts: [.init(
message: "insert identifier"
)]
),
.init(
id: .init(
domain: "SwiftParser",
id: "UnexpectedNodesError"
),
message: """
unexpected code '"testCase"' in enum
""",
line: 4,
column: 5,
severity: .error
),
],
macros: EnumeratorMacroEntryPoint.macros
)
}

// func testAppliesFixIts() throws {
// assertMacroExpansion(
// #"""
// @Enumerator("""
// var value: Int {
// a 1️⃣\u{a0}+ 2
// }
// """)
// enum TestEnum {
// case a(val1: String, Int)
// case b
// case testCase(testValue: String)
// }
// """#,
// expandedSource: #"""
// enum TestEnum {
// case a(val1: String, Int)
// case b
// case testCase(testValue: String)
//
// var value: Int {
// a + 2
// }
// }
// """#,
// macros: EnumeratorMacroEntryPoint.macros
// )
// }
}

@Enumerator("""
Expand Down

0 comments on commit 124c757

Please sign in to comment.