optimize hover function

Author: xuhuanzy

crates/emmylua_code_analysis/src/db_index/type/humanize_type.rs

@@ -185,8 +185,8 @@ where
 {
     let types = union.get_types();
     let num = match level {
-        RenderLevel::Detailed => 10,
-        RenderLevel::Simple => 8,
+        RenderLevel::Detailed => 8,
+        RenderLevel::Simple => 6,
         RenderLevel::Normal => 4,
         RenderLevel::Brief => 2,
         RenderLevel::Minimal => {

crates/emmylua_ls/src/handlers/hover/hover_humanize.rs

@@ -49,6 +49,7 @@ pub fn hover_function_type(
                 function_member,
                 func_name,
                 is_local,
+                false,
             )
             .unwrap_or_else(|| {
                 builder.signature_overload = None;
@@ -103,6 +104,7 @@ fn hover_union_function_type(
                     function_member,
                     func_name,
                     false,
+                    true,
                 ) {
                     overloads.push(type_description);
                 }
@@ -197,8 +199,12 @@ fn hover_signature_type(
     owner_member: Option<&LuaMember>,
     func_name: &str,
     is_local: bool,
+    is_form_union: bool,
 ) -> Option<String> {
     let signature = db.get_signature_index().get(&signature_id)?;
+    if is_form_union && signature.param_docs.is_empty() {
+        return None;
+    }
     let call_signature = builder.get_call_signature();
 
     let mut type_label = "function ";
@@ -359,42 +365,43 @@ fn build_signature_rets(
             }
         };
         result.push_str(rets.as_str());
+        return result;
+    }
+
+    let rets = if !overload_rets_string.is_empty() {
+        overload_rets_string
     } else {
-        let rets = if !overload_rets_string.is_empty() {
-            overload_rets_string
+        let rets = &signature.return_docs;
+        if rets.is_empty() {
+            "".to_string()
         } else {
-            let rets = &signature.return_docs;
-            if rets.is_empty() {
-                "".to_string()
-            } else {
-                let mut rets_string_multiline = String::new();
-                rets_string_multiline.push_str("\n");
+            let mut rets_string_multiline = String::new();
+            rets_string_multiline.push_str("\n");
 
-                for (i, ret) in rets.iter().enumerate() {
-                    let type_text = build_signature_ret_type(builder, ret, i);
-                    let prefix = if i == 0 {
-                        "-> ".to_string()
-                    } else {
-                        format!("{}. ", i + 1)
-                    };
-                    let name = ret.name.clone().unwrap_or_default();
+            for (i, ret) in rets.iter().enumerate() {
+                let type_text = build_signature_ret_type(builder, ret, i);
+                let prefix = if i == 0 {
+                    "-> ".to_string()
+                } else {
+                    format!("{}. ", i + 1)
+                };
+                let name = ret.name.clone().unwrap_or_default();
 
-                    rets_string_multiline.push_str(&format!(
-                        "  {}{}{}\n",
-                        prefix,
-                        if !name.is_empty() {
-                            format!("{}: ", name)
-                        } else {
-                            "".to_string()
-                        },
-                        type_text,
-                    ));
-                }
-                rets_string_multiline
+                rets_string_multiline.push_str(&format!(
+                    "  {}{}{}\n",
+                    prefix,
+                    if !name.is_empty() {
+                        format!("{}: ", name)
+                    } else {
+                        "".to_string()
+                    },
+                    type_text,
+                ));
             }
-        };
-        result.push_str(rets.as_str());
+            rets_string_multiline
+        }
     };
+    result.push_str(rets.as_str());
     result
 }
 

crates/emmylua_ls/src/handlers/hover/test/hover_test.rs

@@ -103,4 +103,19 @@ mod tests {
             },
         ));
     }
+
+    #[test]
+    fn test_function_infer_return_val() {
+        let mut ws = HoverVirtualWorkspace::new();
+        assert!(ws.check_hover(
+            r#"
+                local function <??>f(a, b)
+                    a = 1
+                end
+            "#,
+            VirtualHoverResult {
+                value: "\n```lua\nlocal function f(a, b)\n```\n\n---\n\n\n".to_string(),
+            },
+        ));
+    }
 }