Skip to content

Commit 390d28c

Browse files
ktosoahoppen
andcommitted
Apply suggestions from code review
Co-authored-by: Alex Hoppen <alex@alexhoppen.de>
1 parent 500b071 commit 390d28c

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Sources/SwiftSyntaxMacroExpansion/MacroReplacement.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public enum MacroDefinition {
6767

6868
extension MacroDefinition {
6969
/// Best effort compatibility shim, the case has gained additional parameters.
70+
@available(*, deprecated, message: "Use the expansion case with three associated values instead")
7071
public func expansion(_ node: MacroExpansionExprSyntax, replacements: [Replacement]) -> Self {
7172
.expansion(node, replacements: replacements, genericReplacements: [])
7273
}
@@ -191,7 +192,7 @@ fileprivate class ParameterReplacementVisitor: SyntaxAnyVisitor {
191192
return .skipChildren
192193
}
193194

194-
let matchedParameter = genericParameterClause.parameters.enumerated().first { (index, parameter) in
195+
let parameterIndex = genericParameterClause.parameters.firstIndex { (index, parameter) in
195196
return parameter.name.text == "\(baseName)"
196197
}
197198

@@ -371,7 +372,7 @@ extension MacroDeclSyntax {
371372
_ node: AttributeSyntax,
372373
definition: MacroExpansionExprSyntax,
373374
replacements: [MacroDefinition.Replacement],
374-
genericReplacements: [MacroDefinition.GenericArgumentReplacement]
375+
genericReplacements: [MacroDefinition.GenericArgumentReplacement] = []
375376
) -> ExprSyntax {
376377
// Dig out the argument list.
377378
let argumentList: LabeledExprListSyntax?

Tests/SwiftSyntaxMacroExpansionTest/MacroReplacementTests.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,7 @@ final class MacroReplacementTests: XCTestCase {
133133
fatalError()
134134
}
135135

136-
guard let replacementA = genericReplacements.first else {
137-
XCTFail("Expected generic replacement for A")
138-
fatalError()
139-
}
136+
let replacementA = try XCTUnwrap(genericReplacements.first)
140137
guard let replacementB = genericReplacements.dropFirst().first else {
141138
XCTFail("Expected generic replacement for A")
142139
fatalError()

0 commit comments

Comments
 (0)