[CodeComplete] Complete argument labels after vararg #36814
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
|
@swift-ci Please test |
rintaro
reviewed
Apr 8, 2021
test/IDE/complete_call_arg.swift
Outdated
Comment on lines
874
to
883
| value.test("test", xArg: #^COMPLETE_AFTER_VARARG^#) | ||
| // COMPLETE_AFTER_VARARG: Begin completions | ||
| // COMPLETE_AFTER_VARARG-DAG: Pattern/ExprSpecific: {#yArg: Foo...#}[#Foo#]; | ||
| // COMPLETE_AFTER_VARARG-DAG: Pattern/ExprSpecific: {#zArg: Foo...#}[#Foo#]; | ||
| // COMPLETE_AFTER_VARARG: End completions | ||
| value.test("test", xArg: #^COMPLETE_AFTER_VARARG_WITH_PREV_PARAM^#) | ||
| // COMPLETE_AFTER_VARARG_WITH_PREV_PARAM: Begin completions | ||
| // COMPLETE_AFTER_VARARG_WITH_PREV_PARAM-DAG: Pattern/ExprSpecific: {#yArg: Foo...#}[#Foo#]; | ||
| // COMPLETE_AFTER_VARARG_WITH_PREV_PARAM-DAG: Pattern/ExprSpecific: {#zArg: Foo...#}[#Foo#]; | ||
| // COMPLETE_AFTER_VARARG_WITH_PREV_PARAM: End completions |
There was a problem hiding this comment.
These tests don't look right. For xArg: #^HERE^#, expected suggestion are global expression completions, but not argument labels.
xArg: #^COMPLETE_AFTER_VARARG_WITH_PREV_PARAM^# is currently the same as COMPLETE_AFTER_VARARG . This probably meant xArg: .bar, #^HERE^# which expects argument labels and global expressions.
There was a problem hiding this comment.
Of course 🤦 Updated the tests to test the right thing and the PR to behave according to the updated tests.
Currently, if the code completion token is after a label that refers to a vararg, it is part of that VarargExpansionExpr, so we don’t suggest the subsequent parameter’s label. Add special handling to detect this situation and suggest the parameter label. Fixes rdar://76355192
ahoppen
force-pushed
the
pr/complete-label-after-vararg
branch
from
242d7e2 to
7e536ff
Compare
|
@swift-ci Please test |
|
Build failed |
|
@swift-ci Please smoke test macOS |
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.
Currently, if the code completion token is after a label that refers to a vararg, it is part of that
VarargExpansionExpr, so we don’t suggest the subsequent parameter’s label.Add special handling to detect this situation and suggest the parameter label.
Fixes rdar://76355192