averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Completion] Avoid type parameters in expected types

Browse Source 
There actually only appears to be a single place where we were
letting interface types into the expected type for a completion,
fix it up to use a contextual type.
This commit is contained in:
Hamish Knight
2025-03-05 12:59:46 +00:00
parent 0d8e005185
commit 4a2c6121d4
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/IDE/ArgumentCompletion.cpp
View File

@@ -139,7 +139,7 @@ void ArgumentTypeCheckCompletionCallback::sawSolutionImpl(const Solution &S) {
Type ExpectedCallType;
if (auto ArgLoc = S.getConstraintSystem().getArgumentLocator(ParentCall)) {
if (auto FuncArgApplyInfo = S.getFunctionArgApplyInfo(ArgLoc)) {
Type ParamType = FuncArgApplyInfo->getParamInterfaceType();
Type ParamType = FuncArgApplyInfo->getParamType();
ExpectedCallType = S.simplifyTypeForCodeCompletion(ParamType);
}
}

15
lib/IDE/CodeCompletionResultType.cpp
View File

@@ -393,11 +393,16 @@ static TypeRelation calculateTypeRelation(Type Ty, Type ExpectedTy,
return TypeRelation::Unknown;
}
// Equality/Conversion of GenericTypeParameterType won't account for
// requirements – ignore them
if (!Ty->hasTypeParameter() && !ExpectedTy->hasTypeParameter()) {
if (Ty->isEqual(ExpectedTy))
return TypeRelation::Convertible;
ASSERT(!Ty->hasUnboundGenericType() && !ExpectedTy->hasUnboundGenericType());
ASSERT(!ExpectedTy->hasTypeParameter());
if (Ty->isEqual(ExpectedTy))
return TypeRelation::Convertible;
// FIXME: We ought to be opening generic parameters present in completion
// results for generic decls, and mapping into context types for non-generic
// decls. For now, avoid attempting to compare.
if (!Ty->hasTypeParameter()) {
bool isAny = false;
isAny |= ExpectedTy->isAny();
isAny |= ExpectedTy->is<ArchetypeType>() &&

4
test/IDE/complete_rdar127844278.swift
View File

@@ -31,5 +31,5 @@ func foo<T>(@Builder _: () -> T) where T: Q {}
foo {
S(#^COMPLETE^#)
}
// COMPLETE-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['(']{#a: Void#}[')'][#S<()>#]; name=a:
// COMPLETE-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['(']{#b: String#}[')'][#S<String>#]; name=b:
// COMPLETE-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]/TypeRelation[Convertible]: ['(']{#a: Void#}[')'][#S<()>#]; name=a:
// COMPLETE-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]/TypeRelation[Convertible]: ['(']{#b: String#}[')'][#S<String>#]; name=b: