[CodeCompletion] Stop using temporary Lexer in the second pass #28433
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
In `TypeCheckFunctionBodyUntilRequest`. So we can type check the body without typechecking the signature.
Since we only call one parsing function (i.e. parseAbstructFunctionBody, parseDecl, or parseStmtOrExpr), the parser stops at the end of the node. It's not necessary to limit the Lexer to set an ArtificialEOF. To minimize the parsing range, modify the Parser to *not* parse the body if the completion happens in the signature.
This is just not necessary. This parser lives only for the single second pass.
rintaro
commented
Nov 22, 2019
| func->getResultInterfaceType()->isVoid()) { | ||
| // The function returns void. We don't need an explicit return, no matter | ||
| // what the type of the expression is. Take the inserted return back out. | ||
| body->setFirstElement(func->getSingleExpressionBody()); |
There was a problem hiding this comment.
@DougGregor Do you have any concern about this change?
There was a problem hiding this comment.
No, this seems like a clear improvement.
rintaro
commented
Nov 22, 2019
| @@ -695,9 +695,6 @@ struct InitializerWithNameAndParam { | |||
| struct InitializerWithLabels { | |||
| init c d: Int {} | |||
| // expected-error @-1 {{expected '(' for initializer parameters}} | |||
| // expected-error @-2 {{expected declaration}} | |||
| // expected-error @-3 {{consecutive declarations on a line must be separated by ';'}} | |||
| // expected-note @-5 {{in declaration of 'InitializerWithLabels'}} | |||
There was a problem hiding this comment.
This is because parseDeclInit now returns an error state. So the parser property skips to the next decl or '}'
|
@swift-ci Please smoke test |
DougGregor
approved these changes
Dec 3, 2019
| func->getResultInterfaceType()->isVoid()) { | ||
| // The function returns void. We don't need an explicit return, no matter | ||
| // what the type of the expression is. Take the inserted return back out. | ||
| body->setFirstElement(func->getSingleExpressionBody()); |
There was a problem hiding this comment.
No, this seems like a clear improvement.
benlangmuir
approved these changes
Dec 4, 2019
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.
parseBraceItemList,parseDecl, orparseExprOrStmt), the parser stops at the end of the node anyways. It's not necessary to limit the Lexer to set an ArtificialEOF. As a ground work, modify the Parser to not parse the body if the completion happens in the signaturegetResultInterfaceType()to get the result type inTypeCheckFunctionBodyUntilRequest. So we can type check the body without type checking the signature of the func decl. (This change is actually not needed but I think this is an improvement)