stash

Author: CppCXY

crates/emmylua_code_analysis/src/compilation/analyzer/bind_type/migrate_global_member.rs

@@ -1,6 +1,4 @@
-mod migrate_global_member;
-
-use migrate_global_member::migrate_global_members_when_type_resolve;
+// use migrate_global_member::migrate_global_members_when_type_resolve;
 use rowan::TextRange;
 
 use crate::{
@@ -46,7 +44,7 @@ pub fn bind_type(
 
         db.get_type_index_mut()
             .bind_type(type_owner.clone(), type_cache);
-        migrate_global_members_when_type_resolve(db, type_owner);
+        // migrate_global_members_when_type_resolve(db, type_owner);
     } else {
         let decl_type = decl_type_cache?.as_type();
         merge_def_type(db, decl_type.clone(), type_cache.as_type().clone());
@@ -100,12 +98,12 @@ pub fn add_member(db: &mut DbIndex, owner: LuaMemberOwner, member_id: LuaMemberI
     Some(())
 }
 
-fn get_owner_id(db: &DbIndex, type_owner: &LuaTypeOwner) -> Option<LuaMemberOwner> {
-    let type_cache = db.get_type_index().get_type_cache(&type_owner)?;
-    match type_cache.as_type() {
-        LuaType::Ref(type_id) => Some(LuaMemberOwner::Type(type_id.clone())),
-        LuaType::TableConst(id) => Some(LuaMemberOwner::Element(id.clone())),
-        LuaType::Instance(inst) => Some(LuaMemberOwner::Element(inst.get_range().clone())),
-        _ => None,
-    }
-}
+// fn get_owner_id(db: &DbIndex, type_owner: &LuaTypeOwner) -> Option<LuaMemberOwner> {
+//     let type_cache = db.get_type_index().get_type_cache(&type_owner)?;
+//     match type_cache.as_type() {
+//         LuaType::Ref(type_id) => Some(LuaMemberOwner::Type(type_id.clone())),
+//         LuaType::TableConst(id) => Some(LuaMemberOwner::Element(id.clone())),
+//         LuaType::Instance(inst) => Some(LuaMemberOwner::Element(inst.get_range().clone())),
+//         _ => None,
+//     }
+// }

crates/emmylua_code_analysis/src/compilation/analyzer/bind_type/mod.rs renamed to crates/emmylua_code_analysis/src/compilation/analyzer/common/bind_type.rs

@@ -0,0 +1,43 @@
+use emmylua_parser::{LuaAstNode, LuaNameExpr};
+
+use crate::{DbIndex, FileId, GlobalId, LuaDeclId, LuaMemberOwner, LuaType};
+
+pub fn get_name_expr_member_owner(db: &DbIndex, file_id: FileId, name_expr: &LuaNameExpr) -> Option<LuaMemberOwner> {
+    let decl_id = LuaDeclId::new(file_id, name_expr.get_position());
+    if let Some(owner) = get_decl_member_owner(&db, &decl_id) {
+        return Some(owner);
+    }
+
+    let decl_tree = db.get_decl_index().get_decl_tree(&file_id)?;
+    let name = name_expr.get_name_text()?;
+    let prev_decl = decl_tree.find_local_decl(&name, name_expr.get_position())?;
+
+    Some(LuaMemberOwner::DeclId(prev_decl.get_id()))
+}
+
+pub fn get_decl_member_owner(db: &DbIndex, decl_id: &LuaDeclId) -> Option<LuaMemberOwner> {
+    if let Some(type_cache) = db.get_type_index().get_type_cache(&decl_id.clone().into()) {
+        let decl_type = type_cache.as_type();
+        match decl_type {
+            LuaType::Def(type_id) => {
+                return Some(LuaMemberOwner::Type(type_id.clone()));
+            }
+            LuaType::GlobalTable(global_id) => {
+                return Some(LuaMemberOwner::Global(GlobalId(global_id.clone())));
+            }
+            LuaType::LocalDecl(decl_id) => {
+                return Some(LuaMemberOwner::DeclId(decl_id.clone()));
+            }
+
+            _ => return None,
+        }
+    }
+
+    let decl = db.get_decl_index().get_decl(decl_id)?;
+
+    if decl.is_global() {
+        return Some(LuaMemberOwner::Global(GlobalId::new(decl.get_name())));
+    }
+
+    Some(LuaMemberOwner::DeclId(decl_id.clone()))
+}

crates/emmylua_code_analysis/src/compilation/analyzer/common/member.rs

@@ -0,0 +1,66 @@
+// use crate::{DbIndex, GlobalId, LuaDeclId, LuaMemberId, LuaMemberOwner, LuaTypeOwner};
+
+// use super::get_owner_id;
+
+// pub fn migrate_global_members_when_type_resolve(
+//     db: &mut DbIndex,
+//     type_owner: LuaTypeOwner,
+// ) -> Option<()> {
+//     match type_owner {
+//         LuaTypeOwner::Decl(decl_id) => {
+//             migrate_global_member_to_decl(db, decl_id);
+//         }
+//         LuaTypeOwner::Member(member_id) => {
+//             migrate_global_member_to_member(db, member_id);
+//         }
+//         _ => {}
+//     }
+//     Some(())
+// }
+
+// fn migrate_global_member_to_decl(db: &mut DbIndex, decl_id: LuaDeclId) -> Option<()> {
+//     let decl = db.get_decl_index().get_decl(&decl_id)?;
+//     if !decl.is_global() {
+//         return None;
+//     }
+
+//     let owner_id = get_owner_id(db, &decl_id.clone().into())?;
+
+//     let name = decl.get_name();
+//     let global_id = GlobalId::new(name.into());
+//     let members = db
+//         .get_member_index()
+//         .get_members(&LuaMemberOwner::GlobalPath(global_id))?
+//         .iter()
+//         .map(|member| member.get_id())
+//         .collect::<Vec<_>>();
+
+//     let member_index = db.get_member_index_mut();
+//     for member_id in members {
+//         member_index.set_member_owner(owner_id.clone(), member_id.file_id, member_id);
+//         member_index.add_member_to_owner(owner_id.clone(), member_id);
+//     }
+
+//     Some(())
+// }
+
+// fn migrate_global_member_to_member(db: &mut DbIndex, member_id: LuaMemberId) -> Option<()> {
+//     let member = db.get_member_index().get_member(&member_id)?;
+//     let global_id = member.get_global_id()?;
+//     let owner_id = get_owner_id(db, &member_id.clone().into())?;
+
+//     let members = db
+//         .get_member_index()
+//         .get_members(&LuaMemberOwner::GlobalPath(global_id.clone()))?
+//         .iter()
+//         .map(|member| member.get_id())
+//         .collect::<Vec<_>>();
+
+//     let member_index = db.get_member_index_mut();
+//     for member_id in members {
+//         member_index.set_member_owner(owner_id.clone(), member_id.file_id, member_id);
+//         member_index.add_member_to_owner(owner_id.clone(), member_id);
+//     }
+
+//     Some(())
+// }

crates/emmylua_code_analysis/src/compilation/analyzer/common/migrate_global_member.rs

@@ -0,0 +1,5 @@
+mod bind_type;
+mod member;
+
+pub use bind_type::{add_member, bind_type};
+pub use member::*;

crates/emmylua_code_analysis/src/compilation/analyzer/common/mod.rs

@@ -1,6 +1,5 @@
 mod docs;
 mod exprs;
-mod members;
 mod stats;
 
 use crate::{
@@ -89,6 +88,7 @@ fn walk_node_enter(analyzer: &mut DeclAnalyzer, node: LuaAst) {
             analyzer.create_scope(expr.get_range(), LuaScopeKind::Normal);
             exprs::analyze_closure_expr(analyzer, expr);
         }
+        // add reference
         // LuaAst::LuaTableExpr(expr) => {
         //     exprs::analyze_table_expr(analyzer, expr);
         // }