[SwiftParser] Support function body and type member skipping #2316
Conversation
This file contains 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
rintaro
commented
Oct 29, 2023
| @@ -2791,6 +2791,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? { | |||
| return "closingQuote" | |||
| case \SimpleStringLiteralExprSyntax.unexpectedAfterClosingQuote: | |||
| return "unexpectedAfterClosingQuote" | |||
| case \SkippedDeclSyntax.unexpectedBeforeText: | |||
| return "unexpectedBeforeText" | |||
There was a problem hiding this comment.
Can we remove these unexpected items?
Comment on lines
1239
to
1240
| if let peekedScalar = start.peekScalar(), peekedScalar.isValidIdentifierStartCodePoint { | ||
| break | ||
| } | ||
| if let peekedScalar = start.peekScalar(), peekedScalar.isOperatorStartCodePoint { | ||
| if let peekedScalar = start.peekScalar(), | ||
| peekedScalar.isValidIdentifierStartCodePoint || peekedScalar.isOperatorStartCodePoint { |
| mutating func skippedBraceBody(unless: Lookahead.SkipBodyResult) -> RawSkippedDeclSyntax? { | ||
| return self.withLookahead { lookahead in | ||
| let result = lookahead.advanceUntilMatchingRightBrace() | ||
| guard result.isDisjoint(with: unless) else { |
There was a problem hiding this comment.
Instead of checking the result on the skipped area, the skipping function should bail out and return nil as soon as it finds any unless condition.
Comment on lines
+40
to
+43
| // Nested class. Because? | ||
| if tokenKind == .keyword && tokenText == "class" { | ||
| return false | ||
| } |
There was a problem hiding this comment.
It's because of AnyObject lookup :shakesfist:
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.
ParsingOptionsoption-set type withbodySkippingmember, and addoptions: ParsingOptionsto allParser.parse(...)functionsSkippedDeclSyntaxSkippedDeclSyntaxcontains only one.unknowntoken that covers the whole skipped characters including trivia.#ifdirectives