Disallow whitespace between @, attribute name and (
#2466
Conversation
ahoppen
force-pushed
the
ahoppen/disallow-attribute-space
branch
from
8492161 to
4d5d32a
Compare
ahoppen
changed the title
@, attribute name and (, multi-line simple string literals and non-decimal line numbers to #sourceLocation@, attribute name and (
|
@swift-ci Please test |
|
@swift-ci Please test |
| var (unexpectedBeforeAtSign, atSign) = self.expect(.atSign) | ||
| if atSign.trailingTriviaByteLength > 0 || self.currentToken.leadingTriviaByteLength > 0 { | ||
| let diagnostic = TokenDiagnostic( | ||
| self.swiftVersion < .v6 ? .extraneousTrailingWhitespaceWarning : .extraneousTrailingWhitespaceError, |
There was a problem hiding this comment.
Maybe we should implement .warnUntilSwiftVersion() in SwiftSyntax too?
There was a problem hiding this comment.
I don’t think that’s realistically possible. We need to have a different case in SwiftSyntax.TokenDiagnostic so that one of them can be marked as an error and the other one as a warning.
| unexpectedBeforePound = RawUnexpectedNodesSyntax(combining: unexpectedBeforePound, pound, arena: self.arena) | ||
| pound = self.missingToken(.pound) | ||
| let diagnostic = TokenDiagnostic( | ||
| .extraneousTrailingWhitespaceError, | ||
| byteOffset: pound.leadingTriviaByteLength + pound.tokenText.count | ||
| ) | ||
| pound = pound.tokenView.withTokenDiagnostic(tokenDiagnostic: diagnostic, arena: self.arena) |
There was a problem hiding this comment.
Out of curiosity, why you decided to go with TokenDiagnostic instead of the previous "unexpected" route?
There was a problem hiding this comment.
Because the unexpected route didn’t have any way of representing warnings, just errors. If there are unexpected or missing tokens in the syntax tree, we always consider the tree as having an error (which makes sense to me) and TokenDiagnostic is the only way we can currently communicate warnings.
| self.swiftVersion < .v6 ? .extraneousLeadingWhitespaceWarning : .extraneousLeadingWhitespaceError, | ||
| byteOffset: 0 | ||
| ) | ||
| leftParen = leftParen.tokenView.withTokenDiagnostic(tokenDiagnostic: diagnostic, arena: self.arena) |
There was a problem hiding this comment.
I think I understand why you did this , but the inconsistency of the diagnosing token between #/@ and ( is a little unfortunate. 😢
There was a problem hiding this comment.
Yeah, it truly is. But I think everything else would be even more of a pain…
ahoppen
force-pushed
the
ahoppen/disallow-attribute-space
branch
from
4d5d32a to
3a4e8de
Compare
Add a Swift version parameter to parser. When parsing in Swift 6 mode, disallow whitespace between `@`, the attribute’s name and `(`. In Swift 5 warn. Use this opportunity to refactor how we diagnose extraneous whitespace. rdar://121668395
ahoppen
force-pushed
the
ahoppen/disallow-attribute-space
branch
from
3a4e8de to
156b74f
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
1 similar comment
|
@swift-ci Please test Windows |
|
@swift-ci Please test Windows |
SwiftParser equivalent of swiftlang/swift#71237.
Add a Swift version parameter to parser. When parsing in Swift 6 mode, disallow whitespace between
@, the attribute’s name and(. In Swift 5 warn.Use this opportunity to refactor how we diagnose extraneous whitespace.
rdar://121668395