Skip to content

[FIX] fix model dependency for comodel name on relational fields #452

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
wants to merge 1 commit into
base: alpha
Choose a base branch
from
Open

[FIX] fix model dependency for comodel name on relational fields #452

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions server/src/core/python_arch_eval_hooks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,8 +743,7 @@ impl PythonArchEvalHooks {
let env_files = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &(vec![Sy!("odoo"), Sy!("api")], vec![]), u32::MAX);
let env_file = env_files.last().unwrap();
if !Rc::ptr_eq(env_file, &scope) {
let mut f = scope.borrow_mut();
f.add_model_dependencies(model);
scope.borrow_mut().add_model_dependencies(model);
}
}
let model = model.clone();
Expand Down
158 changes: 83 additions & 75 deletions server/src/core/python_validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,90 +406,98 @@ impl PythonValidator {
if !symbol.borrow().is_field_class(session){
continue;
}
if let Some(related_field_name) = eval_weak.as_weak().context.get(&S!("related")).filter(|val| matches!(val, ContextValue::STRING(_))).map(|ctx_val| ctx_val.as_string()) {
let Some(special_arg_range) = eval_weak.as_weak().context.get(&S!("related_arg_range")).map(|ctx_val| ctx_val.as_text_range()) else {
continue;
};
let syms = PythonArchEval::get_nested_sub_field(session, &related_field_name, class.clone(), maybe_from_module.clone());
if syms.is_empty(){
if let Some(diagnostic_base) = create_diagnostic(&session, DiagnosticCode::OLS03014, &[&related_field_name, &model_data.name]) {
self.diagnostics.push(Diagnostic {
range: Range::new(Position::new(special_arg_range.start().to_u32(), 0), Position::new(special_arg_range.end().to_u32(), 0)),
..diagnostic_base.clone()
});
}
continue;
}
let Some(field_type) = symbol
.borrow()
.get_member_symbol(session, &S!("type"), None, false, false, false, false)
.0.first()
.and_then(|field_type_var| field_type_var.borrow().evaluations().cloned())
.and_then(|evals| evals.first().cloned())
.and_then(|eval| eval.value.clone())
.and_then(|value| match value {
EvaluationValue::CONSTANT(Expr::StringLiteral(s)) => Some(s.value.to_string()),
_ => None,
}) else {
continue;
};
let found_same_type_match = syms.iter().any(|sym|{
let related_eval_weaks = Symbol::follow_ref(&&EvaluationSymbolPtr::WEAK(EvaluationSymbolWeak::new(
Rc::downgrade(&sym),
None,
false,
)), session, &mut None, true, true, None);
related_eval_weaks.iter().any(|related_eval_weak|{
let Some(related_field_class_sym) = related_eval_weak.upgrade_weak() else {
return false
};
let found = related_field_class_sym
.borrow()
.get_member_symbol(session, &S!("type"), None, false, false, false, false)
.0.first()
.and_then(|field_type_var| field_type_var.borrow().evaluations().cloned())
.and_then(|evals| evals.first().cloned())
.and_then(|eval| eval.value.clone())
.map(|value| matches!(value, EvaluationValue::CONSTANT(Expr::StringLiteral(s)) if s.value.to_string() == field_type))
.unwrap_or(false);
found
})
});
if !found_same_type_match{
if let Some(diagnostic_base) = create_diagnostic(&session, DiagnosticCode::OLS03017, &[]) {
self.diagnostics.push(Diagnostic {
range: Range::new(Position::new(special_arg_range.start().to_u32(), 0), Position::new(special_arg_range.end().to_u32(), 0)),
..diagnostic_base.clone()
});
}

}
} else if let Some(comodel_field_name) = eval_weak.as_weak().context.get(&S!("comodel_name")).map(|ctx_val| ctx_val.as_string()) {
let Some(special_arg_range) = eval_weak.as_weak().context.get(&S!("comodel_name_arg_range")).map(|ctx_val| ctx_val.as_text_range()) else {
continue;
};
let maybe_model = session.sync_odoo.models.get(&Sy!(comodel_field_name.clone()));
if maybe_model.map(|m| m.borrow_mut().has_symbols()).unwrap_or(false){
let model = maybe_model.unwrap().clone();
let Some(ref from_module) = maybe_from_module else {continue};
if !model.clone().borrow().model_in_deps(session, from_module) {
if let Some(diagnostic_base) = create_diagnostic(&session, DiagnosticCode::OLS03015, &[&comodel_field_name]) {
'related_check: {
if let Some(related_field_name) = eval_weak.as_weak().context.get(&S!("related")).filter(|val| matches!(val, ContextValue::STRING(_))).map(|ctx_val| ctx_val.as_string()) {
let Some(special_arg_range) = eval_weak.as_weak().context.get(&S!("related_arg_range")).map(|ctx_val| ctx_val.as_text_range()) else {
break 'related_check;
};
let syms = PythonArchEval::get_nested_sub_field(session, &related_field_name, class.clone(), maybe_from_module.clone());
if syms.is_empty(){
if let Some(diagnostic_base) = create_diagnostic(&session, DiagnosticCode::OLS03014, &[&related_field_name, &model_data.name]) {
self.diagnostics.push(Diagnostic {
range: Range::new(Position::new(special_arg_range.start().to_u32(), 0), Position::new(special_arg_range.end().to_u32(), 0)),
..diagnostic_base.clone()
});
}
break 'related_check;
}
} else {
if let Some(diagnostic_base) = create_diagnostic(&session, DiagnosticCode::OLS03016, &[&comodel_field_name]) {
self.diagnostics.push(Diagnostic {
range: Range::new(Position::new(special_arg_range.start().to_u32(), 0), Position::new(special_arg_range.end().to_u32(), 0)),
..diagnostic_base.clone()
});
let Some(field_type) = symbol
.borrow()
.get_member_symbol(session, &S!("type"), None, false, false, false, false)
.0.first()
.and_then(|field_type_var| field_type_var.borrow().evaluations().cloned())
.and_then(|evals| evals.first().cloned())
.and_then(|eval| eval.value.clone())
.and_then(|value| match value {
EvaluationValue::CONSTANT(Expr::StringLiteral(s)) => Some(s.value.to_string()),
_ => None,
}) else {
break 'related_check;
};
let found_same_type_match = syms.iter().any(|sym|{
let related_eval_weaks = Symbol::follow_ref(&&EvaluationSymbolPtr::WEAK(EvaluationSymbolWeak::new(
Rc::downgrade(&sym),
None,
false,
)), session, &mut None, true, true, None);
related_eval_weaks.iter().any(|related_eval_weak|{
let Some(related_field_class_sym) = related_eval_weak.upgrade_weak() else {
return false
};
let found = related_field_class_sym
.borrow()
.get_member_symbol(session, &S!("type"), None, false, false, false, false)
.0.first()
.and_then(|field_type_var| field_type_var.borrow().evaluations().cloned())
.and_then(|evals| evals.first().cloned())
.and_then(|eval| eval.value.clone())
.map(|value| matches!(value, EvaluationValue::CONSTANT(Expr::StringLiteral(s)) if s.value.to_string() == field_type))
.unwrap_or(false);
found
})
});
if !found_same_type_match{
if let Some(diagnostic_base) = create_diagnostic(&session, DiagnosticCode::OLS03017, &[]) {
self.diagnostics.push(Diagnostic {
range: Range::new(Position::new(special_arg_range.start().to_u32(), 0), Position::new(special_arg_range.end().to_u32(), 0)),
..diagnostic_base.clone()
});
}

}
}
}
'comodel_check: {
if let Some(comodel_field_name) = eval_weak.as_weak().context.get(&S!("comodel_name")).map(|ctx_val| ctx_val.as_string()) {
let Some(special_arg_range) = eval_weak.as_weak().context.get(&S!("comodel_name_arg_range")).map(|ctx_val| ctx_val.as_text_range()) else {
break 'comodel_check;
};
let Some(file_symbol) = class_ref.get_file().and_then(|file| file.upgrade()) else {
return;
break 'comodel_check;
};
let maybe_model = session.sync_odoo.models.get(&Sy!(comodel_field_name.clone()));
if maybe_model.map(|m| m.borrow_mut().has_symbols()).unwrap_or(false){
let model = maybe_model.unwrap().clone();
file_symbol.borrow_mut().add_model_dependencies(&model);
let Some(ref from_module) = maybe_from_module else {break 'comodel_check;};
if !model.clone().borrow().model_in_deps(session, from_module) {
if let Some(diagnostic_base) = create_diagnostic(&session, DiagnosticCode::OLS03015, &[&comodel_field_name]) {
self.diagnostics.push(Diagnostic {
range: Range::new(Position::new(special_arg_range.start().to_u32(), 0), Position::new(special_arg_range.end().to_u32(), 0)),
..diagnostic_base.clone()
});
}
} else {
break 'comodel_check;
}
} else {
if let Some(diagnostic_base) = create_diagnostic(&session, DiagnosticCode::OLS03016, &[&comodel_field_name]) {
self.diagnostics.push(Diagnostic {
range: Range::new(Position::new(special_arg_range.start().to_u32(), 0), Position::new(special_arg_range.end().to_u32(), 0)),
..diagnostic_base.clone()
});
}
}
file_symbol.borrow_mut().as_file_mut().not_found_models.insert(Sy!(comodel_field_name.clone()), BuildSteps::ARCH_EVAL);
session.sync_odoo.get_main_entry().borrow_mut().not_found_symbols_for_models.insert(file_symbol.clone());
}
Expand Down