[IMP] Address cargo compiler warnings

Author: mmahrouss

server/src/core/evaluation.rs

@@ -198,7 +198,19 @@ pub type Context = HashMap<String, ContextValue>;
  * diagnostics: a vec the hook can fill to add diagnostics
  * file_symbol: if provided, can be used to add dependencies
  */
-type GetSymbolHook = fn (session: &mut SessionInfo, eval: &EvaluationSymbol, context: &mut Option<Context>, diagnostics: &mut Vec<Diagnostic>, scope: Option<Rc<RefCell<Symbol>>>) -> Option<EvaluationSymbolPtr>;
+type GetSymbolHookCallable = fn (session: &mut SessionInfo, eval: &EvaluationSymbol, context: &mut Option<Context>, diagnostics: &mut Vec<Diagnostic>, scope: Option<Rc<RefCell<Symbol>>>) -> Option<EvaluationSymbolPtr>;
+
+#[derive(Debug, Clone)]
+pub struct GetSymbolHook {
+    pub callable: GetSymbolHookCallable,
+    pub name: String
+}
+
+impl PartialEq for GetSymbolHook {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+    }
+}
 
 
 #[derive(Debug, Clone)]
@@ -1194,7 +1206,7 @@ impl Evaluation {
                             let get_item = get_item.borrow();
                             if get_item.evaluations().is_some() && get_item.evaluations().unwrap().len() == 1 {
                                 let get_item_eval = &get_item.evaluations().unwrap()[0];
-                                if let Some(hook) = get_item_eval.symbol.get_symbol_hook {
+                                if let Some(hook) = get_item_eval.symbol.get_symbol_hook.as_ref() {
                                     let parent_file_or_func = parent.clone().borrow().parent_file_or_function().as_ref().unwrap().upgrade().unwrap();
                                     let is_in_validation = match parent_file_or_func.borrow().typ().clone() {
                                         SymType::FILE | SymType::PACKAGE(_) | SymType::FUNCTION => {
@@ -1206,7 +1218,7 @@ impl Evaluation {
                                     let old_range = context.as_mut().unwrap().remove(&S!("range"));
                                     context.as_mut().unwrap().insert(S!("range"), ContextValue::RANGE(sub.slice.range()));
                                     context.as_mut().unwrap().insert(S!("is_in_validation"), ContextValue::BOOLEAN(is_in_validation));
-                                    let hook_result = hook(session, &get_item_eval.symbol, context, &mut diagnostics, Some(parent.clone()));
+                                    let hook_result = (hook.callable)(session, &get_item_eval.symbol, context, &mut diagnostics, Some(parent.clone()));
                                     if let Some(hook_result) = hook_result {
                                         match hook_result {
                                             EvaluationSymbolPtr::WEAK(ref weak) => {
@@ -1347,8 +1359,7 @@ impl Evaluation {
                 },
                 ArgumentType::KWARG => {
                     kwarg_index = index as i32;
-                },
-                _ => {}
+                }
             }
         }
         if !function.is_static {
@@ -1456,7 +1467,7 @@ impl Evaluation {
         diagnostics
     }
 
-    fn process_argument_diagnostics(session: &SessionInfo, expr_call: &ExprCall, diagnostics: Vec<Vec<Diagnostic>>, eval_count: usize) -> Vec<Diagnostic> {
+    fn process_argument_diagnostics(session: &SessionInfo, expr_call: &ExprCall, diagnostics: Vec<Vec<Diagnostic>>, _eval_count: usize) -> Vec<Diagnostic> {
         let mut filtered_diagnostics = vec![];
         //iter through diagnostics and check that each evaluation has the same amount of diagnostics with code OLS01007 or OLS01008 or OLS01010
         let all_same_issues = diagnostics.iter().fold_while(None, |acc, diags| {
@@ -1789,8 +1800,8 @@ impl EvaluationSymbol {
     /* Execute Hook, then return the effective EvaluationSymbolPtr */
     pub fn get_symbol(&self, session: &mut SessionInfo, context: &mut Option<Context>, diagnostics: &mut Vec<Diagnostic>, file_symbol: Option<Rc<RefCell<Symbol>>>) -> EvaluationSymbolPtr {
         let mut custom_eval = None;
-        if let Some(hook) = self.get_symbol_hook {
-            custom_eval = hook(session, self, context, diagnostics, file_symbol);
+        if let Some(hook) = self.get_symbol_hook.as_ref() {
+            custom_eval = (hook.callable)(session, self, context, diagnostics, file_symbol);
         }
         custom_eval.as_ref().unwrap_or(&self.sym).clone()
     }

server/src/core/odoo.rs

@@ -12,7 +12,6 @@ use crate::features::definition::DefinitionFeature;
 use crate::features::hover::HoverFeature;
 use std::collections::HashMap;
 use std::cell::RefCell;
-use std::ffi::OsStr;
 use std::rc::{Rc, Weak};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};

server/src/core/python_arch_eval_hooks.rs

@@ -13,6 +13,7 @@ use ruff_text_size::TextRange;
 use tracing::warn;
 use weak_table::traits::WeakElement;
 use crate::core::diagnostics::{create_diagnostic, DiagnosticCode};
+use crate::core::evaluation::GetSymbolHook;
 use crate::core::odoo::SyncOdoo;
 use crate::core::evaluation::Context;
 use crate::core::symbols::symbol::Symbol;
@@ -442,8 +443,8 @@ static arch_eval_function_hooks: Lazy<Vec<PythonArchEvalFunctionHook>> = Lazy::n
         symbol.borrow_mut().set_evaluations(vec![Evaluation {
             symbol: EvaluationSymbol::new_with_symbol(Weak::new(),
                 Some(true),
-                HashMap::from([(S!("hook_name"), ContextValue::STRING(S!("eval_env_get_item")))]),
-                Some(PythonArchEvalHooks::eval_env_get_item)
+                HashMap::new(),
+                Some(GetSymbolHook{callable: PythonArchEvalHooks::eval_env_get_item, name: S!("eval_env_get_item")})
             ),
             value: None,
             range: None
@@ -458,7 +459,7 @@ static arch_eval_function_hooks: Lazy<Vec<PythonArchEvalFunctionHook>> = Lazy::n
             symbol: EvaluationSymbol::new_with_symbol(Weak::new(),
                 Some(true),
                 HashMap::new(),
-                Some(PythonArchEvalHooks::eval_registry_get_item)
+                Some(GetSymbolHook{callable: PythonArchEvalHooks::eval_registry_get_item, name: S!("eval_registry_get_item")})
             ),
             value: None,
             range: None
@@ -600,7 +601,7 @@ static arch_eval_function_hooks: Lazy<Vec<PythonArchEvalFunctionHook>> = Lazy::n
                 Rc::downgrade(&fields_class_sym),
                 Some(true),
                 HashMap::new(),
-                Some(PythonArchEvalHooks::eval_init)
+                Some(GetSymbolHook{callable: PythonArchEvalHooks::eval_init, name: S!("eval_init")})
             ),
             value: None,
             range: None,
@@ -874,7 +875,7 @@ impl PythonArchEvalHooks {
                 Rc::downgrade(return_sym.last().unwrap()),
                 Some(true),
                 HashMap::new(),
-                Some(PythonArchEvalHooks::eval_get)
+                Some(GetSymbolHook{callable: PythonArchEvalHooks::eval_get, name: S!("eval_get")})
             ),
             value: None,
             range: None
@@ -898,7 +899,7 @@ impl PythonArchEvalHooks {
                 Rc::downgrade(return_sym),
                 Some(true),
                 HashMap::new(),
-                Some(PythonArchEvalHooks::eval_get)
+                Some(GetSymbolHook{callable: PythonArchEvalHooks::eval_get, name: S!("eval_get")})
             ),
             value: None,
             range: None
@@ -978,7 +979,7 @@ impl PythonArchEvalHooks {
                 Weak::new(),
                 Some(true),
                 HashMap::new(),
-                Some(PythonArchEvalHooks::eval_relational)
+                Some(GetSymbolHook{callable: PythonArchEvalHooks::eval_relational, name: S!("eval_relational")})
             ),
             value: None,
             range: None,
@@ -991,7 +992,7 @@ impl PythonArchEvalHooks {
                 Weak::new(),
                 Some(true),
                 HashMap::new(),
-                Some(PythonArchEvalHooks::eval_relational)
+                Some(GetSymbolHook{callable: PythonArchEvalHooks::eval_relational, name: S!("eval_relational")})
             ),
             value: None,
             range: None,
@@ -1108,9 +1109,9 @@ impl PythonArchEvalHooks {
                 Some(true),
                 HashMap::new(),
                 Some(match relational {
-                    Some(oyarn) if oyarn == oyarn!("One2many") => PythonArchEvalHooks::eval_init_relational_one2many,
-                    Some(_) => PythonArchEvalHooks::eval_init_relational,
-                    None => PythonArchEvalHooks::eval_init,
+                    Some(oyarn) if oyarn == oyarn!("One2many") => GetSymbolHook{callable: PythonArchEvalHooks::eval_init_relational_one2many, name: S!("eval_init_relational_one2many")},
+                    Some(_) => GetSymbolHook{callable: PythonArchEvalHooks::eval_init_relational, name: S!("eval_init_relational")},
+                    None => GetSymbolHook{callable: PythonArchEvalHooks::eval_init, name: S!("eval_init")},
                 })
             ),
             value: None,
@@ -1293,7 +1294,7 @@ impl PythonArchEvalHooks {
                 Rc::downgrade(&func_sym),
                 Some(true),
                 HashMap::new(),
-                Some(PythonArchEvalHooks::eval_env_ref)
+                Some(GetSymbolHook{callable: PythonArchEvalHooks::eval_env_ref, name: S!("eval_env_ref")})
             ),
             value: None,
             range: None

server/src/core/xml_validation.rs

@@ -3,7 +3,7 @@ use std::{cell::RefCell, cmp::Ordering, collections::{HashMap, HashSet}, rc::Rc}
 use lsp_types::{Diagnostic, Position, Range};
 use tracing::{info, trace};
 
-use crate::{Sy, constants::{BuildSteps, DEBUG_STEPS, OYarn}, core::{diagnostics::{DiagnosticCode, create_diagnostic}, entry_point::{EntryPoint, EntryPointType}, evaluation::ContextValue, file_mgr::{FileInfo, FileMgr}, model::Model, odoo::SyncOdoo, symbols::{module_symbol::ModuleSymbol, symbol::Symbol}, xml_data::{OdooData, OdooDataRecord, XmlDataDelete, XmlDataMenuItem, XmlDataTemplate}}, oyarn, threads::SessionInfo, utils::compare_semver};
+use crate::{Sy, constants::{BuildSteps, DEBUG_STEPS, OYarn}, core::{diagnostics::{DiagnosticCode, create_diagnostic}, entry_point::{EntryPoint, EntryPointType}, evaluation::ContextValue, file_mgr::FileInfo, model::Model, odoo::SyncOdoo, symbols::symbol::Symbol, xml_data::{OdooData, OdooDataRecord, XmlDataDelete, XmlDataMenuItem, XmlDataTemplate}}, oyarn, threads::SessionInfo, utils::compare_semver};
 
 
 

server/src/features/completion.rs

@@ -851,10 +851,8 @@ fn complete_subscript(session: &mut SessionInfo, file: &Rc<RefCell<Symbol>>, exp
                         if get_item.borrow().evaluations().as_ref().unwrap().len() == 1 {
                             let get_item_bw = get_item.borrow();
                             let get_item_eval = get_item_bw.evaluations().as_ref().unwrap().first().unwrap();
-                            if let EvaluationSymbolPtr::WEAK(w) = get_item_eval.symbol.get_symbol_ptr() {
-                                if matches!(w.context.get(&S!("hook_name")), Some(hook_name) if hook_name.as_string() == "eval_env_get_item") {
-                                    return complete_expr(&expr_subscript.slice, session, file, offset, is_param, &vec![ExpectedType::MODEL_NAME]);
-                                }
+                            if get_item_eval.symbol.get_symbol_hook.as_ref().map(|hook| &hook.name == "eval_env_get_item").unwrap_or_default(){
+                                return complete_expr(&expr_subscript.slice, session, file, offset, is_param, &vec![ExpectedType::MODEL_NAME]);
                             }
                         }
                     }
@@ -1186,4 +1184,4 @@ fn get_completion_item_kind(typ: &SymType) -> CompletionItemKind {
         SymType::XML_FILE => CompletionItemKind::FILE,
         SymType::CSV_FILE => CompletionItemKind::FILE,
     }
-}
+}

server/src/utils.rs

@@ -158,7 +158,7 @@ pub trait PathSanitizer {
 impl PathSanitizer for PathBuf {
 
     fn sanitize(&self) -> String {
-        let mut path = self.to_slash_lossy().to_string();
+        let path = self.to_slash_lossy().to_string();
 
         #[cfg(windows)]
         {
@@ -204,7 +204,7 @@ impl PathSanitizer for PathBuf {
 impl PathSanitizer for Path {
 
     fn sanitize(&self) -> String {
-        let mut path = self.to_slash_lossy().to_string();
+        let path = self.to_slash_lossy().to_string();
 
         #[cfg(windows)]
         {

server/tests/test_utils.rs

@@ -77,11 +77,6 @@ pub fn verify_diagnostics_against_doc(
     let mut diags: HashMap<u32, Vec<&Diagnostic>> = HashMap::new();
     for diag in &diagnostics {
         let line = diag.range.start.line;
-        let code_str = match &diag.code {
-            Some(NumberOrString::String(c)) => c.clone(),
-            Some(NumberOrString::Number(n)) => n.to_string(),
-            None => continue,
-        };
         diags.entry(line).or_default().push(diag);
     }