fix: matching arguments with docs for format *args and **kwargs

Author: MaartenStaa

starlark/src/docs/mod.rs

@@ -509,14 +509,21 @@ impl DocFunction {
                     Some(args) => {
                         let entries = Self::parse_params(kind, args);
                         for x in &mut params {
-                            match x {
-                                DocParam::Arg { name, docs, .. }
-                                | DocParam::Args { name, docs, .. }
-                                | DocParam::Kwargs { name, docs, .. } => match entries.get(name) {
-                                    Some(raw) => *docs = DocString::from_docstring(kind, raw),
-                                    _ => (),
-                                },
-                                _ => (),
+                            if let Some((docs, raw)) = match x {
+                                DocParam::Arg { name, docs, .. } => {
+                                    entries.get(name).map(|raw| (docs, raw))
+                                }
+                                DocParam::Args { name, docs, .. } => entries
+                                    .get(name)
+                                    .or_else(|| entries.get(&format!("*{}", name)))
+                                    .map(|raw| (docs, raw)),
+                                DocParam::Kwargs { name, docs, .. } => entries
+                                    .get(name)
+                                    .or_else(|| entries.get(&format!("**{}", name)))
+                                    .map(|raw| (docs, raw)),
+                                _ => None,
+                            } {
+                                *docs = DocString::from_docstring(kind, raw);
                             }
                         }
                     }

starlark_lsp/src/docs.rs

@@ -38,15 +38,28 @@ pub(crate) fn get_doc_item_for_def<P: AstPayload>(def: &DefP<P>) -> Option<DocFu
             .params
             .iter()
             .filter_map(|param| match &param.node {
-                ParameterP::Normal(p, _)
-                | ParameterP::WithDefaultValue(p, _, _)
-                | ParameterP::Args(p, _)
-                | ParameterP::KwArgs(p, _) => Some(DocParam::Arg {
+                ParameterP::Normal(p, _) => Some(DocParam::Arg {
                     name: p.ident.to_owned(),
                     docs: None,
                     typ: Ty::any(),
                     default_value: None,
                 }),
+                ParameterP::Args(p, _) => Some(DocParam::Args {
+                    name: p.ident.to_owned(),
+                    docs: None,
+                    typ: Ty::any(),
+                }),
+                ParameterP::KwArgs(p, _) => Some(DocParam::Kwargs {
+                    name: p.ident.to_owned(),
+                    docs: None,
+                    typ: Ty::any(),
+                }),
+                ParameterP::WithDefaultValue(p, _, _) => Some(DocParam::Arg {
+                    name: p.ident.to_owned(),
+                    docs: None,
+                    typ: Ty::any(),
+                    default_value: Some("_".to_owned()),
+                }),
                 _ => None,
             })
             .collect();