Merge pull request #1014 from schungx/master

Fix type parsing.

Author: schungx

src/api/definitions/mod.rs

@@ -491,11 +491,11 @@ impl FuncMetadata {
             first = false;
 
             let (param_name, param_type) = self.params_info.get(i).map_or(("_", "?".into()), |s| {
-                let (name, typ) = s.split_once(':').unwrap_or((s.trim(), "?"));
+                let (name, typ) = s.split_once(':').unwrap_or((s, ""));
                 (
                     name.trim().split(' ').last().unwrap().trim(),
                     match typ.trim() {
-                        "" | "?" => "?".into(),
+                        "" | "?" | "_" => "?".into(),
                         typ => def_type_name(typ, def.engine),
                     },
                 )

src/module/mod.rs

@@ -125,13 +125,13 @@ impl FuncMetadata {
                 .params_info
                 .iter()
                 .map(|param| {
-                    let (name, typ) = param.split_once(':').unwrap();
+                    let (name, typ) = param.split_once(':').unwrap_or((param, ""));
                     let name = match name.trim() {
-                        "" => "_",
+                        "" | "?" | "_" => "_",
                         s => s,
                     };
                     match typ.trim() {
-                        "" => name.into(),
+                        "" | "?" | "_" => name.into(),
                         typ => format!(
                             "{name}: {}",
                             format_param_type_for_display(&type_mapper(typ), false)

src/serde/metadata.rs

@@ -145,11 +145,16 @@ impl<'a> From<(&'a RhaiFunc, &'a FuncMetadata)> for FnMetadata<'a> {
                 .params_info
                 .iter()
                 .map(|s| {
-                    let (name, typ) = s.split_once(':').unwrap();
+                    let (name, typ) = s.split_once(':').unwrap_or((s.trim(), ""));
                     FnParam {
-                        name: (name.trim() != "_").then_some(name),
-                        typ: (!typ.trim().is_empty())
-                            .then(|| format_param_type_for_display(typ, false)),
+                        name: match name.trim() {
+                            "" | "?" | "_" => None,
+                            s => Some(s),
+                        },
+                        typ: match typ.trim() {
+                            "" | "?" | "_" => None,
+                            typ => Some(format_param_type_for_display(typ, false).into()),
+                        },
                     }
                 })
                 .collect(),