Skip to content

[IMP] server: support for noqa #274

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

Merged
fda-odoo merged 1 commit into from
Apr 4, 2025
Merged

[IMP] server: support for noqa #274

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
61 changes: 31 additions & 30 deletions server/src/core/evaluation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::core::odoo::SyncOdoo;
use crate::threads::SessionInfo;
use crate::S;

use super::file_mgr::FileMgr;
use super::file_mgr::{add_diagnostic, FileMgr, NoqaInfo};
use super::python_validator::PythonValidator;
use super::symbols::function_symbol::{Argument, ArgumentType, FunctionSymbol};
use super::symbols::symbol::Symbol;
Expand Down Expand Up @@ -757,7 +757,7 @@ impl Evaluation {
}
let class_sym_weak_eval = class_sym_weak_eval.as_weak();
if class_sym_weak_eval.instance.unwrap_or(false) {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(expr.arguments.args[0].range().start().to_u32(), 0),
Position::new(expr.arguments.args[0].range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Expand All @@ -767,7 +767,7 @@ impl Evaluation {
None,
None
)
);
, &session.current_noqa);
None
} else {
let mut is_instance = None;
Expand All @@ -793,7 +793,7 @@ impl Evaluation {
} else {
match parent.borrow().get_in_parents(&vec![SymType::CLASS], true){
None => {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(expr.range().start().to_u32(), 0),
Position::new(expr.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Expand All @@ -803,7 +803,7 @@ impl Evaluation {
None,
None
)
);
, &session.current_noqa);
None
},
Some(parent_class) => Some((parent_class.clone(), Some(true)))
Expand Down Expand Up @@ -929,7 +929,8 @@ impl Evaluation {
expr,
call_parent.clone(),
module.clone(),
on_instance));
on_instance,
));
}
context.as_mut().unwrap().insert(S!("base_call"), ContextValue::SYMBOL(call_parent));
for eval in base_sym.borrow().evaluations().unwrap().iter() {
Expand Down Expand Up @@ -1213,15 +1214,15 @@ impl Evaluation {
}
}
if !pos_arg {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(exprCall.range().start().to_u32(), 0), Position::new(exprCall.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30315"))),
Some(EXTENSION_NAME.to_string()),
format!("{} takes 0 positional arguments, but at least 1 is given", function.name),
None,
None,
));
), &session.current_noqa);
return diagnostics;
}
arg_index += 1;
Expand All @@ -1234,15 +1235,15 @@ impl Evaluation {
//match arg with argument from function
let function_arg = function.args.get(min(arg_index, vararg_index) as usize);
if function_arg.is_none() || function_arg.unwrap().arg_type == ArgumentType::KWORD_ONLY || function_arg.unwrap().arg_type == ArgumentType::KWARG {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(exprCall.range().start().to_u32(), 0), Position::new(exprCall.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30315"))),
Some(EXTENSION_NAME.to_string()),
format!("{} takes {} positional arguments, but at least {} is given", function.name, number_pos_arg, arg_index + 1),
None,
None,
));
), &session.current_noqa);
return diagnostics;
}
if function_arg.unwrap().arg_type != ArgumentType::VARARG {
Expand All @@ -1268,31 +1269,31 @@ impl Evaluation {
}
}
if !found_one && kwarg_index == i32::MAX {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(exprCall.range().start().to_u32(), 0), Position::new(exprCall.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30316"))),
Some(EXTENSION_NAME.to_string()),
format!("{} got an unexpected keyword argument '{}'", function.name, arg_identifier.id),
None,
None,
))
), &session.current_noqa)
}
} else {
// if arg is None, it means that it is a **arg
found_pos_arg_with_kw = number_pos_arg;
}
}
if found_pos_arg_with_kw + 1 < number_pos_arg {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(exprCall.range().start().to_u32(), 0), Position::new(exprCall.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30315"))),
Some(EXTENSION_NAME.to_string()),
format!("{} takes {} positional arguments, but only {} is given", function.name, number_pos_arg, arg_index),
None,
None,
));
), &session.current_noqa);
return diagnostics;
}
diagnostics
Expand All @@ -1312,31 +1313,31 @@ impl Evaluation {
Expr::Tuple(t) => {
need_tuple = max(need_tuple - 1, 0);
if t.elts.len() != 3 {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(t.range().start().to_u32(), 0), Position::new(t.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30314"))),
Some(EXTENSION_NAME.to_string()),
format!("Domain tuple should have 3 elements"),
None,
None,
));
), &session.current_noqa);
} else {
Evaluation::validate_tuple_search_domain(session, on_object.clone(), from_module.clone(), &t.elts[0], &t.elts[1], &t.elts[2], &mut diagnostics);
}
},
Expr::List(l) => {
need_tuple = max(need_tuple - 1, 0);
if l.elts.len() != 3 {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(l.range().start().to_u32(), 0), Position::new(l.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30314"))),
Some(EXTENSION_NAME.to_string()),
format!("Domain tuple should have 3 elements"),
None,
None,
));
), &session.current_noqa);
} else {
Evaluation::validate_tuple_search_domain(session, on_object.clone(), from_module.clone(), &l.elts[0], &l.elts[1], &l.elts[2], &mut diagnostics);
}
Expand All @@ -1356,15 +1357,15 @@ impl Evaluation {
}
}
_ => {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(s.range().start().to_u32(), 0), Position::new(s.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30317"))),
Some(EXTENSION_NAME.to_string()),
format!("A String value in tuple should contains '&', '|' or '!'"),
None,
None,
));
), &session.current_noqa);
}
}
},
Expand All @@ -1373,15 +1374,15 @@ impl Evaluation {
}
}
if need_tuple > 0 {
diagnostics.push(Diagnostic::new(
add_diagnostic(&mut diagnostics, Diagnostic::new(
Range::new(Position::new(value.range().start().to_u32(), 0), Position::new(value.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30319"))),
Some(EXTENSION_NAME.to_string()),
format!("Missing tuple after a search domain operator"),
None,
None,
));
), &session.current_noqa);
}
diagnostics
}
Expand All @@ -1398,21 +1399,21 @@ impl Evaluation {
'split_name: for name in split_expr {
if date_mode {
if !["year_number", "quarter_number", "month_number", "iso_week_number", "day_of_week", "day_of_month", "day_of_year", "hour_number", "minute_number", "second_number"].contains(&name) {
diagnostics.push(Diagnostic::new(
add_diagnostic(diagnostics, Diagnostic::new(
Range::new(Position::new(s.range().start().to_u32(), 0), Position::new(s.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30321"))),
Some(EXTENSION_NAME.to_string()),
format!("Invalid search domain field: Unknown granularity for date field. Use either \"year_number\", \"quarter_number\", \"month_number\", \"iso_week_number\", \"day_of_week\", \"day_of_month\", \"day_of_year\", \"hour_number\", \"minute_number\" or \"second_number\""),
None,
None,
));
), &session.current_noqa);
}
date_mode = false;
continue;
}
if obj.is_none() {
diagnostics.push(Diagnostic::new(
add_diagnostic(diagnostics, Diagnostic::new(
Range::new(Position::new(s.range().start().to_u32(), 0), Position::new(s.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30322"))),
Expand All @@ -1422,7 +1423,7 @@ In a search domain, when using a dot separator, it should be used either on a Da
If you used a relational field and get this error, check that the comodel of this field is valid."),
None,
None,
));
), &session.current_noqa);
break;
}
if let Some(object) = &obj {
Expand All @@ -1434,15 +1435,15 @@ If you used a relational field and get this error, check that the comodel of thi
false,
false);
if symbols.is_empty() {
diagnostics.push(Diagnostic::new(
add_diagnostic(diagnostics, Diagnostic::new(
Range::new(Position::new(s.range().start().to_u32(), 0), Position::new(s.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30320"))),
Some(EXTENSION_NAME.to_string()),
format!("Invalid search domain field: {} is not a member of {}", name, object.borrow().name()),
None,
None,
));
), &session.current_noqa);
break;
}
obj = None;
Expand Down Expand Up @@ -1478,15 +1479,15 @@ If you used a relational field and get this error, check that the comodel of thi
"=" | "!=" | ">" | ">=" | "<" | "<=" | "=?" | "=like" | "like" | "not like" | "ilike" |
"not ilike" | "=ilike" | "in" | "not in" | "child_of" | "parent_of" | "any" | "not any" => {},
_ => {
diagnostics.push(Diagnostic::new(
add_diagnostic(diagnostics, Diagnostic::new(
Range::new(Position::new(s.range().start().to_u32(), 0), Position::new(s.range().end().to_u32(), 0)),
Some(DiagnosticSeverity::ERROR),
Some(NumberOrString::String(S!("OLS30318"))),
Some(EXTENSION_NAME.to_string()),
format!("Invalid comparison operator"),
None,
None,
));
), &session.current_noqa);
}
}
},
Expand Down
Loading