[Completion] Remove uses of unbounded generic types #79585
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
hamishknight
force-pushed
the
leaps-and-bounds
branch
from
9f6e822 to
e5e3732
Compare
hamishknight
commented
Feb 24, 2025
slavapestov
approved these changes
Feb 25, 2025
| @@ -395,8 +395,7 @@ static TypeRelation calculateTypeRelation(Type Ty, Type ExpectedTy, | |||
|
|
|||
| // Equality/Conversion of GenericTypeParameterType won't account for | |||
| // requirements – ignore them | |||
| if (!Ty->hasTypeParameter() && !ExpectedTy->hasTypeParameter() && | |||
| !Ty->hasUnboundGenericType() && !ExpectedTy->hasUnboundGenericType()) { | |||
| if (!Ty->hasTypeParameter() && !ExpectedTy->hasTypeParameter()) { | |||
There was a problem hiding this comment.
Can we also get rid of type parameters at some point too, in favor of the caller mapping the type into the correct environment?
There was a problem hiding this comment.
Yup I'm leaving that for a future PR
Ensure we always produce bounded generic type annotations and contextual types.
We allow the unqualifed use of the enclosing nominal type in a where
clause, but only when it isn't a nested type, e.g:
```
struct S<T> {
typealias T = T
struct R<U> {
typealias U = U
}
}
extension S where S.T == Int {} // allowed
extension S.R where R.U == Int {} // not allowed
```
Tweak the completion logic such that we don't suggest the type for
the nested case, instead it must be qualified.
Ensure we call `getTypeOfMember` for nested nominals and typealiases.
hamishknight
force-pushed
the
leaps-and-bounds
branch
from
e5e3732 to
8975bf6
Compare
|
@swift-ci please test |
|
@swift-ci please SourceKit stress test |
hamishknight
requested review from
ahoppen,
bnbarham and
rintaro
as code owners
ahoppen
approved these changes
Feb 25, 2025
|
@swift-ci please SourceKit stress 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.
Ensure we always produce bounded generic type annotations and contextual types. While here, also make sure we substitute the base type for nested type completions.