[CodeCompletion] Filter overloads if their function application doesn't contain the code completion token #41917
Conversation
|
@swift-ci Please smoke test |
|
@swift-ci Please SourceKit stress test |
lib/Sema/CSSimplify.cpp
Outdated
| }; | ||
| CodeCompletionTypeFinder CompletionTypeFinder; | ||
| type.walk(CompletionTypeFinder); | ||
| return CompletionTypeFinder.ContainsCodeCompletionTypeVar; |
There was a problem hiding this comment.
The easier way of doing this would be to use type.findIf([&](Type type) { return isCodeCompetionTypeVar(type); });
There was a problem hiding this comment.
I think doing it think way you wouldn't need an additional isCodeCompletionTypeVar(fnTypeVar) in your condition.
There was a problem hiding this comment.
Ah, it's fnTypeVar, never mind
There was a problem hiding this comment.
Yes, that’s definitely cleaner
I think this trade-off is reasonable. This change eliminates all timeouts in the stress tester + fixes some other expression to complex issues while barely introducing any new issues (I still need to investigate what the two unexpected failures are). |
|
Sounds good then :) |
ahoppen
force-pushed
the
pr/filter-overloads-if-no-cc-token
branch
from
4f0a0fa to
99cc75b
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test Windows |
lib/Sema/CSSimplify.cpp
Outdated
| if (isForCodeCompletion()) | ||
| return false; | ||
| if (isForCodeCompletion()) { | ||
| bool ArgContainsCCTypeVar = Type(argFnType).findIf( |
There was a problem hiding this comment.
I just realized that this could be simplified down to Type(argFnType).findIf(isCodeCompletionTypeVar);
…'t contain the code completion token When solving for code completion, we weren't disabling overloads because the call might be malfored in the presence of a code completion token (because the user is only now writing the function call). But this logic doesn't apply to function calls that don't even involve the code completion token, which happens if completing in result builders. I am hoping that this significantly improves code completion performance inside result builders.
ahoppen
force-pushed
the
pr/filter-overloads-if-no-cc-token
branch
from
99cc75b to
045302b
Compare
|
@swift-ci Please smoke test |
- SR-14694: A few timeout issues were resolved by swiftlang/swift#41917 and others were introduced by swiftlang/swift#41633. - SR-16012: A couple more cases were caused by migrating expression completions to solver-based swiftlang/swift#41633
When solving for code completion, we weren't disabling overloads because the call might be malfored in the presence of a code completion token (because the user is only now writing the function call). But this logic doesn't apply to function calls that don't even involve the code completion token, which happens if completing in result builders.
I am hoping that this significantly improves code completion performance inside result builders.