optimize auto-require

Author: xuhuanzy

crates/emmylua_ls/src/handlers/completion/add_completions/mod.rs

@@ -30,7 +30,7 @@ pub fn check_visibility(builder: &mut CompletionBuilder, id: LuaSemanticDeclId)
     Some(())
 }
 
-fn get_completion_kind(typ: &LuaType) -> CompletionItemKind {
+pub fn get_completion_kind(typ: &LuaType) -> CompletionItemKind {
     if typ.is_function() {
         return CompletionItemKind::FUNCTION;
     } else if typ.is_const() {

crates/emmylua_ls/src/handlers/completion/providers/auto_require_provider.rs

@@ -7,7 +7,10 @@ use lsp_types::{CompletionItem, Position};
 use crate::{
     handlers::{
         command::make_auto_require,
-        completion::{completion_builder::CompletionBuilder, completion_data::CompletionData},
+        completion::{
+            add_completions::get_completion_kind, completion_builder::CompletionBuilder,
+            completion_data::CompletionData,
+        },
     },
     util::{key_name_convert, module_name_convert},
 };
@@ -177,7 +180,7 @@ fn try_add_member_completion_items(
 
                         let completion_item = CompletionItem {
                             label: key_name,
-                            kind: Some(lsp_types::CompletionItemKind::MODULE),
+                            kind: Some(get_completion_kind(&member_info.typ)),
                             label_details: Some(lsp_types::CompletionItemLabelDetails {
                                 detail: Some(format!("    (in {})", module_info.full_module_name)),
                                 ..Default::default()

crates/emmylua_ls/src/handlers/references/reference_seacher.rs

@@ -6,7 +6,7 @@ use emmylua_code_analysis::{
 };
 use emmylua_parser::{
     LuaAssignStat, LuaAst, LuaAstNode, LuaAstToken, LuaNameToken, LuaStringToken, LuaSyntaxNode,
-    LuaSyntaxToken,
+    LuaSyntaxToken, LuaTableField,
 };
 use lsp_types::Location;
 
@@ -280,7 +280,16 @@ fn get_signature_decl_member_references(
                 search_member_references(semantic_model, compilation, member_id, result);
             }
         }
-
+        table_field_node if LuaTableField::can_cast(table_field_node.kind().into()) => {
+            let table_field = LuaTableField::cast(table_field_node)?;
+            let decl_id = semantic_model.find_decl(
+                table_field.syntax().clone().into(),
+                SemanticDeclLevel::default(),
+            )?;
+            if let LuaSemanticDeclId::Member(member_id) = decl_id {
+                search_member_references(semantic_model, compilation, member_id, result);
+            }
+        }
         _ => {}
     }
     None

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

@@ -928,7 +928,7 @@ mod tests {
             "#,
             vec![VirtualCompletionItem {
                 label: "MapName".to_string(),
-                kind: CompletionItemKind::MODULE,
+                kind: CompletionItemKind::CLASS,
                 label_detail: Some("    (in aaaa)".to_string()),
             },],
         ));

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

@@ -26,4 +26,28 @@ mod tests {
         let locations = result.unwrap();
         assert!(locations.len() >= 4);
     }
+
+    #[test]
+    fn test_function_references_2() {
+        let mut ws = ProviderVirtualWorkspace::new();
+        ws.def_file(
+            "1.lua",
+            r#"
+                local flush = require("virtual_0").flush
+                flush()
+            "#,
+        );
+        let result = ws.check_references(
+            r#"
+                local function fl<??>ush()
+                end
+                return {
+                    flush = flush,
+                }
+            "#,
+        );
+        assert!(result.is_some());
+        let locations = result.unwrap();
+        assert!(locations.len() >= 4);
+    }
 }