[CodeComplete] Match argument labels when completing function arguments #36538
Conversation
ahoppen
force-pushed
the
pr/complete-defaulted-labels
branch
from
26ab904 to
48d660c
Compare
lib/IDE/ExprContextAnalysis.cpp
Outdated
| for (unsigned i = PosInParams; i < Params.size(); ++i) { | ||
| if (Params[i].getLabel() == ArgName) { | ||
| // We have found a label match. Advance the position in the params | ||
| // to point to the param after the one with this label. | ||
| PosInParams = i + 1; | ||
| FoundLabelMatch = true; | ||
| break; | ||
| } | ||
| } |
There was a problem hiding this comment.
If I understand correctly, we look for the label even if there are non-matching not defaulted parameters.
So this suggest z: <#Int#>
class C {
func foo(x: Int, y: Int, z: Int) {}
}
func test(c: C) {
c.foo(y: 1, #^HERE^#)
}which is reasonable. If we don't have a test case like this, please add it while you are here.
There was a problem hiding this comment.
Yeah, it does. I added the test case you suggested.
| auto ArgName = tuple->getElementName(PosInArgs); | ||
| bool FoundLabelMatch = false; | ||
| for (unsigned i = PosInParams; i < Params.size(); ++i) { | ||
| if (Params[i].getLabel() == ArgName) { |
There was a problem hiding this comment.
class C {
func foo(x: Int..., y: Int, z: Int) {}
}
func test(c: C) {
c.foo(x: 10, 20, 30, y: 40, #^HERE^#)
}When PosInArgs is 1, this loop ends up with ++PosInParams which is incorrect. I think we need some special handling for variadic parameters.
There was a problem hiding this comment.
Good thinking! I added special handling for variadics so that variadic parameters consume all unlabelled arguments following them.
Also added the test case you suggested.
ahoppen
force-pushed
the
pr/complete-defaulted-labels
branch
from
48d660c to
385917e
Compare
Previously, we always assumed that the position in the arguments would match the position in the parameter, which isn’t true in case of defaulted arguments. Try matching parameters based on argument labels to give better completion results. Fixes rdar://60346573
ahoppen
force-pushed
the
pr/complete-defaulted-labels
branch
from
385917e to
433d756
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test Windows |
Previously, we always assumed that the position in the arguments would match the position in the parameter, which isn’t true in case of defaulted arguments. Try matching parameters based on argument labels to give better completion results.
Fixes rdar://60346573