修复 Diagnostics 导致的可选补全假阳性

Author: A4-Tacks

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bangls"
-version = "0.1.7"
+version = "0.1.8"
 edition = "2024"
 
 [features]

tools/bangls/Cargo.toml

@@ -318,9 +318,12 @@ impl RequestHandler for request::DocumentDiagnosticRequest {
 }
 
 fn generate_completes(infos: &[EmulateInfo]) -> Vec<CompletionItem> {
+    let infos = infos.iter()
+        .filter_map(|it| it.exist_vars.as_ref());
+    let full_count = infos.clone().count() as u32;
     let mut var_counter: LinkedHashMap<&syntax::Var, (u32, Vec<_>)> = LinkedHashMap::new();
     for info in infos {
-        for (kind, var) in info.exist_vars.iter() {
+        for (kind, var) in info {
             if var.starts_with("__") {
                 continue;
             }
@@ -329,7 +332,6 @@ fn generate_completes(infos: &[EmulateInfo]) -> Vec<CompletionItem> {
             kinds.push(kind);
         }
     }
-    let full_count = infos.len() as u32;
     var_counter.iter().map(|(&var, &(count, ref kinds))| {
         let is_full_deps = count == full_count;
 

tools/bangls/src/main.rs

@@ -4193,7 +4193,7 @@ pub enum Emulate {
 
 #[derive(Debug, Default)]
 pub struct EmulateInfo {
-    pub exist_vars: Vec<(Emulate, Var)>,
+    pub exist_vars: Option<Vec<(Emulate, Var)>>,
     pub location: Option<(u32, u32)>,
     pub diagnostic: Option<String>,
     pub is_error: bool,
@@ -4536,7 +4536,7 @@ impl CompileMeta {
             .for_each(|(kind, var)| if printed.insert(var) {
                 vars.push((kind, var.clone()));
             });
-        self.emulate(EmulateInfo { exist_vars: vars, ..Default::default() });
+        self.emulate(EmulateInfo { exist_vars: Some(vars), ..Default::default() });
     }
 
     fn debug_hover_var_status(&mut self, var: &mut Var) -> HoverGuard<'_> {
@@ -4573,7 +4573,7 @@ impl CompileMeta {
             }
             bind_vars
         });
-        self.emulate(EmulateInfo { exist_vars: bind_vars, ..Default::default() });
+        self.emulate(EmulateInfo { exist_vars: Some(bind_vars), ..Default::default() });
     }
 
     /// 进入一个拥有子命名空间的子块