wip references

Author: fda-odoo

server/src/features/references.rs

@@ -57,11 +57,13 @@ impl ReferenceFeature {
     /// TODO: All files within workspace
     /// TODO: Odoo specific (XML field refs, string-based model refs)
     pub fn get_references(session: &mut SessionInfo, file_symbol: &Rc<RefCell<Symbol>>, file_info: &Rc<RefCell<FileInfo>>, line: u32, character: u32) -> Option<Vec<Location>> {
-        let offset = file_info.borrow().position_to_offset(line, character);
+        let offset = file_info.borrow().position_to_offset(line, character, session.sync_odoo.encoding);
 
-        let (analyse_ast_result, _range, _call_expr) = AstUtils::get_symbols(session, file_symbol, file_info, offset as u32);
+        let file_info_ast_clone = file_info.borrow().file_info_ast.clone();
+        let file_info_ast_ref = file_info_ast_clone.borrow();
+        let (analyse_ast_result, _range, _expr, _call_expr) = AstUtils::get_symbols(session, &file_info_ast_ref, file_symbol, offset as u32);
 
-        if analyse_ast_result.evaluations.is_empty() {
+        if analyse_ast_result.evaluations.len() != 1 {
             return None;
         }
 
@@ -71,15 +73,45 @@ impl ReferenceFeature {
 
         let symbol_name = target_symbol_rc.borrow().name().to_string();
 
+        let mut locations = Vec::new();
+        locations.extend(ReferenceFeature::references_in_files(session, file_symbol, file_info, &symbol_name, &target_symbol_rc));
+
+        //take arch and arch_eval dependents
+        for dep in file_symbol.borrow().dependents()[0].iter().take(2) {
+            if let Some(dep_set) = dep {
+                for dep_symbol_rc in dep_set.iter() {
+                    let Some(Some(file)) = dep_symbol_rc.borrow().get_file().map(|x| x.upgrade()) else { //to be sure we are on a file
+                        continue;
+                    };
+                    let Some(dep_file_info) = session.sync_odoo.get_file_mgr().borrow().get_file_info(&file.borrow().paths()[0]) else {
+                        continue;
+                    };
+                    locations.extend(ReferenceFeature::references_in_files(session, &dep_symbol_rc, &dep_file_info, &symbol_name, &target_symbol_rc));
+                }
+            }
+        }
+
+        if locations.is_empty() {
+            None
+        } else {
+            Some(locations)
+        }
+    }
+
+    pub fn references_in_files(session: &mut SessionInfo, file_symbol: &Rc<RefCell<Symbol>>, file_info: &Rc<RefCell<FileInfo>>, symbol_name: &String, target_symbol_rc: &Rc<RefCell<Symbol>>) -> Vec<Location> {
         // find all Name expressions with the same name
         let file_info_ast = file_info.borrow().file_info_ast.clone();
         let file_info_ast_borrow = file_info_ast.borrow();
-        let stmts = file_info_ast_borrow.get_stmts()?;
+        let stmts = file_info_ast_borrow.get_stmts();
+        let stmts = match stmts {
+            Some(s) => s,
+            None => return Vec::new(),
+        };
 
-        let name_matches = NameFinderVisitor::find_all_names(stmts, &symbol_name);
+        let name_matches = NameFinderVisitor::find_all_names(stmts, symbol_name);
 
         if name_matches.is_empty() {
-            return None;
+            return Vec::new();
         }
 
         let file_path = file_symbol.borrow().paths()[0].clone();
@@ -106,12 +138,7 @@ impl ReferenceFeature {
                 });
             }
         }
-
-        if locations.is_empty() {
-            None
-        } else {
-            Some(locations)
-        }
+        locations
     }
 
     pub fn get_references_xml(session: &mut SessionInfo, file_symbol: &Rc<RefCell<Symbol>>, file_info: &Rc<RefCell<FileInfo>>, line: u32, character: u32) -> Option<Vec<Location>> {

server/tests/test_get_symbol.rs

@@ -248,13 +248,13 @@ fn test_definition() {
 #[test]
 fn test_references() {
     // setup
-    let mut odoo = setup::setup::setup_server(true);
+    let (mut odoo, config) = setup::setup::setup_server(true);
     let test_addons_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests").join("data").join("addons");
     let module1_test_file = test_addons_path.join("module_1").join("models").join("base_test_models.py").sanitize();
 
     // test file exists
     assert!(PathBuf::from(&module1_test_file).exists(), "Test file does not exist: {}", module1_test_file);
-    let mut session = setup::setup::create_session(&mut odoo);
+    let mut session = setup::setup::create_init_session(&mut odoo, config);
 
     let file_mgr = session.sync_odoo.get_file_mgr();
     let m1_tf_file_info = file_mgr.borrow().get_file_info(&module1_test_file).unwrap();