[FIX] adapt for CachedModel

Author: mmahrouss

server/src/core/python_odoo_builder.rs

@@ -351,71 +351,80 @@ impl PythonOdooBuilder {
         }
     }
 
-    /* true if the symbol inherit from odoo.models.BaseModel. symbol must be the data of rc_symbol and must be a Class */
+    /* true if the symbol inherits from BaseModel, Model, TransientModel, or CachedModel. symbol must be the data of rc_symbol and must be a Class */
     fn test_symbol_is_model(&mut self, session: &mut SessionInfo, diagnostics: &mut Vec<Diagnostic>) -> bool {
         let symbol = &self.symbol.clone();
         let odoo_symbol_tree = symbol.borrow().get_main_entry_tree(session);
         let mut sym = symbol.borrow_mut();
-        if (
-            compare_semver(session.sync_odoo.full_version.as_str(), "18.1") == Ordering::Less && odoo_symbol_tree.0.len() == 2
-            && odoo_symbol_tree.1.len() == 1
-            && odoo_symbol_tree.0[0] == "odoo"
-            && odoo_symbol_tree.0[1] == "models"
-            && (odoo_symbol_tree.1[0] == "BaseModel" || odoo_symbol_tree.1[0] == "Model" || odoo_symbol_tree.1[0] == "TransientModel"))
-            || (compare_semver(session.sync_odoo.full_version.as_str(), "18.1") >= Ordering::Equal && odoo_symbol_tree.0.len() == 3
-            && odoo_symbol_tree.1.len() == 1
-            && odoo_symbol_tree.0[0] == "odoo"
-            && odoo_symbol_tree.0[1] == "orm"
-            && odoo_symbol_tree.0[2] == "models"
-            && (odoo_symbol_tree.1[0] == "BaseModel" || odoo_symbol_tree.1[0] == "Model" || odoo_symbol_tree.1[0] == "TransientModel"))
-            || (compare_semver(session.sync_odoo.full_version.as_str(), "18.3") >= Ordering::Equal && odoo_symbol_tree.0.len() == 3
-            && odoo_symbol_tree.1.len() == 1
-            && odoo_symbol_tree.0[0] == "odoo"
-            && odoo_symbol_tree.0[1] == "orm"
-            && odoo_symbol_tree.0[2] == "models_transient"
-            && odoo_symbol_tree.1[0] == "TransientModel") {
-            //we don't want to compare these classes with themselves (> 18.3)
+        if [&[Sy!("BaseModel")], &[Sy!("Model")], &[Sy!("TransientModel")]].iter().any(|x| x == &odoo_symbol_tree.1.as_slice()) &&
+            // [BaseModel|Model|TransientModel]
+            (( // < 18.1, and we are on odoo.models.
+                compare_semver(session.sync_odoo.full_version.as_str(), "18.1") == Ordering::Less
+                && odoo_symbol_tree.0 == &["odoo", "models"]
+            ) || ( // >= 18.1, and we are on odoo.orm.models.
+                compare_semver(session.sync_odoo.full_version.as_str(), "18.1") >= Ordering::Equal
+                && odoo_symbol_tree.0 == &["odoo", "orm", "models"]
+            ))
+            // >= 18.3, and we are on odoo.orm.models_transient.TransientModel
+            || (
+                compare_semver(session.sync_odoo.full_version.as_str(), "18.3") >= Ordering::Equal
+                && odoo_symbol_tree.1 == &["TransientModel"]
+                && odoo_symbol_tree.0 == &["odoo", "orm", "models_transient"]
+            )
+            // we are on odoo.orm.models_cached.CachedModel
+            || (
+                compare_semver(session.sync_odoo.full_version.as_str(), "19.1") >= Ordering::Equal
+                && odoo_symbol_tree.1 == &["CachedModel"]
+                && odoo_symbol_tree.0 == &["odoo", "orm", "models_cached"]
+            )
+        {
+            //we don't want to compare these classes with themselves, so we exit early
             return false;
-        } else {
-            if sym.as_class_sym().bases.is_empty() {
-                return false;
-            }
-            let mut base_model_tree = (vec![Sy!("odoo"), Sy!("models")], vec![Sy!("BaseModel")]);
-            let mut model_tree = (vec![Sy!("odoo"), Sy!("models")], vec![Sy!("Model")]);
-            let mut transient_tree = (vec![Sy!("odoo"), Sy!("models")], vec![Sy!("TransientModel")]);
-            if compare_semver(session.sync_odoo.full_version.as_str(), "18.1") >= Ordering::Equal {
-                base_model_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models")], vec![Sy!("BaseModel")]);
-                model_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models")], vec![Sy!("Model")]);
-                transient_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models")], vec![Sy!("TransientModel")]);
-            }
-            if compare_semver(session.sync_odoo.full_version.as_str(), "18.3") >= Ordering::Equal {
-                transient_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models_transient")], vec![Sy!("TransientModel")]);
-            }
-            let base_model = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &base_model_tree, u32::MAX);
-            let model = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &model_tree, u32::MAX);
-            let transient = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &transient_tree, u32::MAX);
-            if base_model.is_empty() || model.is_empty() || transient.is_empty() {
-                //one of them is not already loaded, but that's not really an issue, as now odoo step has been merged
-                //with arch eval step, some files will be odooed before loading the orm fully. In this case we should
-                //ignore this error. Moreover if a base is set on the class, it means that the base has been loaded, so
-                //it is NOT a model.
-                // session.send_notification(ShowMessage::METHOD, ShowMessageParams{
-                //     typ: MessageType::ERROR,
-                //     message: "Odoo base models are not found. OdooLS will be unable to generate valid diagnostics".to_string()
-                // });
-                return false;
-            }
-            let base_model = base_model[0].clone();
-            let model = model[0].clone();
-            let transient = transient[0].clone();
-            if Rc::ptr_eq(symbol, &base_model) ||
-                Rc::ptr_eq(symbol, &model) ||
-                Rc::ptr_eq(symbol, &transient) {
-                return false;
-            }
-            if !sym.as_class_sym().inherits(&base_model, &mut None) {
+        }
+        if sym.as_class_sym().bases.is_empty() {
+            return false;
+        }
+        let mut base_model_tree = (vec![Sy!("odoo"), Sy!("models")], vec![Sy!("BaseModel")]);
+        let mut model_tree = (vec![Sy!("odoo"), Sy!("models")], vec![Sy!("Model")]);
+        let mut transient_tree = (vec![Sy!("odoo"), Sy!("models")], vec![Sy!("TransientModel")]);
+        if compare_semver(session.sync_odoo.full_version.as_str(), "18.1") >= Ordering::Equal {
+            base_model_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models")], vec![Sy!("BaseModel")]);
+            model_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models")], vec![Sy!("Model")]);
+            transient_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models")], vec![Sy!("TransientModel")]);
+        }
+        if compare_semver(session.sync_odoo.full_version.as_str(), "18.3") >= Ordering::Equal {
+            transient_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models_transient")], vec![Sy!("TransientModel")]);
+        }
+        let base_model_syms = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &base_model_tree, u32::MAX);
+        let model_syms = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &model_tree, u32::MAX);
+        let transient_syms = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &transient_tree, u32::MAX);
+        if base_model_syms.is_empty() || model_syms.is_empty() || transient_syms.is_empty() {
+            //one of them is not already loaded, but that's not really an issue, as now odoo step has been merged
+            //with arch eval step, some files will be odooed before loading the orm fully. In this case we should
+            //ignore this error. Moreover if a base is set on the class, it means that the base has been loaded, so
+            //it is NOT a model.
+            // session.send_notification(ShowMessage::METHOD, ShowMessageParams{
+            //     typ: MessageType::ERROR,
+            //     message: "Odoo base models are not found. OdooLS will be unable to generate valid diagnostics".to_string()
+            // });
+            return false;
+        }
+        if Rc::ptr_eq(symbol, &base_model_syms[0]) ||
+            Rc::ptr_eq(symbol, &model_syms[0]) ||
+            Rc::ptr_eq(symbol, &transient_syms[0])
+        {
+            return false;
+        }
+        if compare_semver(session.sync_odoo.full_version.as_str(), "19.1") >= Ordering::Equal{
+            let cached_model_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models_cached")], vec![Sy!("CachedModel")]);
+            let cached_model = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &cached_model_tree, u32::MAX);
+            if cached_model.is_empty() || Rc::ptr_eq(symbol, &cached_model[0]){
                 return false;
             }
+
+        }
+        if !sym.as_class_sym().inherits(&base_model_syms[0], &mut None) {
+            return false;
         }
         sym.as_class_sym_mut()._model = Some(ModelData::new());
         let register = sym.get_symbol(&(vec![], vec![Sy!("_register")]), u32::MAX);