clean code

CppCXY · CppCXY · commit 2a51ecdd1275 · 2025-07-22T11:48:45.000+08:00
diff --git a/crates/emmylua_code_analysis/src/compilation/analyzer/lua/module.rs b/crates/emmylua_code_analysis/src/compilation/analyzer/lua/module.rs
@@ -26,7 +26,7 @@ pub fn analyze_chunk_return(analyzer: &mut LuaAnalyzer, chunk: LuaChunk) -> Opti
                     }
                 };
 
-                let property_owner_id = get_property_owner_id(analyzer, expr.clone());
+                let semantic_id = get_semantic_id(analyzer, expr.clone());
 
                 let module_info = analyzer
                     .db
@@ -41,7 +41,7 @@ pub fn analyze_chunk_return(analyzer: &mut LuaAnalyzer, chunk: LuaChunk) -> Opti
                         module_info.export_type = Some(expr_type);
                     }
                 }
-                module_info.property_owner_id = property_owner_id;
+                module_info.semantic_id = semantic_id;
                 break;
             }
             // Other cases are stupid code
@@ -52,7 +52,7 @@ pub fn analyze_chunk_return(analyzer: &mut LuaAnalyzer, chunk: LuaChunk) -> Opti
     Some(())
 }
 
-fn get_property_owner_id(analyzer: &LuaAnalyzer, expr: LuaExpr) -> Option<LuaSemanticDeclId> {
+fn get_semantic_id(analyzer: &LuaAnalyzer, expr: LuaExpr) -> Option<LuaSemanticDeclId> {
     match expr {
         LuaExpr::NameExpr(name_expr) => {
             let name = name_expr.get_name_text()?;
diff --git a/crates/emmylua_code_analysis/src/db_index/member/lua_owner_members.rs b/crates/emmylua_code_analysis/src/db_index/member/lua_owner_members.rs
@@ -0,0 +1,74 @@
+use std::collections::HashMap;
+
+use crate::{LuaMemberIndexItem, LuaMemberKey};
+
+#[allow(unused)]
+#[derive(Debug, Clone)]
+pub struct LuaOwnerMembers {
+    members: HashMap<LuaMemberKey, LuaMemberIndexItem>,
+    resolve_state: OwnerMemberStatus,
+}
+
+#[allow(unused)]
+impl LuaOwnerMembers {
+    pub fn new() -> Self {
+        Self {
+            members: HashMap::new(),
+            resolve_state: OwnerMemberStatus::UnResolved,
+        }
+    }
+
+    pub fn add_member(&mut self, key: LuaMemberKey, item: LuaMemberIndexItem) {
+        self.members.insert(key, item);
+    }
+
+    pub fn get_member(&self, key: &LuaMemberKey) -> Option<&LuaMemberIndexItem> {
+        self.members.get(key)
+    }
+
+    pub fn contains_member(&self, key: &LuaMemberKey) -> bool {
+        self.members.contains_key(key)
+    }
+
+    pub fn get_member_len(&self) -> usize {
+        self.members.len()
+    }
+
+    pub fn get_member_mut(&mut self, key: &LuaMemberKey) -> Option<&mut LuaMemberIndexItem> {
+        self.members.get_mut(key)
+    }
+
+    pub fn get_member_items(&self) -> impl Iterator<Item = &LuaMemberIndexItem> {
+        self.members.values()
+    }
+
+    pub fn iter_mut(&mut self) -> impl Iterator<Item = (&LuaMemberKey, &mut LuaMemberIndexItem)> {
+        self.members.iter_mut()
+    }
+
+    pub fn remove_member(&mut self, key: &LuaMemberKey) -> Option<LuaMemberIndexItem> {
+        self.members.remove(key)
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.members.is_empty()
+    }
+
+    pub fn set_resolved(&mut self) {
+        self.resolve_state = OwnerMemberStatus::Resolved;
+    }
+
+    pub fn set_unresolved(&mut self) {
+        self.resolve_state = OwnerMemberStatus::UnResolved;
+    }
+
+    pub fn is_resolved(&self) -> bool {
+        matches!(self.resolve_state, OwnerMemberStatus::Resolved)
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum OwnerMemberStatus {
+    UnResolved,
+    Resolved,
+}
diff --git a/crates/emmylua_code_analysis/src/db_index/member/mod.rs b/crates/emmylua_code_analysis/src/db_index/member/mod.rs
@@ -2,11 +2,12 @@ mod lua_member;
 mod lua_member_feature;
 mod lua_member_item;
 mod lua_member_owner;
+mod lua_owner_members;
 
 use std::collections::{HashMap, HashSet};
 
 use super::traits::LuaIndex;
-use crate::FileId;
+use crate::{db_index::member::lua_owner_members::LuaOwnerMembers, FileId};
 pub use lua_member::{LuaMember, LuaMemberId, LuaMemberKey};
 pub use lua_member_feature::LuaMemberFeature;
 pub use lua_member_item::LuaMemberIndexItem;
@@ -16,7 +17,7 @@ pub use lua_member_owner::LuaMemberOwner;
 pub struct LuaMemberIndex {
     members: HashMap<LuaMemberId, LuaMember>,
     in_filed: HashMap<FileId, HashSet<MemberOrOwner>>,
-    owner_members: HashMap<LuaMemberOwner, HashMap<LuaMemberKey, LuaMemberIndexItem>>,
+    owner_members: HashMap<LuaMemberOwner, LuaOwnerMembers>,
     member_current_owner: HashMap<LuaMemberId, LuaMemberOwner>,
 }
 
@@ -63,9 +64,9 @@ impl LuaMemberIndex {
         let member_map = self
             .owner_members
             .entry(owner.clone())
-            .or_insert_with(HashMap::new);
+            .or_insert_with(LuaOwnerMembers::new);
         if feature.is_decl() {
-            if let Some(item) = member_map.get_mut(&key) {
+            if let Some(item) = member_map.get_member_mut(&key) {
                 match item {
                     LuaMemberIndexItem::One(old_id) => {
                         if old_id != &id {
@@ -80,15 +81,15 @@ impl LuaMemberIndex {
                     }
                 }
             } else {
-                member_map.insert(key.clone(), LuaMemberIndexItem::One(id));
+                member_map.add_member(key.clone(), LuaMemberIndexItem::One(id));
             }
         } else {
-            if !member_map.contains_key(&key) {
-                member_map.insert(key, LuaMemberIndexItem::One(id));
+            if !member_map.contains_member(&key) {
+                member_map.add_member(key, LuaMemberIndexItem::One(id));
                 return Some(());
             }
 
-            let item = member_map.get(&key)?.clone();
+            let item = member_map.get_member(&key)?.clone();
             let new_items = if self.is_item_only_meta(&item) {
                 match item {
                     LuaMemberIndexItem::One(old_id) => {
@@ -112,8 +113,8 @@ impl LuaMemberIndex {
 
             self.owner_members
                 .entry(owner.clone())
-                .or_insert_with(HashMap::new)
-                .insert(key.clone(), new_items);
+                .or_insert_with(LuaOwnerMembers::new)
+                .add_member(key.clone(), new_items);
         }
 
         Some(())
@@ -164,7 +165,7 @@ impl LuaMemberIndex {
     pub fn get_members(&self, owner: &LuaMemberOwner) -> Option<Vec<&LuaMember>> {
         let member_items = self.owner_members.get(owner)?;
         let mut members = Vec::new();
-        for (_, item) in member_items {
+        for item in member_items.get_member_items() {
             match item {
                 LuaMemberIndexItem::One(id) => {
                     if let Some(member) = self.get_member(id) {
@@ -192,7 +193,7 @@ impl LuaMemberIndex {
         let owner = self.member_current_owner.get(&member_id)?;
         let member_key = self.members.get(&member_id)?.get_key();
         let member_items = self.owner_members.get(owner)?;
-        let item = member_items.get(member_key)?;
+        let item = member_items.get_member(member_key)?;
         Some(item)
     }
 
@@ -207,11 +208,15 @@ impl LuaMemberIndex {
         owner: &LuaMemberOwner,
         key: &LuaMemberKey,
     ) -> Option<&LuaMemberIndexItem> {
-        self.owner_members.get(owner).and_then(|map| map.get(key))
+        self.owner_members
+            .get(owner)
+            .and_then(|map| map.get_member(key))
     }
 
     pub fn get_member_len(&self, owner: &LuaMemberOwner) -> usize {
-        self.owner_members.get(owner).map_or(0, |map| map.len())
+        self.owner_members
+            .get(owner)
+            .map_or(0, |map| map.get_member_len())
     }
 
     pub fn get_current_owner(&self, id: &LuaMemberId) -> Option<&LuaMemberOwner> {
@@ -256,7 +261,7 @@ impl LuaIndex for LuaMemberIndex {
                     }
 
                     for key in need_removed_key {
-                        member_items.remove(&key);
+                        member_items.remove_member(&key);
                     }
 
                     if member_items.is_empty() {
diff --git a/crates/emmylua_code_analysis/src/db_index/module/mod.rs b/crates/emmylua_code_analysis/src/db_index/module/mod.rs
@@ -177,7 +177,7 @@ impl LuaModuleIndex {
             export_type: None,
             version_conds: None,
             workspace_id,
-            property_owner_id: None,
+            semantic_id: None,
             is_meta: false,
         };
 
diff --git a/crates/emmylua_code_analysis/src/db_index/module/module_info.rs b/crates/emmylua_code_analysis/src/db_index/module/module_info.rs
@@ -14,7 +14,7 @@ pub struct ModuleInfo {
     pub export_type: Option<LuaType>,
     pub version_conds: Option<Box<Vec<LuaVersionCondition>>>,
     pub workspace_id: WorkspaceId,
-    pub property_owner_id: Option<LuaSemanticDeclId>,
+    pub semantic_id: Option<LuaSemanticDeclId>,
     pub is_meta: bool,
 }
 
@@ -38,7 +38,7 @@ impl ModuleInfo {
     }
 
     pub fn is_export(&self, db: &DbIndex) -> bool {
-        let Some(property_owner_id) = &self.property_owner_id else {
+        let Some(property_owner_id) = &self.semantic_id else {
             return false;
         };
 
@@ -49,7 +49,7 @@ impl ModuleInfo {
     }
 
     pub fn get_export<'a>(&self, db: &'a DbIndex) -> Option<&'a LuaExport> {
-        let property_owner_id = self.property_owner_id.as_ref()?;
+        let property_owner_id = self.semantic_id.as_ref()?;
         let export = db
             .get_property_index()
             .get_property(property_owner_id)?
diff --git a/crates/emmylua_doc_cli/src/json_generator/export.rs b/crates/emmylua_doc_cli/src/json_generator/export.rs
@@ -38,7 +38,7 @@ fn export_modules(db: &DbIndex) -> Vec<Module> {
             };
 
             let property = module
-                .property_owner_id
+                .semantic_id
                 .as_ref()
                 .map(|decl_id| export_property(db, decl_id))
                 .unwrap_or_default();
diff --git a/crates/emmylua_doc_cli/src/markdown_generator/gen/mod_gen.rs b/crates/emmylua_doc_cli/src/markdown_generator/gen/mod_gen.rs
@@ -27,7 +27,7 @@ pub fn generate_module_markdown(
     let mut context = tera::Context::new();
     let mut doc = Doc::default();
     doc.name = module.full_module_name.clone();
-    let property_owner_id = module.property_owner_id.clone();
+    let property_owner_id = module.semantic_id.clone();
     if let Some(property_id) = property_owner_id {
         doc.property = collect_property(db, property_id);
     }
diff --git a/crates/emmylua_ls/src/handlers/completion/providers/auto_require_provider.rs b/crates/emmylua_ls/src/handlers/completion/providers/auto_require_provider.rs
@@ -94,7 +94,7 @@ fn add_module_completion_item(
         return None;
     }
 
-    let data = if let Some(property_id) = &module_info.property_owner_id {
+    let data = if let Some(property_id) = &module_info.semantic_id {
         CompletionData::from_property_owner_id(builder, property_id.clone(), None)
     } else {
         None
diff --git a/crates/emmylua_ls/src/handlers/completion/providers/module_path_provider.rs b/crates/emmylua_ls/src/handlers/completion/providers/module_path_provider.rs
@@ -58,7 +58,7 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
         };
         if let Some(child_file_id) = child_module_node.file_ids.first() {
             let child_module_info = db.get_module_index().get_module(*child_file_id)?;
-            let data = if let Some(property_id) = &child_module_info.property_owner_id {
+            let data = if let Some(property_id) = &child_module_info.semantic_id {
                 CompletionData::from_property_owner_id(builder, property_id.clone(), None)
             } else {
                 None

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ pub fn analyze_chunk_return(analyzer: &mut LuaAnalyzer, chunk: LuaChunk) -> Opti`
`26`	`26`	`}`
`27`	`27`	`};`
`28`	`28`
`29`		`- let property_owner_id = get_property_owner_id(analyzer, expr.clone());`
	`29`	`+ let semantic_id = get_semantic_id(analyzer, expr.clone());`
`30`	`30`
`31`	`31`	`let module_info = analyzer`
`32`	`32`	`.db`
`@@ -41,7 +41,7 @@ pub fn analyze_chunk_return(analyzer: &mut LuaAnalyzer, chunk: LuaChunk) -> Opti`
`41`	`41`	`module_info.export_type = Some(expr_type);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`		`- module_info.property_owner_id = property_owner_id;`
	`44`	`+ module_info.semantic_id = semantic_id;`
`45`	`45`	`break;`
`46`	`46`	`}`
`47`	`47`	`// Other cases are stupid code`
`@@ -52,7 +52,7 @@ pub fn analyze_chunk_return(analyzer: &mut LuaAnalyzer, chunk: LuaChunk) -> Opti`
`52`	`52`	`Some(())`
`53`	`53`	`}`
`54`	`54`
`55`		`-fn get_property_owner_id(analyzer: &LuaAnalyzer, expr: LuaExpr) -> Option<LuaSemanticDeclId> {`
	`55`	`+fn get_semantic_id(analyzer: &LuaAnalyzer, expr: LuaExpr) -> Option<LuaSemanticDeclId> {`
`56`	`56`	`match expr {`
`57`	`57`	`LuaExpr::NameExpr(name_expr) => {`
`58`	`58`	`let name = name_expr.get_name_text()?;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ pub fn generate_module_markdown(`
`27`	`27`	`let mut context = tera::Context::new();`
`28`	`28`	`let mut doc = Doc::default();`
`29`	`29`	`doc.name = module.full_module_name.clone();`
`30`		`- let property_owner_id = module.property_owner_id.clone();`
	`30`	`+ let property_owner_id = module.semantic_id.clone();`
`31`	`31`	`if let Some(property_id) = property_owner_id {`
`32`	`32`	`doc.property = collect_property(db, property_id);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ fn add_module_completion_item(`
`94`	`94`	`return None;`
`95`	`95`	`}`
`96`	`96`
`97`		`- let data = if let Some(property_id) = &module_info.property_owner_id {`
	`97`	`+ let data = if let Some(property_id) = &module_info.semantic_id {`
`98`	`98`	`CompletionData::from_property_owner_id(builder, property_id.clone(), None)`
`99`	`99`	`} else {`
`100`	`100`	`None`