[CodeCompletion] Migrate key path completion to be solver based #38049
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 smoke test |
xedin
approved these changes
Jun 23, 2021
lib/Sema/CSSimplify.cpp
Outdated
| // won't get any more information out of it in subsequent passes - its | ||
| // result is always a type variable with no constraints on the preceeding | ||
| // components. | ||
| if (flags.contains(TMF_GenerateConstraints)) { |
There was a problem hiding this comment.
flags doesn't have any relation to constraint generation phase, you'd need to check getPhase() == ConstraintSystemPhase::ConstraintGeneration for that. TMF_GenerateConstraints is used in cases were it's okay to add new constraints while solving current one e.g. simplification logic sometimes has to generate new identical constraint if current one can't be simplified, matchTypes has to add new constraints when it's matching two bound generic types in order to match generic generic arguments etc.
ahoppen
force-pushed
the
pr/keypath-completion
branch
from
f09c915 to
de87359
Compare
xedin
reviewed
Jun 25, 2021
lib/Sema/TypeCheckCodeCompletion.cpp
Outdated
| // We are completing on the root and need to extract the key path's root | ||
| // type. | ||
| if (KeyPath->getRootType()) { | ||
| BaseType = S.getType(KeyPath->getRootType()); |
There was a problem hiding this comment.
I'd say you want to use getResolvedType here since root could be a generic type.
This commit essentially consistes of the following steps: - Add a new code completion key path component that represents the code completion token inside a key path. Previously, the key path would have an invalid component at the end if it contained a code completion token. - When type checking the key path, model the code completion token’s result type by a new type variable that is unrelated to the previous components (because the code completion token might resolve to anything). - Since the code completion token is now properly modelled in the constraint system, we can use the solver based code completion implementation and inspect any solution determined by the constraint solver. The base type for code completion is now the result type of the key path component that preceeds the code completion component. This resolves bugs where code completion was not working correctly if the key path’s type had a generic base or result type. It’s also nice to have moved another completion type over to the solver-based implementation. Resolves rdar://78779234 [SR-14685] and rdar://78779335 [SR-14703]
ahoppen
force-pushed
the
pr/keypath-completion
branch
from
de87359 to
d64b8ec
Compare
|
@swift-ci Please smoke test |
xedin
approved these changes
Jun 30, 2021
This was referenced Jun 30, 2021
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.
This PR essentially consists of the following steps:
This resolves bugs where code completion was not working correctly if the key path’s type had a generic base or result type. It’s also nice to have moved another completion type over to the solver-based implementation.
Resolves rdar://78779234 [SR-14685] and rdar://78779335 [SR-14703]