update completion

Author: xuhuanzy

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

@@ -32,11 +32,8 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
     let file_conversion = emmyrc.completion.auto_require_naming_convention;
     let version_number = emmyrc.runtime.version.to_lua_version_number();
     let file_id = builder.semantic_model.get_file_id();
-    let module_infos = builder
-        .semantic_model
-        .get_db()
-        .get_module_index()
-        .get_module_infos();
+    let module_index = builder.semantic_model.get_db().get_module_index();
+    let module_infos = module_index.get_module_infos();
     let range = builder.trigger_token.text_range();
     let document = builder.semantic_model.get_document();
     let lsp_position = document.to_lsp_range(range)?.start;
@@ -46,6 +43,7 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
         if module_info.is_visible(&version_number)
             && module_info.file_id != file_id
             && module_info.export_type.is_some()
+            && !module_index.is_std(&module_info.file_id)
         {
             add_module_completion_item(
                 builder,

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

@@ -15,7 +15,6 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
     if builder.is_cancelled() {
         return None;
     }
-
     if check_can_add_completion(builder).is_none() {
         return Some(());
     }
@@ -58,12 +57,15 @@ fn check_can_add_completion(builder: &CompletionBuilder) -> Option<()> {
         }
     } else if builder.trigger_kind == CompletionTriggerKind::INVOKED {
         let parent = builder.trigger_token.parent()?;
-        let prev_token = builder.trigger_token.prev_token()?;
-        match prev_token.kind().into() {
-            LuaTokenKind::TkTagUsing | LuaTokenKind::TkTagExport | LuaTokenKind::TkTagNamespace => {
-                return None;
+        if let Some(prev_token) = builder.trigger_token.prev_token() {
+            match prev_token.kind().into() {
+                LuaTokenKind::TkTagUsing
+                | LuaTokenKind::TkTagExport
+                | LuaTokenKind::TkTagNamespace => {
+                    return None;
+                }
+                _ => {}
             }
-            _ => {}
         }
 
         // 即时是主动触发, 也不允许在函数定义的参数列表中添加
@@ -230,8 +232,15 @@ fn add_global_env(
 
 fn env_check_match_word(trigger_text: &str, name: &str) -> bool {
     // 如果首字母是`(`或者`,`则允许, 用于在函数参数调用处触发补全
-    match trigger_text.chars().next() {
-        Some('(') | Some(',') => true,
-        _ => check_match_word(trigger_text, name),
+    if matches!(trigger_text.chars().next(), Some('(') | Some(',')) {
+        return true;
+    }
+
+    if check_match_word(trigger_text, name) {
+        // 如果首字母匹配, 则需要检查 trigger_text 的每个字符是否都存在于 name 中
+
+        return true;
     }
+
+    false
 }

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

@@ -1131,4 +1131,17 @@ mod tests {
             ],
         ));
     }
+
+    #[test]
+    fn test_file_start() {
+        let mut ws = ProviderVirtualWorkspace::new_with_init_std_lib();
+        assert!(ws.check_completion(
+            "table<??>",
+            vec![VirtualCompletionItem {
+                label: "table".to_string(),
+                kind: CompletionItemKind::CLASS,
+                ..Default::default()
+            },],
+        ));
+    }
 }