[FIX] server: adapt some diagnostics to new structure

Author: fda-odoo

server/src/core/diagnostic_codes_list.rs

@@ -412,4 +412,16 @@ OLS05053, DiagnosticSetting::Error, "Action with id '{0}' does not exist",
  * A menuitem is specifying a group that has not been declared before the menuitem
  */
 OLS05054, DiagnosticSetting::Error, "Group with id '{0}' does not exist",
+/**
+ * Model not found
+ */
+OLS05055, DiagnosticSetting::Error, "Model '{0}' not found in module '{1}'",
+/**
+ * Model not found
+ */
+OLS05056, DiagnosticSetting::Error, "Model '{0}' not found",
+/**
+ * Field not found in model
+ */
+OLS05057, DiagnosticSetting::Error, "Field '{0}' not found in model '{1}'",
 }

server/src/core/odoo.rs

@@ -1,3 +1,4 @@
+use crate::core::diagnostics::{create_diagnostic, DiagnosticCode};
 use crate::core::entry_point::EntryPointType;
 use crate::core::file_mgr::AstType;
 use crate::core::symbols::file_symbol;
@@ -937,7 +938,7 @@ impl SyncOdoo {
     /**
      * search for an xml_id in the already registered xml files.
      * */
-    pub fn get_xml_ids(&mut self, from_file: &Rc<RefCell<Symbol>>, xml_id: &str, range: &std::ops::Range<usize>, diagnostics: &mut Vec<Diagnostic>) -> Vec<XmlData> {
+    pub fn get_xml_ids(session: &mut SessionInfo, from_file: &Rc<RefCell<Symbol>>, xml_id: &str, range: &std::ops::Range<usize>, diagnostics: &mut Vec<Diagnostic>) -> Vec<XmlData> {
         if !from_file.borrow().get_entry().unwrap().borrow().is_main() {
             return vec![];
         }
@@ -948,22 +949,19 @@ impl SyncOdoo {
             module = from_file.borrow().find_module();
         } else if id_split.len() == 2 {
             // Try to find the module by name
-            if let Some(m) = self.modules.get(&Sy!(id_split.first().unwrap().to_string())) {
+            if let Some(m) = session.sync_odoo.modules.get(&Sy!(id_split.first().unwrap().to_string())) {
                 module = m.upgrade();
             }
         } else if id_split.len() > 2 {
-            diagnostics.push(Diagnostic::new(
-                Range {
-                    start: Position::new(range.start as u32, 0),
-                    end: Position::new(range.end as u32, 0),
-                },
-                Some(DiagnosticSeverity::ERROR),
-                Some(lsp_types::NumberOrString::String(S!("OLS30446"))),
-                Some(EXTENSION_NAME.to_string()),
-                format!("Invalid XML ID '{}'. It should not contain more than one dot", xml_id),
-                None,
-                None
-            ));
+            if let Some(diagnostic) = create_diagnostic(session, DiagnosticCode::OLS05051, &[xml_id]) {
+                diagnostics.push(lsp_types::Diagnostic {
+                    range: lsp_types::Range {
+                        start: lsp_types::Position::new(range.start as u32, 0),
+                        end: lsp_types::Position::new(range.end as u32, 0),
+                    },
+                    ..diagnostic.clone()
+                });
+            }
             return vec![];
         }
         if module.is_none() {

server/src/core/xml_arch_builder.rs

@@ -6,7 +6,7 @@ use roxmltree::{Attribute, Node};
 use tracing::{error, warn};
 use weak_table::PtrWeakHashSet;
 
-use crate::{core::{diagnostics::{create_diagnostic, DiagnosticCode}}};
+use crate::core::{diagnostics::{create_diagnostic, DiagnosticCode}, odoo::SyncOdoo};
 use crate::{constants::{BuildStatus, BuildSteps, OYarn, EXTENSION_NAME}, core::{entry_point::EntryPointType, xml_data::XmlData}, oyarn, threads::SessionInfo, Sy, S};
 
 use super::{file_mgr::FileInfo, symbols::{symbol::Symbol}};
@@ -87,7 +87,7 @@ impl XmlArchBuilder {
     }
 
     pub fn get_group_ids(&self, session: &mut SessionInfo, xml_id: &str, attr: &Attribute, diagnostics: &mut Vec<Diagnostic>) -> Vec<XmlData> {
-        let xml_ids = session.sync_odoo.get_xml_ids(&self.xml_symbol, xml_id, &attr.range(), diagnostics);
+        let xml_ids = SyncOdoo::get_xml_ids(session, &self.xml_symbol, xml_id, &attr.range(), diagnostics);
         let mut res = vec![];
         for data in xml_ids.iter() {
             match data {

server/src/core/xml_arch_builder_rng_validation.rs

@@ -5,7 +5,7 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use roxmltree::Node;
 
-use crate::{constants::{BuildStatus, BuildSteps, OYarn, EXTENSION_NAME}, core::{diagnostics::{create_diagnostic, DiagnosticCode}, xml_data::{XmlData, XmlDataDelete, XmlDataField, XmlDataMenuItem, XmlDataRecord, XmlDataTemplate}}, oyarn, threads::SessionInfo, Sy, S};
+use crate::{constants::{BuildStatus, BuildSteps, OYarn, EXTENSION_NAME}, core::{diagnostics::{create_diagnostic, DiagnosticCode}, odoo::SyncOdoo, xml_data::{XmlData, XmlDataDelete, XmlDataField, XmlDataMenuItem, XmlDataRecord, XmlDataTemplate}}, oyarn, threads::SessionInfo, Sy, S};
 
 use super::xml_arch_builder::XmlArchBuilder;
 
@@ -103,7 +103,7 @@ impl XmlArchBuilder {
                         }
                     }
                     //check that action exists
-                    if session.sync_odoo.get_xml_ids(&self.xml_symbol, attr.value(), &attr.range(), diagnostics).is_empty() {
+                    if SyncOdoo::get_xml_ids(session, &self.xml_symbol, attr.value(), &attr.range(), diagnostics).is_empty() {
                         if let Some(diagnostic) = create_diagnostic(session, DiagnosticCode::OLS05053, &[attr.value()]) {
                             diagnostics.push(Diagnostic {
                                 range: Range { start: Position::new(attr.range().start as u32, 0), end: Position::new(attr.range().end as u32, 0) },
@@ -122,7 +122,7 @@ impl XmlArchBuilder {
                         }
                     } else {
                         //check that parent exists
-                        if session.sync_odoo.get_xml_ids(&self.xml_symbol, attr.value(), &attr.range(), diagnostics).is_empty() {
+                        if SyncOdoo::get_xml_ids(session, &self.xml_symbol, attr.value(), &attr.range(), diagnostics).is_empty() {
                             if let Some(diagnostic) = create_diagnostic(session, DiagnosticCode::OLS05052, &[attr.value()]) {
                                 diagnostics.push(Diagnostic {
                                     range: Range { start: Position::new(attr.range().start as u32, 0), end: Position::new(attr.range().end as u32, 0) },

server/src/core/xml_validation.rs

@@ -3,7 +3,7 @@ use std::{cell::RefCell, collections::HashMap, hash::Hash, path::PathBuf, rc::Rc
 use lsp_types::{Diagnostic, Position, Range};
 use tracing::{info, trace};
 
-use crate::{constants::{BuildSteps, OYarn, SymType, DEBUG_STEPS, EXTENSION_NAME}, core::{entry_point::{EntryPoint, EntryPointType}, evaluation::ContextValue, file_mgr::FileInfo, model::Model, odoo::SyncOdoo, symbols::symbol::Symbol, xml_data::{XmlData, XmlDataDelete, XmlDataMenuItem, XmlDataRecord, XmlDataTemplate}}, threads::SessionInfo, Sy, S};
+use crate::{constants::{BuildSteps, OYarn, SymType, DEBUG_STEPS, EXTENSION_NAME}, core::{diagnostics::{create_diagnostic, DiagnosticCode}, entry_point::{EntryPoint, EntryPointType}, evaluation::ContextValue, file_mgr::FileInfo, model::Model, odoo::SyncOdoo, symbols::symbol::Symbol, xml_data::{XmlData, XmlDataDelete, XmlDataMenuItem, XmlDataRecord, XmlDataTemplate}}, threads::SessionInfo, Sy, S};
 
 
 
@@ -69,15 +69,12 @@ impl XmlValidator {
     fn validate_record(&self, session: &mut SessionInfo, module: &Rc<RefCell<Symbol>>, xml_data_record: &XmlDataRecord, diagnostics: &mut Vec<Diagnostic>, dependencies: &mut Vec<Rc<RefCell<Symbol>>>, model_dependencies: &mut Vec<Rc<RefCell<Model>>>) {
         let Some(model) = session.sync_odoo.models.get(&xml_data_record.model.0).cloned() else {
             //TODO register to not_found_models
-            diagnostics.push(Diagnostic::new(
-                Range::new(Position::new(xml_data_record.model.1.start.try_into().unwrap(), 0), Position::new(xml_data_record.model.1.end.try_into().unwrap(), 0)),
-                Some(lsp_types::DiagnosticSeverity::ERROR),
-                Some(lsp_types::NumberOrString::String(S!("OLS30450"))),
-                Some(EXTENSION_NAME.to_string()),
-                format!("Model '{}' not found in module '{}'", xml_data_record.model.0, module.borrow().name()),
-                None,
-                None
-            ));
+            if let Some(diagnostic) = create_diagnostic(session, DiagnosticCode::OLS05055, &[&xml_data_record.model.0, module.borrow().name()]) {
+                diagnostics.push(Diagnostic {
+                    range: Range { start: Position::new(xml_data_record.model.1.start.try_into().unwrap(), 0), end: Position::new(xml_data_record.model.1.end.try_into().unwrap(), 0) },
+                    ..diagnostic.clone()
+                });
+            }
             info!("Model '{}' not found in module '{}'", xml_data_record.model.0, module.borrow().name());
             return;
         };
@@ -130,31 +127,25 @@ impl XmlValidator {
                                 main_sym = model.borrow().get_main_symbols(session, from_module);
                             }
                             if main_sym.is_empty() {
-                                diagnostics.push(Diagnostic::new(
-                                    Range::new(Position::new(field.text_range.as_ref().unwrap().start.try_into().unwrap(), 0), Position::new(field.text_range.as_ref().unwrap().end.try_into().unwrap(), 0)),
-                                    Some(lsp_types::DiagnosticSeverity::ERROR),
-                                    Some(lsp_types::NumberOrString::String(S!("OLS30453"))),
-                                    Some(EXTENSION_NAME.to_string()),
-                                    format!("Model '{}' not found", field.text.as_ref().unwrap()),
-                                    None,
-                                    None
-                                ))
+                                if let Some(diagnostic) = create_diagnostic(session, DiagnosticCode::OLS05056, &[&field.text.as_ref().unwrap()]) {
+                                    diagnostics.push(Diagnostic {
+                                        range: Range { start: Position::new(field.text_range.as_ref().unwrap().start.try_into().unwrap(), 0), end: Position::new(field.text_range.as_ref().unwrap().end.try_into().unwrap(), 0) },
+                                        ..diagnostic.clone()
+                                    });
+                                }
                             }
                         }
                     },
                     _ => {}
                 }
                 //TODO check type
             } else {
-                diagnostics.push(Diagnostic::new(
-                    Range::new(Position::new(field.range.start.try_into().unwrap(), 0), Position::new(field.range.end.try_into().unwrap(), 0)),
-                    Some(lsp_types::DiagnosticSeverity::ERROR),
-                    Some(lsp_types::NumberOrString::String(S!("OLS30451"))),
-                    Some(EXTENSION_NAME.to_string()),
-                    format!("Field '{}' not found in model '{}'", field.name, xml_data_record.model.0),
-                    None,
-                    None
-                ));
+                if let Some(diagnostic) = create_diagnostic(session, DiagnosticCode::OLS05057, &[&field.name, &xml_data_record.model.0]) {
+                    diagnostics.push(Diagnostic {
+                        range: Range { start: Position::new(field.range.start.try_into().unwrap(), 0), end: Position::new(field.range.end.try_into().unwrap(), 0) },
+                        ..diagnostic.clone()
+                    });
+                }
             }
         }
         //Diagnostic if some mandatory fields are not detected

server/src/features/xml_ast_utils.rs

@@ -2,7 +2,7 @@ use std::{cell::RefCell, collections::HashMap, ops::Range, rc::Rc};
 
 use roxmltree::Node;
 
-use crate::{constants::OYarn, core::{evaluation::ContextValue, symbols::{module_symbol::ModuleSymbol, symbol::Symbol}, xml_data::XmlData}, threads::SessionInfo, Sy, S};
+use crate::{constants::OYarn, core::{evaluation::ContextValue, odoo::SyncOdoo, symbols::{module_symbol::ModuleSymbol, symbol::Symbol}, xml_data::XmlData}, threads::SessionInfo, Sy, S};
 
 pub enum XmlAstResult {
     SYMBOL(Rc<RefCell<Symbol>>),
@@ -194,7 +194,7 @@ impl XmlAstUtils {
     }
 
     fn add_xml_id_result(session: &mut SessionInfo, xml_id: &str, file_symbol: &Rc<RefCell<Symbol>>, range: Range<usize>, results: &mut (Vec<XmlAstResult>, Option<Range<usize>>), on_dep_only: bool) {
-        let mut xml_ids = session.sync_odoo.get_xml_ids(file_symbol, xml_id, &range, &mut vec![]);
+        let mut xml_ids = SyncOdoo::get_xml_ids(session, file_symbol, xml_id, &range, &mut vec![]);
         if on_dep_only {
             xml_ids = xml_ids.into_iter().filter(|x| 
                 {