[Parse][CodeCompletion] Don't special case code completion when forming single-expression closures/function bodies (NFC) #34253
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
|
@swift-ci please test |
rintaro
reviewed
Oct 9, 2020
lib/IDE/CodeCompletion.cpp
Outdated
Comment on lines
6110
to
6116
| SourceRange Range = RS->getSourceRange(); | ||
| if (Range.isInvalid()) | ||
| return false; | ||
|
|
||
| if (!SM.rangeContainsCodeCompletionLoc(Range)) | ||
| return false; |
There was a problem hiding this comment.
It's not clear why we need to compare the range. We know completion is happening inside this DC, right? Are these return false actually reachable? If so, could you give me some examples?
Also, if we really need to check it, RS->getResult()->getSourceRange() is more relevant I think.
There was a problem hiding this comment.
This was just me attempting to match the Status.hasCompletion() check in the old logic, but you're right - we already know that's true here. I'll remove it.
nathawes
force-pushed
the
nfc-always-form-single-expression-return-and-undo-if-needed
branch
from
c99be57 to
acdcac4
Compare
…ng single-expression closures/function bodies (NFC) Code completion used to avoid forming single expression closures/function bodies when the single expression contained the code completion expression because a contextual type mismatch could result in types not being applied to the AST, giving no completions. Completions that have been migrated to the new solver-based completion mechanism don't need this behavior, however. Rather than trying to guess whether the type of completion we're going to end up performing is one of the ones that haven't been migrated to the solver yet when parsing, instead just always form single-expression closures/function bodies (like we do for regular compilation) and undo the transformation if and when we know we're going to perform a completion kind we haven't migrated yet. Once all completion kinds are migrated, the undo-ing code can be removed.
nathawes
force-pushed
the
nfc-always-form-single-expression-return-and-undo-if-needed
branch
from
acdcac4 to
a91cede
Compare
|
@swift-ci please test |
nathawes
deleted the
nfc-always-form-single-expression-return-and-undo-if-needed
branch
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.
Code completion used to avoid forming single expression closures/function bodies when the single expression contained the code completion expression because a contextual type mismatch could result in types not being applied to the AST, giving no completions.
Completions that have been migrated to the new solver-based completion mechanism don't need this behavior, however. Rather than trying to guess whether the type of completion we're going to end up performing is one of the ones that haven't been migrated to the solver yet when parsing, instead just always form single-expression closures/function bodies (like we do for regular compilation) and undo the transformation if and when we know we're going to perform a completion kind we haven't migrated yet.
Once all completion kinds are migrated, the undo-ing code can be removed.