[CodeCompletion] Always suggest call pattern for nested function calls #71587
Conversation
ahoppen
requested review from
bnbarham,
hamishknight and
rintaro
as code owners
|
@swift-ci Please smoke test |
lib/IDE/ArgumentCompletion.cpp
Outdated
| if (auto ParentExpr = CS.getParentExpr(ParentCall); | ||
| ParentExpr && CS.getParentExpr(ParentCall)->getArgs()) { |
There was a problem hiding this comment.
Does this cover multi-level nested cases like foo(x: bar.baz(<HERE>, and foo(x: 1 + bar(<HERE>? Adding test cases would be nice.
Also, do you mean:
| if (auto ParentExpr = CS.getParentExpr(ParentCall); | |
| ParentExpr && CS.getParentExpr(ParentCall)->getArgs()) { | |
| if (auto ParentExpr = CS.getParentExpr(ParentCall); | |
| ParentExpr->getArgs()) { |
?
There was a problem hiding this comment.
I added test cases. It did work but I changed it to be a search through all parent expressions anyway. That seems more failure proof. Good idea 👍🏽
ahoppen
force-pushed
the
ahoppen/nested-call-completion
branch
from
eccec44 to
eb2704b
Compare
|
@swift-ci Please smoke test |
lib/IDE/ArgumentCompletion.cpp
Outdated
| /// Returns whether `E` has a parent expression with arguments. | ||
| static bool hasParentCallLikeExpr(Expr *E, ConstraintSystem &CS) { | ||
| E = CS.getParentExpr(E); | ||
| while (E) { | ||
| if (E->getArgs()) { |
There was a problem hiding this comment.
I came up with other cases
let _ = [
foo: bar(#^HERE^#,
baz: 1
]Same for tuples. Does it make sense to add check for TupleExpr/ArrayExpr/DictionaryExpr as well?
Actually, it's not only expressions, any comma separated syntax might be affected e.g.
if let foo = bar(#^HERE^#, foo > baz { ...But I think it's okay to ignore them for now.
There was a problem hiding this comment.
Oh, good catch. I added those cases. I also think it’s OK to ignore the if conditions etc for now. We provide argument completions still, so the fallback if we don’t offer the pattern isn’t terrible.
ahoppen
force-pushed
the
ahoppen/nested-call-completion
branch
from
eb2704b to
3d05173
Compare
|
@swift-ci Please smoke test |
1 similar comment
|
@swift-ci Please smoke test |
When completing in cases like `bar(arg: foo(|, option: 1)`, we don’t know if `option` belongs to the call to `foo` or `bar`. Be defensive and also suggest the signature.
ahoppen
force-pushed
the
ahoppen/nested-call-completion
branch
from
3d05173 to
17520dc
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test Windows |
When completing in cases like
bar(arg: foo(|, option: 1), we don’t know ifoptionbelongs to the call tofooorbar. Be defensive and also suggest the signature.