Skip to content

Commit efbb732

Browse files
[ty] Suggest keyword-only arguments between variadic parameters (#26134)
## Summary Functions with unannotated `*args` and `**kwargs` use a gradual parameter list. Prior to this change, we omitted all structured parameters for gradual signatures when building signature help, including explicit keyword-only parameters retained between the variadics: ```python def func(*args, special, **kwargs): ... func(sp<CURSOR>) ``` This extracts displayed parameters from gradual signatures the same way we do for standard and `Concatenate` signatures. Pure `(*args, **kwargs)` signatures still render their parameters as `...` and expose no concrete parameters, while retained parameters such as `special` are now available to keyword-argument completion. The regression test covers both reported shapes, with and without a positional parameter before `*args`. Closes astral-sh/ty#3803.
1 parent c256d5f commit efbb732

2 files changed

Lines changed: 35 additions & 2 deletions

File tree

‎crates/ty_ide/src/completion.rs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5127,6 +5127,39 @@ bar(o<CURSOR>
51275127
);
51285128
}
51295129

5130+
// Regression test for https://github.com/astral-sh/ty/issues/3803
5131+
#[test]
5132+
fn call_keyword_only_argument_between_variadic_parameters() {
5133+
completion_test_builder(
5134+
"\
5135+
def func(*args, special, **kw): ...
5136+
5137+
func(sp<CURSOR>
5138+
",
5139+
)
5140+
.skip_keywords()
5141+
.skip_builtins()
5142+
.skip_auto_import()
5143+
.build()
5144+
.contains("special");
5145+
}
5146+
5147+
#[test]
5148+
fn call_keyword_only_argument_between_variadic_parameters_after_positional_argument() {
5149+
completion_test_builder(
5150+
"\
5151+
def func(arg1, *arg2, special, **kw): ...
5152+
5153+
func(sp<CURSOR>
5154+
",
5155+
)
5156+
.skip_keywords()
5157+
.skip_builtins()
5158+
.skip_auto_import()
5159+
.build()
5160+
.contains("special");
5161+
}
5162+
51305163
#[test]
51315164
fn call_multiple_keyword_arguments() {
51325165
let builder = completion_test_builder(

‎crates/ty_python_semantic/src/types/ide_support.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ fn displayed_parameters_for_signature<'db>(
647647
let parameters = signature.parameters();
648648

649649
match parameters.kind() {
650-
ParametersKind::Standard | ParametersKind::Concatenate(_) => {
650+
ParametersKind::Standard | ParametersKind::Gradual | ParametersKind::Concatenate(_) => {
651651
let mut displayed_parameters = Vec::new();
652652
let mut parameter_to_displayed_parameter_mapping = vec![None; parameters.len()];
653653

@@ -721,7 +721,7 @@ fn displayed_parameters_for_signature<'db>(
721721
vec![Some(0); parameters.len()],
722722
)
723723
}
724-
ParametersKind::Gradual | ParametersKind::Top => (Vec::new(), vec![None; parameters.len()]),
724+
ParametersKind::Top => (Vec::new(), vec![None; parameters.len()]),
725725
}
726726
}
727727

0 commit comments

Comments
 (0)