[IMP] csv sub_field in csv headers + tests

fda-odoo · fda-odoo · commit 4e311357d447 · 2026-03-11T17:55:19.000+01:00
diff --git a/server/src/core/evaluation.rs b/server/src/core/evaluation.rs
@@ -1,6 +1,6 @@
 use itertools::Itertools;
 use itertools::FoldWhile::{Continue, Done};
-use ruff_python_ast::{Arguments, Expr, ExprCall, Identifier, Number, Operator, Parameter, UnaryOp};
+use ruff_python_ast::{Arguments, Expr, ExprCall, Identifier, Number, Parameter, UnaryOp};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 use lsp_types::{Diagnostic, Location, Position, Range};
 use weak_table::traits::WeakElement;
diff --git a/server/src/features/csv_ast_utils.rs b/server/src/features/csv_ast_utils.rs
@@ -2,18 +2,18 @@ use std::{cell::RefCell, rc::Rc};
 
 use csv::{Reader, StringRecord};
 
-use crate::{S, constants::{OYarn, SymType}, core::{file_mgr::FileMgr, odoo::SyncOdoo, symbols::symbol::Symbol, xml_data::{OdooData, OdooDataRecord}}, features::goto_utils::{GotoSource, GotoSourceType}, oyarn, threads::SessionInfo};
+use crate::{S, constants::{OYarn, SymType}, core::{odoo::SyncOdoo, symbols::symbol::Symbol, xml_data::{OdooData, OdooDataRecord}}, features::goto_utils::{GotoSource, GotoSourceType}, oyarn, threads::SessionInfo};
 
 
 
 pub struct CsvAstUtils {}
 
 impl CsvAstUtils {
 
-    pub fn get_symbols(session: &mut SessionInfo, file_symbol: &Rc<RefCell<Symbol>>, csv_reader: &mut Reader<&[u8]>, model_name: &OYarn, offset: usize, on_dep_only: bool) -> Vec<GotoSource> {
+    pub fn get_symbols(session: &mut SessionInfo, file_symbol: &Rc<RefCell<Symbol>>, csv_reader: &mut Reader<&[u8]>, model_name: &OYarn, offset: usize) -> Vec<GotoSource> {
         let mut results = vec![];
         let module = file_symbol.borrow().find_module();
-        let Some(model) = session.sync_odoo.models.get(model_name).cloned() else {return vec![];};;
+        let Some(model) = session.sync_odoo.models.get(model_name).cloned() else {return vec![];};
         let model_syms = model.borrow().get_main_symbols(session, module.clone());
         let Some(main_symbol) = model_syms.first().cloned() else {return results;};
         drop(model_syms);
@@ -23,15 +23,35 @@ impl CsvAstUtils {
                 let mut h_start = header.position().unwrap().byte() as usize;
                 for h in header.iter() {
                     let end = h_start + h.len() as usize;
+                    let has_quotes = h.starts_with('"') && h.ends_with('"') && h.len() >= 2;
                     let header_txt = CsvAstUtils::remove_quotes(h);
                     headers.push(oyarn!("{}", header_txt));
                     if offset >= h_start && offset <= end {
-                        let symbols = main_symbol.borrow().get_member_symbol(session, &header_txt, module.clone(), false, true, false, true, false);
-                        for sym in symbols.0.iter() {
-                            results.push(GotoSource {
-                                source: GotoSourceType::Symbol(sym.clone()),
-                                origin_selection_range: None, //TODO
-                            })
+                        let header_elts = header_txt.splitn(2, [':', '/']).collect::<Vec<_>>();
+                        let symbols = main_symbol.borrow().get_member_symbol(session, &S!(header_elts[0]), module.clone(), false, true, false, true, false);
+                        if offset <= h_start + has_quotes as usize + header_elts[0].len() + 1 {
+                            for sym in symbols.0.iter() {
+                                results.push(GotoSource {
+                                    source: GotoSourceType::Symbol(sym.clone()),
+                                    origin_selection_range: None, //TODO
+                                })
+                            }
+                        } else {
+                            for sym in symbols.0.iter() {
+                                if sym.borrow().is_specific_field(session, &["Many2one", "One2many", "Many2many"]) && sym.borrow().typ() == SymType::VARIABLE{
+                                    let models = sym.borrow().as_variable().get_relational_model(session, module.clone());
+                                    if models.len() == 1 {
+                                        let model = models[0].clone();
+                                        let sub_symbols = model.borrow().get_member_symbol(session, &S!(header_elts[1]), module.clone(), false, true, false, true, false);
+                                        for sym in sub_symbols.0.iter() {
+                                            results.push(GotoSource {
+                                                source: GotoSourceType::Symbol(sym.clone()),
+                                                origin_selection_range: None, //TODO
+                                            })
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                     h_start = end + 1;
diff --git a/server/src/features/declaration.rs b/server/src/features/declaration.rs
@@ -1,15 +1,10 @@
 use lsp_types::request::GotoDeclarationResponse;
-use lsp_types::{LocationLink, Range};
-use std::path::PathBuf;
 use std::{cell::RefCell, rc::Rc};
 
-use crate::constants::SymType;
-use crate::core::file_mgr::{AstType, FileInfo, FileMgr};
+use crate::core::file_mgr::{AstType, FileInfo};
 use crate::core::symbols::symbol::Symbol;
 use crate::features::goto_utils::{GotoRequest, GotoUtils};
-use crate::features::xml_ast_utils::{XmlAstResult, XmlAstUtils};
 use crate::threads::SessionInfo;
-use crate::utils::PathSanitizer as _;
 
 pub struct DeclarationFeature {}
 
diff --git a/server/src/features/definition.rs b/server/src/features/definition.rs
@@ -1,15 +1,10 @@
-use lsp_types::{GotoDefinitionResponse, LocationLink, Range};
-use std::path::PathBuf;
+use lsp_types::{GotoDefinitionResponse};
 use std::{cell::RefCell, rc::Rc};
 
-use crate::constants::SymType;
-use crate::core::file_mgr::{AstType, FileInfo, FileMgr};
+use crate::core::file_mgr::{AstType, FileInfo};
 use crate::core::symbols::symbol::Symbol;
-use crate::features::csv_ast_utils::CsvAstUtils;
 use crate::features::goto_utils::{GotoRequest, GotoUtils};
-use crate::features::xml_ast_utils::{XmlAstResult, XmlAstUtils};
 use crate::threads::SessionInfo;
-use crate::utils::PathSanitizer as _;
 
 pub struct DefinitionFeature {}
 
diff --git a/server/src/features/goto_utils.rs b/server/src/features/goto_utils.rs
@@ -1,9 +1,9 @@
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 
-use lsp_types::{LocationLink, Range, request::GotoDeclarationResponse};
+use lsp_types::{LocationLink, Range};
 use ruff_python_ast::{Expr, ExprCall};
 
-use crate::{S, Sy, constants::{PackageType, SymType, OYarn}, core::{evaluation::{Evaluation, EvaluationValue, ExprOrIdent}, file_mgr::{FileInfo, FileMgr}, odoo::SyncOdoo, python_odoo_builder::MAGIC_FIELDS, symbols::symbol::Symbol, xml_data::{OdooData, OdooDataRecord}}, features::{ast_utils::AstUtils, csv_ast_utils::CsvAstUtils, features_utils::FeaturesUtils, xml_ast_utils::{XmlAstResult, XmlAstUtils}}, oyarn, threads::SessionInfo, utils::PathSanitizer};
+use crate::{S, Sy, constants::{PackageType, SymType, OYarn}, core::{evaluation::{Evaluation, EvaluationValue, ExprOrIdent}, file_mgr::{FileInfo, FileMgr}, odoo::SyncOdoo, python_odoo_builder::MAGIC_FIELDS, symbols::symbol::Symbol, xml_data::OdooData}, features::{ast_utils::AstUtils, csv_ast_utils::CsvAstUtils, features_utils::FeaturesUtils, xml_ast_utils::{XmlAstResult, XmlAstUtils}}, oyarn, threads::SessionInfo, utils::PathSanitizer};
 
 pub enum GotoRequest {
     Definition,
@@ -318,7 +318,7 @@ impl GotoUtils {
         let offset = file_info.borrow().position_to_offset(line, character, session.sync_odoo.encoding);
         let data = file_info.borrow().file_info_ast.borrow().text_document.as_ref().unwrap().contents().to_string();
         let mut csv_reader = csv::ReaderBuilder::new().quoting(false).from_reader(data.as_bytes());
-        let sources = CsvAstUtils::get_symbols(session, file_symbol, &mut csv_reader, &model_name, offset, true);
+        let sources = CsvAstUtils::get_symbols(session, file_symbol, &mut csv_reader, &model_name, offset);
         sources
     }
 
diff --git a/server/src/features/references.rs b/server/src/features/references.rs
@@ -2,24 +2,21 @@ use std::rc::Weak;
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 
 use csv::StringRecord;
-use lsp_types::{Location, Range, Uri};
+use lsp_types::{Location, Uri};
 use ruff_python_ast::{Alias, Expr, Identifier, Stmt, StmtAnnAssign, StmtAssert, StmtAssign, StmtAugAssign, StmtClassDef, StmtIf, StmtMatch, StmtRaise, StmtReturn, StmtTry, StmtTypeAlias, StmtWith};
 use ruff_text_size::{Ranged, TextRange, TextSize};
-use tracing::{error, warn};
 use weak_table::PtrWeakHashSet;
 
-use crate::core::csv_arch_builder::CsvArchBuilder;
 use crate::core::file_mgr::AstType;
 use crate::core::symbols::module_symbol::ModuleSymbol;
-use crate::core::xml_data::OdooDataRecord;
 use crate::features::csv_ast_utils::CsvAstUtils;
 use crate::features::references_xml::XmlAstReferenceVisitor;
 use crate::{S, Sy, oyarn};
 use crate::constants::OYarn;
 use crate::core::evaluation::{Evaluation, EvaluationSymbolPtr};
 use crate::core::odoo::SyncOdoo;
 use crate::features::goto_utils::{GotoRequest, GotoSourceType, GotoUtils};
-use crate::{constants::SymType, core::{file_mgr::{FileInfo, FileMgr}, symbols::symbol::Symbol}, features::xml_ast_utils::{XmlAstResult, XmlAstUtils}, threads::SessionInfo, utils::PathSanitizer};
+use crate::{constants::SymType, core::{file_mgr::{FileInfo, FileMgr}, symbols::symbol::Symbol}, threads::SessionInfo, utils::PathSanitizer};
 
 #[derive(Debug, Clone)]
 pub enum ReferenceTarget {
@@ -178,11 +175,11 @@ impl ReferenceFeature {
                                     }
                                 },
                                 SymType::CSV_FILE => {
-                                    let model_name_pb = PathBuf::from(&file_s.borrow().paths()[0]);
-                                    let model_name = Sy!(model_name_pb.file_stem().unwrap().to_str().unwrap().to_string());
+                                    //let model_name_pb = PathBuf::from(&file_s.borrow().paths()[0]);
+                                    //let model_name = Sy!(model_name_pb.file_stem().unwrap().to_str().unwrap().to_string());
                                     let data = file_info.borrow().file_info_ast.borrow().text_document.as_ref().unwrap().contents().to_string();
                                     let mut csv_reader = csv::ReaderBuilder::new().quoting(false).from_reader(data.as_bytes());
-                                    locations.extend(ReferenceFeature::reference_in_csv_file(session, &model_name, &file_s, &mut csv_reader, &ReferenceTarget::String(full_xml_id)));
+                                    locations.extend(ReferenceFeature::reference_in_csv_file(session, &file_s, &mut csv_reader, &ReferenceTarget::String(full_xml_id)));
                                 },
                                 _ => {}
                             }
@@ -199,7 +196,7 @@ impl ReferenceFeature {
         }
     }
 
-    fn reference_in_csv_file(session: &mut SessionInfo, model_name: &OYarn, file_symbol: &Rc<RefCell<Symbol>>, csv_reader: &mut csv::Reader<&[u8]>, reference_target: &ReferenceTarget) -> Vec<Location> {
+    fn reference_in_csv_file(session: &mut SessionInfo, file_symbol: &Rc<RefCell<Symbol>>, csv_reader: &mut csv::Reader<&[u8]>, reference_target: &ReferenceTarget) -> Vec<Location> {
         let module = file_symbol.borrow().find_module();
         let path = file_symbol.borrow().paths()[0].clone();
         let uri = FileMgr::pathname2uri(&path);
@@ -215,15 +212,15 @@ impl ReferenceFeature {
         if !headers.is_empty() && headers[0] == "id" {
             for result in csv_reader.records() {
                 if let Ok(result) = result {
-                    let in_record = ReferenceFeature::search_in_record(session, module.clone(), &uri, &path, model_name.clone(), &headers, &result, reference_target);
+                    let in_record = ReferenceFeature::search_in_record(session, module.clone(), &uri, &path, &headers, &result, reference_target);
                     locations.extend(in_record);
                 }
             }
         }
         locations
     }
 
-    fn search_in_record(session: &mut SessionInfo, module: Option<Rc<RefCell<Symbol>>>, uri: &Uri, path: &String, model_name: OYarn, headers: &Vec<OYarn>, record: &StringRecord, reference_target: &ReferenceTarget) -> Vec<Location> {
+    fn search_in_record(session: &mut SessionInfo, module: Option<Rc<RefCell<Symbol>>>, uri: &Uri, path: &String, headers: &Vec<OYarn>, record: &StringRecord, reference_target: &ReferenceTarget) -> Vec<Location> {
         if record.position().is_none() {
             return vec![];
         }
diff --git a/server/tests/data/addons/module_csv/__init__.py b/server/tests/data/addons/module_csv/__init__.py
diff --git a/server/tests/data/addons/module_csv/__manifest__.py b/server/tests/data/addons/module_csv/__manifest__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name' : 'Module CSV',
+    'version' : '1.0',
+    'summary': 'Test Module CSV',
+    'sequence': 10,
+    'description': """
+Module CSV
+====================
+This is the description of the module CSV
+    """,
+    'category': 'Accounting/Accounting',
+    'depends' : [],
+    'data': [
+        'data/res.country.state.csv',
+    ],
+    'installable': True,
+    'application': True,
+    'license': 'LGPL-3',
+}
diff --git a/server/tests/data/addons/module_csv/data/res.country.state.csv b/server/tests/data/addons/module_csv/data/res.country.state.csv
@@ -0,0 +1,3 @@
+"id","country_id:id","name","code"
+state_au_1000,"base.au","Australian Capital Territories","ACTS"
+state_us_1000,base.us,"Alabamaa","ALA"
diff --git a/server/tests/data/addons/module_for_diagnostics/models/bike_parts_wheel.py b/server/tests/data/addons/module_for_diagnostics/models/bike_parts_wheel.py
@@ -24,8 +24,11 @@ def _compute_bike_weight(self):
                 bike.bike_weight = bike.wheel_id.price * 0.5
             else:
                 bike.bike_weight = 0.0
+        "module_for_diagnostics.bike_wheel_1"
+        self.env.ref("module_for_diagnostics.bike_wheel_1")
         self.env.ref('module_for_diagnostics.bike_wheel_DOES_NOT_EXIST') # TODO: OLS05001
         self.env.ref('bike_wheel_DOES_NOT_EXIST') # OLS05002
         self.env.ref('module_for_diagnostics.bike_wheel_6') # Ok
         self.env.ref('WRONG_MODULE.bike_wheel_6') # OLS05003
         self.env.ref('module_for_diagnostics.bike_wheel_6.too.many.dots') # OLS05051
+        self.env.ref("module_for_diagnostics.bike_wheel_1")
diff --git a/server/tests/test_get_symbol.rs b/server/tests/test_get_symbol.rs
diff --git a/server/tests/test_utils.rs b/server/tests/test_utils.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+"id","country_id:id","name","code"`
	`2`	`+state_au_1000,"base.au","Australian Capital Territories","ACTS"`
	`3`	`+state_us_1000,base.us,"Alabamaa","ALA"`