Skip to content

Use swift-macro-testing #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FlickerSoul merged 3 commits into from
Nov 26, 2025
Merged

Use swift-macro-testing #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
058db0d
Add macro testing package
FlickerSoul Nov 26, 2025
faeea4d
Swift crash at `type metadata accessor for` :')
FlickerSoul Nov 26, 2025
990f8f2
Use MacroTesting
FlickerSoul Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ let package = Package(
.upToNextMinor(from: "1.1.0"),
),
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.4.5"),
.package(url: "https://github.com/pointfreeco/swift-macro-testing.git", from: "0.6.4"),
],
targets: [
.macro(
Expand Down Expand Up @@ -75,6 +76,7 @@ let package = Package(
dependencies: [
"BinaryParseKitMacros",
.product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
.product(name: "MacroTesting", package: "swift-macro-testing"),
],
),
.testTarget(
Expand Down
8 changes: 4 additions & 4 deletions Sources/BinaryParseKitMacros/Macros/ParseEnum/ParseEnumCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import SwiftDiagnostics
import SwiftSyntax
import SwiftSyntaxMacros

class ParseEnumCase<C: MacroExpansionContext>: SyntaxVisitor {
private let context: C
class ParseEnumCase: SyntaxVisitor {
private let context: any MacroExpansionContext

private var workEnum: EnumDeclSyntax?
private var currentParseMacroVisitor: MacroAttributeCollector<C>?
private var currentParseMacroVisitor: MacroAttributeCollector?
private var currentCaseElements: EnumCaseElementListSyntax?
private var caseParseInfo: [EnumCaseParseInfo] = []
private(set) var parsedInfo: EnumParseInfo?
Expand All @@ -21,7 +21,7 @@ class ParseEnumCase<C: MacroExpansionContext>: SyntaxVisitor {

private var errors: [Diagnostic] = []

init(context: C) {
init(context: any MacroExpansionContext) {
self.context = context
super.init(viewMode: .sourceAccurate)
}
Expand Down
8 changes: 4 additions & 4 deletions Sources/BinaryParseKitMacros/Macros/ParseStruct/ParseStructField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import SwiftSyntax
import SwiftSyntaxBuilder
import SwiftSyntaxMacros

class ParseStructField<C: MacroExpansionContext>: SyntaxVisitor {
class ParseStructField: SyntaxVisitor {
struct VariableInfo {
let type: TypeSyntax
let parseActions: [StructParseAction]
Expand All @@ -24,17 +24,17 @@ class ParseStructField<C: MacroExpansionContext>: SyntaxVisitor {

typealias ParseVariableMapping = OrderedDictionary<TokenSyntax, VariableInfo>

private let context: C
private let context: any MacroExpansionContext

private var hasParse: Bool = false
private var structFieldVisitor: MacroAttributeCollector<C>?
private var structFieldVisitor: MacroAttributeCollector?
private var existParseRestContent: Bool = false

private(set) var variables: ParseVariableMapping = [:]

private(set) var errors: [Diagnostic] = []

init(context: C) {
init(context: any MacroExpansionContext) {
self.context = context
super.init(viewMode: .sourceAccurate)
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/BinaryParseKitMacros/Macros/Supports/MacroAttributeCollector.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import SwiftDiagnostics
import SwiftSyntax
import SwiftSyntaxMacros

class MacroAttributeCollector<C: MacroExpansionContext>: SyntaxVisitor {
class MacroAttributeCollector: SyntaxVisitor {
private enum MacroError: Error {
case invalidParseAttribute
case invalidParseRestAttribute
Expand All @@ -20,7 +20,7 @@ class MacroAttributeCollector<C: MacroExpansionContext>: SyntaxVisitor {
typealias ParseAction = StructParseAction
typealias CaseMatchAction = EnumCaseMatchAction

private let context: C
private let context: any MacroExpansionContext
private(set) var parseActions: [ParseAction] = []
private(set) var hasParseRest: Bool = false
private(set) var hasParse: Bool = false
Expand All @@ -29,7 +29,7 @@ class MacroAttributeCollector<C: MacroExpansionContext>: SyntaxVisitor {

private var errors: [Diagnostic] = []

init(context: C) {
init(context: any MacroExpansionContext) {
self.context = context
super.init(viewMode: .sourceAccurate)
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/BinaryParseKitMacros/Macros/Supports/ParseMacroInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import SwiftDiagnostics
import SwiftSyntax
import SwiftSyntaxMacros

private class ParseMacroArgVisitor<C: MacroExpansionContext>: SyntaxVisitor {
private class ParseMacroArgVisitor: SyntaxVisitor {
var source: Syntax?
var byteCountOfArgument: LabeledExprSyntax?
var byteCountArgument: LabeledExprSyntax?
var endiannessArgument: LabeledExprSyntax?

private var errors: [Diagnostic] = []

private let context: C
init(context: C) {
private let context: any MacroExpansionContext
init(context: any MacroExpansionContext) {
self.context = context
super.init(viewMode: .sourceAccurate)
}
Expand Down
Loading
Loading