Merge pull request #828 from xuhuanzy/fix

fix hover

Author: CppCXY

crates/emmylua_ls/src/handlers/hover/function/mod.rs

@@ -313,6 +313,12 @@ fn hover_doc_function_type(
                         builder.semantic_model,
                         Some(&LuaType::Ref(type_decl_id.clone())),
                     );
+                    if is_method {
+                        type_label = "(method) ";
+                        name.push(':');
+                    } else {
+                        name.push('.');
+                    }
                 }
                 LuaMemberOwner::Element(element_id) => {
                     if let Some(LuaType::Ref(type_decl_id) | LuaType::Def(type_decl_id)) =
@@ -326,22 +332,23 @@ fn hover_doc_function_type(
                             builder.semantic_model,
                             Some(&LuaType::Ref(type_decl_id.clone())),
                         );
+                        if is_method {
+                            type_label = "(method) ";
+                            name.push(':');
+                        } else {
+                            name.push('.');
+                        }
                     } else if let Some(owner_name) =
                         extract_owner_name_from_element(builder.semantic_model, element_id)
                     {
                         name.push_str(&owner_name);
+                        name.push('.');
                     }
                 }
                 _ => {}
             }
         }
 
-        if is_method {
-            type_label = "(method) ";
-            name.push(':');
-        } else {
-            name.push('.');
-        }
         if let LuaMemberKey::Name(n) = owner_member.get_key() {
             name.push_str(n.as_str());
         }
@@ -361,11 +368,7 @@ fn hover_doc_function_type(
             if index == 0 && is_method && !func.is_colon_define() {
                 "".to_string()
             } else if let Some(ty) = &param.1 {
-                format!(
-                    "{}: {}",
-                    name,
-                    humanize_type(db, ty, builder.detail_render_level)
-                )
+                format!("{}: {}", name, humanize_type(db, ty, RenderLevel::Simple))
             } else {
                 name.to_string()
             }

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

@@ -7,6 +7,7 @@ use emmylua_code_analysis::{
 use emmylua_code_analysis::humanize_type;
 use emmylua_parser::{
     LuaAstNode, LuaExpr, LuaIndexExpr, LuaStat, LuaSyntaxId, LuaSyntaxKind, LuaTableExpr,
+    LuaVarExpr,
 };
 use rowan::TextRange;
 
@@ -232,14 +233,34 @@ pub fn extract_owner_name_from_element(
     // 通过 TextRange 找到对应的 AST 节点
     let node = LuaSyntaxId::to_node_at_range(&root, element_id.value)?;
     let stat = LuaStat::cast(node.clone().parent()?)?;
-    if let LuaStat::LocalStat(local_stat) = stat {
-        let value = LuaExpr::cast(node)?;
-        let local_name = local_stat.get_local_name_by_value(value);
-        if let Some(local_name) = local_name {
-            return Some(local_name.get_name_token()?.get_name_text().to_string());
+    match stat {
+        LuaStat::LocalStat(local_stat) => {
+            let value = LuaExpr::cast(node)?;
+            let local_name = local_stat.get_local_name_by_value(value);
+            if let Some(local_name) = local_name {
+                return Some(local_name.get_name_token()?.get_name_text().to_string());
+            }
         }
+        LuaStat::AssignStat(assign_stat) => {
+            let value = LuaExpr::cast(node)?;
+            let (vars, values) = assign_stat.get_var_and_expr_list();
+            let idx = values
+                .iter()
+                .position(|v| v.get_syntax_id() == value.get_syntax_id())?;
+            let var = vars.get(idx)?;
+            match var {
+                LuaVarExpr::NameExpr(name_expr) => {
+                    return Some(name_expr.get_name_token()?.get_name_text().to_string());
+                }
+                LuaVarExpr::IndexExpr(index_expr) => {
+                    if let Some(index_key) = index_expr.get_index_key() {
+                        return Some(index_key.get_path_part());
+                    }
+                }
+            }
+        }
+        _ => {}
     }
-
     None
 }
 

crates/emmylua_ls/src/handlers/test/hover_function_test.rs

@@ -584,4 +584,64 @@ mod tests {
         ));
         Ok(())
     }
+
+    #[gtest]
+    fn test_fix_global_index_function_1() -> Result<()> {
+        let mut ws = ProviderVirtualWorkspace::new();
+        check!(ws.check_hover(
+            r#"
+            M = {}
+            function M.te<??>st()
+            end
+
+            "#,
+            VirtualHoverResult {
+                value: "```lua\nfunction M.test()\n```".to_string(),
+            },
+        ));
+        Ok(())
+    }
+
+    #[gtest]
+    fn test_fix_global_index_function_2() -> Result<()> {
+        let mut ws = ProviderVirtualWorkspace::new();
+        // TODO: 构建完整的访问路径
+        check!(ws.check_hover(
+            r#"
+            M = {
+                K = {}
+            }
+            M.K.<??>Value = function()
+            end
+            "#,
+            VirtualHoverResult {
+                value: "```lua\nfunction Value()\n```".to_string(),
+            },
+        ));
+        Ok(())
+    }
+
+    #[gtest]
+    fn test_fix_ref() -> Result<()> {
+        let mut ws = ProviderVirtualWorkspace::new();
+        ws.def(
+            r#"
+            ---@class Player
+            ---@field name string
+
+            ---@param player Player
+            function CreatePlayer(player)
+            end
+        "#,
+        );
+        check!(ws.check_hover(
+            r#"
+            Creat<??>ePlayer({name = "John"})
+            "#,
+            VirtualHoverResult {
+                value: "```lua\nfunction CreatePlayer(player: Player)\n```".to_string(),
+            },
+        ));
+        Ok(())
+    }
 }