fix #867

CppCXY · CppCXY · commit eb6433523dc7 · 2025-12-02T17:17:59.000+08:00
diff --git a/crates/emmylua_code_analysis/src/compilation/analyzer/decl/docs.rs b/crates/emmylua_code_analysis/src/compilation/analyzer/decl/docs.rs
@@ -133,6 +133,7 @@ pub fn analyze_doc_tag_meta(analyzer: &mut DeclAnalyzer, tag: LuaDocTagMeta) ->
     let file_id = analyzer.get_file_id();
     analyzer.db.get_module_index_mut().set_meta(file_id);
     analyzer.is_meta = true;
+    analyzer.context.add_meta(file_id);
 
     if let Some(name_token) = tag.get_name_token() {
         let text = name_token.get_name_text();
diff --git a/crates/emmylua_code_analysis/src/compilation/analyzer/lua/mod.rs b/crates/emmylua_code_analysis/src/compilation/analyzer/lua/mod.rs
@@ -43,7 +43,7 @@ impl AnalysisPipeline for LuaAnalysisPipeline {
             .map(|x| (x.file_id, x.value.clone()))
             .collect::<HashMap<_, _>>();
         let file_dependency = db.get_file_dependencies_index().get_file_dependencies();
-        let order = file_dependency.get_best_analysis_order(file_ids.clone());
+        let order = file_dependency.get_best_analysis_order(&file_ids, &context.metas);
         for file_id in order {
             if let Some(root) = tree_map.get(&file_id) {
                 let mut analyzer = LuaAnalyzer::new(db, file_id, context);
diff --git a/crates/emmylua_code_analysis/src/compilation/analyzer/mod.rs b/crates/emmylua_code_analysis/src/compilation/analyzer/mod.rs
@@ -6,9 +6,14 @@ mod infer_cache_manager;
 mod lua;
 mod unresolve;
 
-use std::{collections::HashMap, sync::Arc};
-
-use crate::{Emmyrc, InFiled, InferFailReason, WorkspaceId, db_index::DbIndex, profile::Profile};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Arc,
+};
+
+use crate::{
+    Emmyrc, FileId, InFiled, InferFailReason, WorkspaceId, db_index::DbIndex, profile::Profile,
+};
 use emmylua_parser::LuaChunk;
 use infer_cache_manager::InferCacheManager;
 use unresolve::UnResolve;
@@ -121,6 +126,7 @@ pub struct AnalyzeContext {
     tree_list: Vec<InFiled<LuaChunk>>,
     #[allow(unused)]
     config: Arc<Emmyrc>,
+    metas: HashSet<FileId>,
     unresolves: Vec<(UnResolve, InferFailReason)>,
     infer_manager: InferCacheManager,
 }
@@ -130,11 +136,16 @@ impl AnalyzeContext {
         Self {
             tree_list: Vec::new(),
             config: emmyrc,
+            metas: HashSet::new(),
             unresolves: Vec::new(),
             infer_manager: InferCacheManager::new(),
         }
     }
 
+    pub fn add_meta(&mut self, file_id: FileId) {
+        self.metas.insert(file_id);
+    }
+
     pub fn add_tree_chunk(&mut self, tree: InFiled<LuaChunk>) {
         self.tree_list.push(tree);
     }
diff --git a/crates/emmylua_code_analysis/src/db_index/dependency/file_dependency_relation.rs b/crates/emmylua_code_analysis/src/db_index/dependency/file_dependency_relation.rs
@@ -11,17 +11,18 @@ impl<'a> FileDependencyRelation<'a> {
         Self { dependencies }
     }
 
-    pub fn get_best_analysis_order(&self, file_ids: Vec<FileId>) -> Vec<FileId> {
+    pub fn get_best_analysis_order(
+        &self,
+        file_ids: &[FileId],
+        metas: &HashSet<FileId>,
+    ) -> Vec<FileId> {
         let n = file_ids.len();
-        if n == 0 || self.dependencies.is_empty() {
-            return file_ids;
+        if n < 2 {
+            return file_ids.to_vec();
         }
 
-        let file_to_idx: HashMap<FileId, usize> = file_ids
-            .iter()
-            .enumerate()
-            .map(|(i, &f)| (f, i))
-            .collect();
+        let file_to_idx: HashMap<FileId, usize> =
+            file_ids.iter().enumerate().map(|(i, &f)| (f, i)).collect();
 
         let mut in_degree = vec![0usize; n];
         let mut adjacency: Vec<Vec<usize>> = vec![Vec::new(); n];
@@ -39,23 +40,53 @@ impl<'a> FileDependencyRelation<'a> {
         let mut result = Vec::with_capacity(n);
         let mut queue = VecDeque::with_capacity(n);
 
+        // 入度为0的节点，按优先级排序：meta文件优先，然后按FileId排序
         let mut zero_in_degree: Vec<usize> = (0..n).filter(|&i| in_degree[i] == 0).collect();
-        zero_in_degree.sort_by_key(|&i| file_ids[i]);
+        zero_in_degree.sort_by(|&a, &b| {
+            let a_is_meta = metas.contains(&file_ids[a]);
+            let b_is_meta = metas.contains(&file_ids[b]);
+            // meta文件优先（true > false，所以反过来比较）
+            match (b_is_meta, a_is_meta) {
+                (true, false) => std::cmp::Ordering::Greater,
+                (false, true) => std::cmp::Ordering::Less,
+                _ => file_ids[a].cmp(&file_ids[b]),
+            }
+        });
 
         for idx in zero_in_degree {
             queue.push_back(idx);
         }
 
         while let Some(idx) = queue.pop_front() {
             result.push(file_ids[idx]);
+
+            // 收集新的入度为0的节点
+            let mut new_zero: Vec<usize> = Vec::new();
             for &neighbor in &adjacency[idx] {
                 in_degree[neighbor] -= 1;
                 if in_degree[neighbor] == 0 {
-                    queue.push_back(neighbor);
+                    new_zero.push(neighbor);
                 }
             }
+
+            // 同样按优先级排序后加入队列
+            if new_zero.len() > 1 {
+                new_zero.sort_by(|&a, &b| {
+                    let a_is_meta = metas.contains(&file_ids[a]);
+                    let b_is_meta = metas.contains(&file_ids[b]);
+                    match (b_is_meta, a_is_meta) {
+                        (true, false) => std::cmp::Ordering::Greater,
+                        (false, true) => std::cmp::Ordering::Less,
+                        _ => file_ids[a].cmp(&file_ids[b]),
+                    }
+                });
+            }
+            for neighbor in new_zero {
+                queue.push_back(neighbor);
+            }
         }
 
+        // 处理循环依赖
         if result.len() < n {
             for (idx, &deg) in in_degree.iter().enumerate() {
                 if deg > 0 {
@@ -109,7 +140,8 @@ mod tests {
         // 文件2没有依赖
         map.insert(FileId::new(2), HashSet::new());
         let rel = FileDependencyRelation::new(&map);
-        let result = rel.get_best_analysis_order(vec![FileId::new(1), FileId::new(2)]);
+        let result =
+            rel.get_best_analysis_order(&[FileId::new(1), FileId::new(2)], &HashSet::default());
         // 文件2没有依赖，应该在前；文件1依赖文件2，在后
         assert_eq!(result, vec![FileId::new(2), FileId::new(1)]);
     }
@@ -133,7 +165,8 @@ mod tests {
         // 文件3没有依赖
         map.insert(3.into(), HashSet::new());
         let rel = FileDependencyRelation::new(&map);
-        let result = rel.get_best_analysis_order(vec![1.into(), 2.into(), 3.into()]);
+        let result =
+            rel.get_best_analysis_order(&[1.into(), 2.into(), 3.into()], &HashSet::default());
         // 文件3没有依赖，应该在最前面；然后是2，最后是1
         assert_eq!(result, vec![3.into(), 2.into(), 1.into()]);
     }
@@ -159,12 +192,15 @@ mod tests {
         map.insert(FileId::new(4), HashSet::new());
 
         let rel = FileDependencyRelation::new(&map);
-        let result = rel.get_best_analysis_order(vec![
-            FileId::new(1),
-            FileId::new(2),
-            FileId::new(3),
-            FileId::new(4),
-        ]);
+        let result = rel.get_best_analysis_order(
+            &[
+                FileId::new(1),
+                FileId::new(2),
+                FileId::new(3),
+                FileId::new(4),
+            ],
+            &HashSet::default(),
+        );
 
         // 文件3和4没有依赖，应该在前面
         assert_eq!(result[0], FileId::new(3));
@@ -190,4 +226,75 @@ mod tests {
         result.sort();
         assert_eq!(result, vec![FileId::new(1), FileId::new(2), FileId::new(4)]);
     }
+
+    #[test]
+    fn test_meta_files_first() {
+        let mut map = HashMap::new();
+        // 所有文件都没有依赖
+        map.insert(FileId::new(1), HashSet::new());
+        map.insert(FileId::new(2), HashSet::new());
+        map.insert(FileId::new(3), HashSet::new());
+        map.insert(FileId::new(4), HashSet::new());
+
+        let rel = FileDependencyRelation::new(&map);
+
+        // 文件2和4是meta文件
+        let mut metas = HashSet::new();
+        metas.insert(FileId::new(2));
+        metas.insert(FileId::new(4));
+
+        let result = rel.get_best_analysis_order(
+            &[
+                FileId::new(1),
+                FileId::new(2),
+                FileId::new(3),
+                FileId::new(4),
+            ],
+            &metas,
+        );
+
+        // meta文件应该在前面（2和4），非meta文件在后面（1和3）
+        assert!(metas.contains(&result[0]), "第一个应该是meta文件");
+        assert!(metas.contains(&result[1]), "第二个应该是meta文件");
+        assert!(!metas.contains(&result[2]), "第三个应该是非meta文件");
+        assert!(!metas.contains(&result[3]), "第四个应该是非meta文件");
+    }
+
+    #[test]
+    fn test_meta_with_dependencies() {
+        let mut map = HashMap::new();
+        // File 1 depends on file 2 (meta)
+        map.insert(FileId::new(1), {
+            let mut s = HashSet::new();
+            s.insert(FileId::new(2));
+            s
+        });
+        // File 2 (meta) has no dependencies
+        map.insert(FileId::new(2), HashSet::new());
+        // File 3 has no dependencies
+        map.insert(FileId::new(3), HashSet::new());
+
+        let rel = FileDependencyRelation::new(&map);
+
+        let mut metas = HashSet::new();
+        metas.insert(FileId::new(2));
+
+        let result =
+            rel.get_best_analysis_order(&[FileId::new(1), FileId::new(2), FileId::new(3)], &metas);
+
+        // File 2 is meta and has no dependencies, should be first
+        // File 3 has no dependencies but is not meta, should be second
+        // File 1 depends on file 2, should be last
+        assert_eq!(result[0], FileId::new(2), "meta file should be first");
+        assert_eq!(
+            result[1],
+            FileId::new(3),
+            "non-meta file with no dependencies should be second"
+        );
+        assert_eq!(
+            result[2],
+            FileId::new(1),
+            "file with dependencies should be last"
+        );
+    }
 }
diff --git a/crates/emmylua_code_analysis/src/db_index/type/mod.rs b/crates/emmylua_code_analysis/src/db_index/type/mod.rs
@@ -69,6 +69,7 @@ impl LuaTypeIndex {
         self.file_using_namespace.get(file_id)
     }
 
+    /// return previous FileId if exist
     pub fn add_type_decl(&mut self, file_id: FileId, type_decl: LuaTypeDecl) {
         let id = type_decl.get_id();
         self.file_types.entry(file_id).or_default().push(id.clone());
diff --git a/crates/emmylua_code_analysis/src/semantic/infer/infer_index.rs b/crates/emmylua_code_analysis/src/semantic/infer/infer_index.rs
@@ -149,6 +149,7 @@ pub fn infer_member_by_member_key(
 ) -> InferResult {
     match &prefix_type {
         LuaType::Table | LuaType::Any | LuaType::Unknown => Ok(LuaType::Any),
+        LuaType::Nil => Ok(LuaType::Never),
         LuaType::TableConst(id) => infer_table_member(db, cache, id.clone(), index_expr),
         LuaType::String
         | LuaType::Io
@@ -683,7 +684,9 @@ fn infer_union_member(
             &infer_guard.fork(),
         );
         if let Ok(typ) = result {
-            member_types.push(typ);
+            if !typ.is_never() {
+                member_types.push(typ);
+            }
         } else {
             member_types.push(LuaType::Nil);
         }
diff --git a/crates/emmylua_code_analysis/src/semantic/infer/test.rs b/crates/emmylua_code_analysis/src/semantic/infer/test.rs
@@ -49,4 +49,23 @@ mod test {
         let expected = ws.ty("Origin");
         assert_eq!(ty, expected);
     }
+
+    #[test]
+    fn test_issue_867() {
+        let mut ws = VirtualWorkspace::new();
+
+        ws.def(
+            r#"
+            local a --- @type { foo? : { bar: { baz: number } } }
+
+            local b = a.foo.bar -- a.foo may be nil (correct)
+
+            c = b.baz -- b may be nil (incorrect)
+        "#,
+        );
+
+        let ty = ws.expr_ty("c");
+        let expected = ws.ty("number");
+        assert_eq!(ty, expected);
+    }
 }
diff --git a/crates/emmylua_ls/src/handlers/test/code_actions_test.rs b/crates/emmylua_ls/src/handlers/test/code_actions_test.rs
@@ -22,16 +22,6 @@ mod tests {
                 local _a = A:get(1):get(2):get(3)
             "#,
             vec![
-                VirtualCodeAction {
-                    title: "Disable current line diagnostic (need-check-nil)".to_string()
-                },
-                VirtualCodeAction {
-                    title: "Disable all diagnostics in current file (need-check-nil)".to_string()
-                },
-                VirtualCodeAction {
-                    title:
-                        "Disable all diagnostics in current project (need-check-nil)".to_string()
-                },
                 VirtualCodeAction {
                     title: "use cast to remove nil".to_string()
                 },
@@ -45,16 +35,6 @@ mod tests {
                     title:
                         "Disable all diagnostics in current project (need-check-nil)".to_string()
                 },
-                VirtualCodeAction {
-                    title: "Disable current line diagnostic (need-check-nil)".to_string()
-                },
-                VirtualCodeAction {
-                    title: "Disable all diagnostics in current file (need-check-nil)".to_string()
-                },
-                VirtualCodeAction {
-                    title:
-                        "Disable all diagnostics in current project (need-check-nil)".to_string()
-                },
                 VirtualCodeAction {
                     title: "use cast to remove nil".to_string()
                 },
@@ -67,7 +47,7 @@ mod tests {
                 VirtualCodeAction {
                     title:
                         "Disable all diagnostics in current project (need-check-nil)".to_string()
-                },
+                }
             ]
         ));
 

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ impl LuaTypeIndex {`
`69`	`69`	`self.file_using_namespace.get(file_id)`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ /// return previous FileId if exist`
`72`	`73`	`pub fn add_type_decl(&mut self, file_id: FileId, type_decl: LuaTypeDecl) {`
`73`	`74`	`let id = type_decl.get_id();`
`74`	`75`	`self.file_types.entry(file_id).or_default().push(id.clone());`