Update swift syntax #1217
Closed
Update swift syntax #1217
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kimdv
force-pushed
the
kimdv/update-swift-syntax
branch
from
fb801de to
a790d59
Compare
kimdv
commented
Jan 11, 2023
| @@ -26,7 +26,7 @@ open class BasicFormat: SyntaxRewriter { | |||
| Trivia(pieces: [.newlines(1), indentation]) | |||
| } | |||
|
|
|||
| private var lastRewrittenToken: TokenSyntax? | |||
| private var lastRewrittenToken: TokenSyntax? | |||
There was a problem hiding this comment.
Could we in basic format make if next token == nil return no trailing space
ahoppen
reviewed
Jan 11, 2023
| @@ -48,13 +48,13 @@ open class BasicFormat: SyntaxRewriter { | |||
| open override func visit(_ node: TokenSyntax) -> TokenSyntax { | |||
| var leadingTrivia = node.leadingTrivia | |||
| var trailingTrivia = node.trailingTrivia | |||
| if requiresLeadingSpace(node) && leadingTrivia.isEmpty && lastRewrittenToken?.trailingTrivia.isEmpty != false { | |||
| if requiresLeadingSpace(node) && leadingTrivia.isEmpty && lastRewrittenToken? .trailingTrivia.isEmpty != false { | |||
There was a problem hiding this comment.
😬 This seems like a regression. It’s fine now but it would be nice to fix this in BasicFormat for the future
| @@ -28,7 +28,7 @@ extension AccessorDecl { | |||
| /// A convenience initializer that allows: | |||
| /// - Initializing syntax collections using result builders | |||
| /// - Initializing tokens without default text using strings | |||
| public init(leadingTrivia: Trivia? = nil, unexpectedBeforeAttributes: UnexpectedNodes? = nil, attributes: AttributeList? = nil, unexpectedBetweenAttributesAndModifier: UnexpectedNodes? = nil, modifier: DeclModifier? = nil, unexpectedBetweenModifierAndAccessorKind: UnexpectedNodes? = nil, accessorKind: Token, unexpectedBetweenAccessorKindAndParameter: UnexpectedNodes? = nil, parameter: AccessorParameter? = nil, unexpectedBetweenParameterAndAsyncKeyword: UnexpectedNodes? = nil, asyncKeyword: Keyword?, unexpectedBetweenAsyncKeywordAndThrowsKeyword: UnexpectedNodes? = nil, throwsKeyword: Token? = nil, unexpectedBetweenThrowsKeywordAndBody: UnexpectedNodes? = nil, @CodeBlockItemListBuilder bodyBuilder: () -> CodeBlockItemListSyntax? = { | |||
| public init(leadingTrivia: Trivia? = nil, unexpectedBeforeAttributes: UnexpectedNodes? = nil, attributes: AttributeList? = nil, unexpectedBetweenAttributesAndModifier: UnexpectedNodes? = nil, modifier: DeclModifier? = nil, unexpectedBetweenModifierAndAccessorKind: UnexpectedNodes? = nil, accessorKind: Token, unexpectedBetweenAccessorKindAndParameter: UnexpectedNodes? = nil, parameter: AccessorParameter? = nil, unexpectedBetweenParameterAndAsyncKeyword: UnexpectedNodes? = nil, asyncKeyword: Keyword? , unexpectedBetweenAsyncKeywordAndThrowsKeyword: UnexpectedNodes? = nil, throwsKeyword: Token? = nil, unexpectedBetweenThrowsKeywordAndBody: UnexpectedNodes? = nil, @CodeBlockItemListBuilder bodyBuilder: () -> CodeBlockItemListSyntax? = { | |||
There was a problem hiding this comment.
Same here, seems like an unfortunate regression.
kimdv
commented
Jan 11, 2023
| leadingTrivia += .space | ||
| } | ||
| if requiresTrailingSpace(node) && trailingTrivia.isEmpty { | ||
| trailingTrivia += .space | ||
| } | ||
| if let keyPath = getKeyPath(Syntax(node)), requiresLeadingNewline(keyPath), !(leadingTrivia.first?.isNewline ?? false) { | ||
| if let keyPath = getKeyPath(Syntax(node)), requiresLeadingNewline(keyPath), !(leadingTrivia.first? .isNewline ?? false) { |
There was a problem hiding this comment.
We missed some cases here.
Will open a new PR
|
Closing in favor of #1230. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.