[IMP] server: save relevant filters on file info

Author: mmahrouss

server/src/core/file_mgr.rs

@@ -10,6 +10,7 @@ use std::hash::{Hash, Hasher};
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::{collections::HashMap, fs};
+use crate::core::config::DiagnosticFilter;
 use crate::core::diagnostics::{create_diagnostic, DiagnosticCode, DiagnosticSetting};
 use crate::threads::SessionInfo;
 use crate::utils::PathSanitizer;
@@ -72,6 +73,7 @@ pub struct FileInfo {
     diagnostics: HashMap<BuildSteps, Vec<Diagnostic>>,
     pub noqas_blocs: HashMap<u32, NoqaInfo>,
     noqas_lines: HashMap<u32, NoqaInfo>,
+    diagnostic_filters: Vec<DiagnosticFilter>,
 }
 
 impl FileInfo {
@@ -91,6 +93,7 @@ impl FileInfo {
             diagnostics: HashMap::new(),
             noqas_blocs: HashMap::new(),
             noqas_lines: HashMap::new(),
+            diagnostic_filters: Vec::new(),
         }
     }
     pub fn update(&mut self, session: &mut SessionInfo, uri: &str, content: Option<&Vec<TextDocumentContentChangeEvent>>, version: Option<i32>, in_workspace: bool, force: bool) -> bool {
@@ -287,6 +290,11 @@ impl FileInfo {
         diagnostic.range.end = self.offset_to_position(diagnostic.range.end.line as usize);
         diagnostic
     }
+    pub fn update_diagnostic_filters(&mut self, session: &SessionInfo) {
+        self.diagnostic_filters = session.sync_odoo.config.diagnostic_filters.iter().cloned().filter(|filter| {
+            (filter.negation && !filter.paths.matches(&self.uri)) || (!filter.negation && filter.paths.matches(&self.uri))
+        }).collect::<Vec<_>>();
+    }
 
     pub fn publish_diagnostics(&mut self, session: &mut SessionInfo) {
         if self.need_push {
@@ -319,11 +327,7 @@ impl FileInfo {
                         }
                     }
                 }
-                for filter in &session.sync_odoo.config.diagnostic_filters {
-                    // Path match
-                    if (!filter.negation && !filter.paths.matches(&self.uri)) || (filter.negation && filter.paths.matches(&self.uri)) {
-                        continue;
-                    }
+                for filter in self.diagnostic_filters.iter() {
                     if !filter.codes.is_empty(){
                         // we pass the filter if we do not have code, or does it not match the filter
                         let Some(updated_code) = &updated.code else {
@@ -488,7 +492,11 @@ impl FileMgr {
     }
 
     pub fn update_file_info(&mut self, session: &mut SessionInfo, uri: &str, content: Option<&Vec<TextDocumentContentChangeEvent>>, version: Option<i32>, force: bool) -> (bool, Rc<RefCell<FileInfo>>) {
-        let file_info = self.files.entry(uri.to_string()).or_insert_with(|| Rc::new(RefCell::new(FileInfo::new(uri.to_string()))));
+        let file_info = self.files.entry(uri.to_string()).or_insert_with(|| {
+            let mut file_info = FileInfo::new(uri.to_string());
+            file_info.update_diagnostic_filters(session);
+            Rc::new(RefCell::new(file_info))
+        });
         let return_info = file_info.clone();
         //Do not modify the file if a version is not given but the file is opened
         let mut updated: bool = false;
@@ -500,6 +508,12 @@ impl FileMgr {
         (updated, return_info)
     }
 
+    pub fn update_all_file_diagnostic_filters(&mut self, session: &SessionInfo) {
+        for file_info in self.files.values() {
+            file_info.borrow_mut().update_diagnostic_filters(session);
+        }
+    }
+
     pub fn delete_path(session: &mut SessionInfo, uri: &String) {
         //delete all files that are the uri or in subdirectory
         let matching_keys: Vec<String> = session.sync_odoo.get_file_mgr().borrow_mut().files.keys().filter(|k| PathBuf::from(k).starts_with(uri)).cloned().collect();

server/src/core/odoo.rs

@@ -1639,6 +1639,8 @@ impl Odoo {
                         // Changes can be applied without restart
                         session.sync_odoo.config_file = Some(cfg_file);
                         session.sync_odoo.config = new_config;
+                        // Recalculate diagnostic filters
+                        session.sync_odoo.get_file_mgr().borrow_mut().update_all_file_diagnostic_filters(session);
                     }
                 }
                 Err(err) => {

server/src/core/symbols/symbol.rs

@@ -2217,7 +2217,9 @@ impl Symbol {
                                         // /!\ we want to keep instance = True if previous evaluation was set to True!
                                         if next_ref_weak_instance.is_some_and(|v| v) {
                                             next_sym_refs = next_sym_refs.into_iter().map(|mut next_results| {
-                                                next_results.as_mut_weak().instance = Some(true);
+                                                if let EvaluationSymbolPtr::WEAK(weak) = &mut next_results {
+                                                    weak.instance = Some(true);
+                                                }
                                                 next_results
                                             }).collect();
                                         }