completion: optimize env && clean code

Author: xuhuanzy

crates/emmylua_code_analysis/src/diagnostic/checker/mod.rs

@@ -230,7 +230,7 @@ impl<'a> DiagnosticContext<'a> {
     }
 }
 
-pub fn get_closure_expr_comment(closure_expr: &LuaClosureExpr) -> Option<LuaComment> {
+fn get_closure_expr_comment(closure_expr: &LuaClosureExpr) -> Option<LuaComment> {
     let comment = closure_expr
         .ancestors::<LuaStat>()
         .next()?

crates/emmylua_code_analysis/src/diagnostic/mod.rs

@@ -4,6 +4,5 @@ mod lua_diagnostic_code;
 mod lua_diagnostic_config;
 mod test;
 
-pub use checker::get_closure_expr_comment;
 pub use lua_diagnostic::LuaDiagnostic;
 pub use lua_diagnostic_code::DiagnosticCode;

crates/emmylua_ls/src/handlers/completion/completion_builder.rs

@@ -13,8 +13,7 @@ pub struct CompletionBuilder<'a> {
     cancel_token: CancellationToken,
     stopped: bool,
     pub trigger_kind: CompletionTriggerKind,
-    pub env_start_index: i32,
-    pub env_end_index: i32,
+    pub env_range: (usize, usize),
 }
 
 impl<'a> CompletionBuilder<'a> {
@@ -32,8 +31,7 @@ impl<'a> CompletionBuilder<'a> {
             cancel_token,
             stopped: false,
             trigger_kind,
-            env_start_index: -1,
-            env_end_index: -1,
+            env_range: (0, 0),
         }
     }
 
@@ -63,16 +61,13 @@ impl<'a> CompletionBuilder<'a> {
     }
 
     pub fn remove_env_completion_items(&mut self) {
-        if self.env_start_index == -1 || self.env_end_index == -1 {
+        if self.env_range == (0, 0) {
             return;
         }
-        if self.env_start_index <= self.env_end_index
-            && self.env_end_index < self.completion_items.len() as i32
-        {
+        if self.env_range.0 <= self.env_range.1 && self.env_range.1 < self.completion_items.len() {
             self.completion_items
-                .drain(self.env_start_index as usize..=self.env_end_index as usize);
+                .drain(self.env_range.0..=self.env_range.1 - 1);
         }
-        self.env_start_index = -1;
-        self.env_end_index = -1;
+        self.env_range = (0, 0);
     }
 }

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

@@ -29,10 +29,10 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
     };
 
     let mut duplicated_name = HashSet::new();
-    builder.env_start_index = builder.get_completion_items_mut().len() as i32;
+    builder.env_range.0 = builder.get_completion_items_mut().len();
     add_local_env(builder, &mut duplicated_name, &node);
     add_global_env(builder, &mut duplicated_name);
-    builder.env_end_index = builder.get_completion_items_mut().len() as i32 - 1;
+    builder.env_range.1 = builder.get_completion_items_mut().len();
 
     builder.env_duplicate_name.extend(duplicated_name);
 

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

@@ -1,12 +1,11 @@
 use emmylua_code_analysis::{
-    get_closure_expr_comment, InferGuard, LuaDeclLocation, LuaFunctionType, LuaMember,
-    LuaMemberKey, LuaMemberOwner, LuaMultiLineUnion, LuaPropertyOwnerId, LuaType, LuaTypeDeclId,
-    LuaUnionType, RenderLevel,
+    InferGuard, LuaDeclLocation, LuaFunctionType, LuaMember, LuaMemberKey, LuaMemberOwner,
+    LuaMultiLineUnion, LuaPropertyOwnerId, LuaType, LuaTypeDeclId, LuaUnionType, RenderLevel,
 };
 use emmylua_parser::{
     LuaAst, LuaAstNode, LuaAstToken, LuaCallArgList, LuaCallExpr, LuaClosureExpr, LuaComment,
-    LuaDocTagParam, LuaNameToken, LuaParamList, LuaSyntaxId, LuaSyntaxKind, LuaSyntaxToken,
-    LuaTokenKind, LuaVarExpr,
+    LuaDocTagParam, LuaNameToken, LuaParamList, LuaStat, LuaSyntaxId, LuaSyntaxKind,
+    LuaSyntaxToken, LuaTokenKind, LuaVarExpr,
 };
 use itertools::Itertools;
 use lsp_types::{CompletionItem, Documentation};
@@ -579,3 +578,18 @@ fn get_enum_decl_variable_name(
 
     None
 }
+
+fn get_closure_expr_comment(closure_expr: &LuaClosureExpr) -> Option<LuaComment> {
+    let comment = closure_expr
+        .ancestors::<LuaStat>()
+        .next()?
+        .syntax()
+        .prev_sibling()?;
+    match comment.kind().into() {
+        LuaSyntaxKind::Comment => {
+            let comment = LuaComment::cast(comment)?;
+            Some(comment)
+        }
+        _ => None,
+    }
+}

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

@@ -157,14 +157,10 @@ mod tests {
                     local Test = {}
                     Test.<??>
                 "#,
-            vec![
-                VirtualCompletionItem {
-                    label: "event".to_string(),
-                    kind: CompletionItemKind::FUNCTION,
-                },
-            ],
+            vec![VirtualCompletionItem {
+                label: "event".to_string(),
+                kind: CompletionItemKind::FUNCTION,
+            },],
         ));
     }
-
-
 }