Skip to content

Remove the compiler condition guarding DerivativeRegistrationAttributeArgumentsSyntax. #559

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
merged 1 commit into from
Jul 5, 2023
Merged

Remove the compiler condition guarding DerivativeRegistrationAttributeArgumentsSyntax. #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 15 additions & 18 deletions Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2561,26 +2561,23 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .visitChildren
}

// `DerivativeRegistrationAttributeArguments` was added after the Swift 5.2 release was cut.
#if HAS_DERIVATIVE_REGISTRATION_ATTRIBUTE
override func rewrite(_ node: DerivativeRegistrationAttributeArgumentsSyntax)
-> SyntaxVisitorContinueKind
{
// This node encapsulates the entire list of arguments in a `@derivative(...)` or
// `@transpose(...)` attribute.
before(node.ofLabel, tokens: .open)
after(node.colon, tokens: .break(.continue, newlines: .elective(ignoresDiscretionary: true)))
// The comma after originalDeclName is optional and is only present if there are diffParams.
after(node.comma ?? node.originalDeclName.lastToken, tokens: .close)

if let diffParams = node.diffParams {
before(diffParams.firstToken, tokens: .break(.same), .open)
after(diffParams.lastToken, tokens: .close)
}
override func visit(_ node: DerivativeRegistrationAttributeArgumentsSyntax)
-> SyntaxVisitorContinueKind
{
// This node encapsulates the entire list of arguments in a `@derivative(...)` or
// `@transpose(...)` attribute.
before(node.ofLabel, tokens: .open)
after(node.colon, tokens: .break(.continue, newlines: .elective(ignoresDiscretionary: true)))
// The comma after originalDeclName is optional and is only present if there are diffParams.
after(node.comma ?? node.originalDeclName.lastToken(viewMode: .sourceAccurate), tokens: .close)

return .visitChildren
if let diffParams = node.diffParams {
before(diffParams.firstToken(viewMode: .sourceAccurate), tokens: .break(.same), .open)
after(diffParams.lastToken(viewMode: .sourceAccurate), tokens: .close)
}
#endif

return .visitChildren
}

override func visit(_ node: DifferentiabilityParamsClauseSyntax) -> SyntaxVisitorContinueKind {
// This node encapsulates the `wrt:` label and value/variable in a `@differentiable`,
Expand Down
124 changes: 60 additions & 64 deletions Tests/SwiftFormatPrettyPrintTests/DifferentiationAttributeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,84 +96,80 @@ final class DifferentiationAttributeTests: PrettyPrintTestCase {
}

func testDerivative() {
#if HAS_DERIVATIVE_REGISTRATION_ATTRIBUTE
let input =
"""
@derivative(of: foo)
func deriv<T>() {}
let input =
"""
@derivative(of: foo)
func deriv<T>() {}

@derivative(of: foo, wrt: x)
func deriv<T>(_ x: T) {}
@derivative(of: foo, wrt: x)
func deriv<T>(_ x: T) {}

@derivative(of: foobar, wrt: x)
func deriv<T>(_ x: T) {}
@derivative(of: foobar, wrt: x)
func deriv<T>(_ x: T) {}

@derivative(of: foobarbaz, wrt: theVariableNamedX)
func deriv<T>(_ theVariableNamedX: T) {}
"""
@derivative(of: foobarbaz, wrt: theVariableNamedX)
func deriv<T>(_ theVariableNamedX: T) {}
"""

let expected =
"""
@derivative(of: foo)
func deriv<T>() {}
let expected =
"""
@derivative(of: foo)
func deriv<T>() {}

@derivative(of: foo, wrt: x)
func deriv<T>(_ x: T) {}
@derivative(of: foo, wrt: x)
func deriv<T>(_ x: T) {}

@derivative(
of: foobar, wrt: x
)
func deriv<T>(_ x: T) {}
@derivative(
of: foobar, wrt: x
)
func deriv<T>(_ x: T) {}

@derivative(
of: foobarbaz,
wrt: theVariableNamedX
)
func deriv<T>(
_ theVariableNamedX: T
) {}
@derivative(
of: foobarbaz,
wrt: theVariableNamedX
)
func deriv<T>(
_ theVariableNamedX: T
) {}

"""
"""

assertPrettyPrintEqual(input: input, expected: expected, linelength: 28)
#endif
assertPrettyPrintEqual(input: input, expected: expected, linelength: 28)
}

func testTranspose() {
#if HAS_DERIVATIVE_REGISTRATION_ATTRIBUTE
let input =
"""
@transpose(of: foo, wrt: 0)
func trans<T>(_ v: T) {}

@transpose(of: foobar, wrt: 0)
func trans<T>(_ v: T) {}

@transpose(of: someReallyLongName, wrt: 0)
func trans<T>(_ theVariableNamedV: T) {}
"""

let expected =
"""
@transpose(of: foo, wrt: 0)
func trans<T>(_ v: T) {}

@transpose(
of: foobar, wrt: 0
)
func trans<T>(_ v: T) {}
let input =
"""
@transpose(of: foo, wrt: 0)
func trans<T>(_ v: T) {}

@transpose(
of: someReallyLongName,
wrt: 0
)
func trans<T>(
_ theVariableNamedV: T
) {}
@transpose(of: foobar, wrt: 0)
func trans<T>(_ v: T) {}

"""
@transpose(of: someReallyLongName, wrt: 0)
func trans<T>(_ theVariableNamedV: T) {}
"""

let expected =
"""
@transpose(of: foo, wrt: 0)
func trans<T>(_ v: T) {}

@transpose(
of: foobar, wrt: 0
)
func trans<T>(_ v: T) {}

@transpose(
of: someReallyLongName,
wrt: 0
)
func trans<T>(
_ theVariableNamedV: T
) {}

"""

assertPrettyPrintEqual(input: input, expected: expected, linelength: 27)
#endif
assertPrettyPrintEqual(input: input, expected: expected, linelength: 27)
}
}