Skip to content

[FIX] handle pos arg for inverse name on o2m fields #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmahrouss wants to merge 1 commit into
base: alpha
Choose a base branch
from
Open

[FIX] handle pos arg for inverse name on o2m fields #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions server/src/features/features_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use ruff_text_size::{Ranged, TextRange, TextSize};
use crate::core::file_mgr::FileMgr;
use crate::core::odoo::SyncOdoo;
use crate::core::symbols::function_symbol::Argument;
use crate::utils::{compare_semver, PathSanitizer};
use crate::utils::{MaxTextSize, PathSanitizer, compare_semver};
use std::cmp::Ordering;
use std::collections::HashMap;
use std::path::PathBuf;
Expand Down Expand Up @@ -92,7 +92,7 @@ impl FeaturesUtils {
from_module: Option<Rc<RefCell<Symbol>>>,
field_value: &String,
call_expr: &ExprCall,
) -> Vec<Rc<RefCell<Symbol>>>{
) -> Vec<Rc<RefCell<Symbol>>> {
let model_name = if let Some(Expr::StringLiteral(expr)) = call_expr.arguments.args.first() {
expr.value.to_string()
} else {
Expand Down Expand Up @@ -216,6 +216,7 @@ impl FeaturesUtils {
offset: usize,
field_range: TextRange,
arg_index: usize,
arg_expr: &Expr,
) -> Vec<(Rc<RefCell<Symbol>>, TextRange)> {
let mut arg_symbols: Vec<(Rc<RefCell<Symbol>>, TextRange)> = vec![];
let callable_evals = Evaluation::eval_from_ast(session, &call_expr.func, scope.clone(), &call_expr.func.range().start(), false, &mut vec![]).0;
Expand All @@ -230,6 +231,17 @@ impl FeaturesUtils {
let Some(callable_sym) = callable.weak.upgrade() else {
continue;
};
if callable_sym.borrow().typ() == SymType::CLASS
&& callable_sym.borrow().is_specific_field_class(session, &["One2many"]) {
let Some(value) = Evaluation::expr_to_str(session, arg_expr, scope.clone(), &call_expr.range().end(), false, &mut vec![]).0 else {
continue;
};
arg_symbols.extend(
FeaturesUtils::find_inverse_name_field_symbol(session, from_module.clone(), &value, call_expr)
.into_iter().map(|res| (res, arg_expr.range()))
);
continue;
}
if callable_sym.borrow().typ() != SymType::FUNCTION {
continue;
}
Expand Down Expand Up @@ -322,10 +334,10 @@ impl FeaturesUtils {
offset: usize,
field_range: TextRange,
) -> Vec<(Rc<RefCell<Symbol>>, TextRange)>{
if let Some((arg_index, _)) = call_expr.arguments.args.iter().enumerate().find(|(_, arg)|
if let Some((arg_index, arg_expr)) = call_expr.arguments.args.iter().enumerate().find(|(_, arg)|
offset > arg.range().start().to_usize() && offset <= arg.range().end().to_usize()
){
FeaturesUtils::find_positional_argument_symbols(session, scope, from_module, field_name, call_expr, offset, field_range, arg_index)
FeaturesUtils::find_positional_argument_symbols(session, scope, from_module, field_name, call_expr, offset, field_range, arg_index, arg_expr)
} else if let Some((_, keyword)) = call_expr.arguments.keywords.iter().enumerate().find(|(_, arg)|
offset > arg.range().start().to_usize() && offset <= arg.range().end().to_usize()
){
Expand Down