[Parse] Adjust skipBracedBlock() #28403
Merged
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
Using \0 as a representation of the cursor position is a implementation detail and is done by SourceKit. Client including complete-test should not do it. This inserted test used to be treated as EOF in compiler so the code after the completion position is completely ignored.
- Stop using skipBracedBlock() in parseDeclPrecedenceGroup(), skipUntilDeclRBrace() is better at this context. - Disable 'SyntaxParsingContext' inside skipBracedBlock() - Removed unsound recovery logic in consumeAbstractFunctionBody(). This doesn't match with the parser bahavior in the delayed parsing. - Expose 'skipBracedBlock()' as a Parser instance method so it's usable from other files.
|
@swift-ci Please smoke test |
benlangmuir
reviewed
Nov 21, 2019
benlangmuir
approved these changes
Nov 22, 2019
|
@swift-ci Please smoke test |
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.
The intent of this PR is to expose
skipBracedBlock()as aParsermethod so that we can use it from other files.\0incomplete-test; Using \0 as a representation of the cursor position is a implementation detail and is done by SourceKit. Client including complete-test shouldnot do it. This inserted
\0used to be treated as EOF in the parser so the codeafter the completion position was completely ignored.
skipBracedBlock()inparseDeclPrecedenceGroup(),skipUntilDeclRBrace()is better at this context.SyntaxParsingContextinsideskipBracedBlock()consumeAbstractFunctionBody(). This doesn't match with the parser behavior in the delayed parsing.