fix version check

Author: CppCXY

crates/code_analysis/src/compilation/analyzer/decl/docs.rs

@@ -1,5 +1,6 @@
 use emmylua_parser::{
-    LuaAstNode, LuaAstToken, LuaComment, LuaDocAttribute, LuaDocTag, LuaDocTagAlias, LuaDocTagClass, LuaDocTagEnum, LuaDocTagMeta, LuaDocTagNamespace, LuaDocTagUsing
+    LuaAstNode, LuaAstToken, LuaComment, LuaDocAttribute, LuaDocTag, LuaDocTagAlias,
+    LuaDocTagClass, LuaDocTagEnum, LuaDocTagMeta, LuaDocTagNamespace, LuaDocTagUsing,
 };
 use flagset::FlagSet;
 
@@ -36,9 +37,7 @@ pub fn analyze_doc_tag_class(analyzer: &mut DeclAnalyzer, class: LuaDocTagClass)
     Some(())
 }
 
-fn get_attrib_value(
-    attrib: Option<LuaDocAttribute>,
-) -> Option<FlagSet<LuaTypeAttribute>> {
+fn get_attrib_value(attrib: Option<LuaDocAttribute>) -> Option<FlagSet<LuaTypeAttribute>> {
     let mut attr: FlagSet<LuaTypeAttribute> = LuaTypeAttribute::None.into();
 
     for token in attrib?.get_attrib_tokens() {
@@ -165,22 +164,16 @@ pub fn analyze_doc_tag_meta(analyzer: &mut DeclAnalyzer, tag: LuaDocTagMeta) ->
         }
     })?;
 
-    let mut visible = false;
-    let current_version = analyzer.emmyrc.runtime.version.to_lua_version_number();
+    let mut version_conds = Vec::new();
     for doc_version in version_tag.get_version_list() {
         let version_condition = doc_version.get_version_condition()?;
-        if version_condition.check(&current_version) {
-            visible = true;
-            break;
-        }
+        version_conds.push(version_condition);
     }
 
-    if !visible {
-        analyzer
-            .db
-            .get_module_index_mut()
-            .set_module_visibility(file_id, false);
-    }
+    analyzer
+        .db
+        .get_module_index_mut()
+        .set_module_version_conds(file_id, version_conds);
 
     Some(())
 }

crates/code_analysis/src/compilation/analyzer/doc/property_tags.rs

@@ -1,23 +1,21 @@
+use super::{tags::get_owner_id, DocAnalyzer};
 use emmylua_parser::{
-    BinaryOperator, LuaDocDescriptionOwner, LuaDocTagDeprecated, LuaDocTagSource, LuaDocTagVersion,
+    LuaDocDescriptionOwner, LuaDocTagDeprecated, LuaDocTagSource, LuaDocTagVersion,
     LuaDocTagVisibility,
 };
 
-use crate::db_index::{LuaVersionCond, LuaVersionCondOp};
-
-use super::{tags::get_owner_id, DocAnalyzer};
-
 pub fn analyze_visibility(
     analyzer: &mut DocAnalyzer,
     visibility: LuaDocTagVisibility,
 ) -> Option<()> {
     let visibility_kind = visibility.get_visibility_token()?.get_visibility();
     let owner_id = get_owner_id(analyzer)?;
 
-    analyzer
-        .db
-        .get_property_index_mut()
-        .add_visibility(analyzer.file_id, owner_id, visibility_kind);
+    analyzer.db.get_property_index_mut().add_visibility(
+        analyzer.file_id,
+        owner_id,
+        visibility_kind,
+    );
 
     Some(())
 }
@@ -66,24 +64,8 @@ pub fn analyze_version(analyzer: &mut DocAnalyzer, version: LuaDocTagVersion) ->
 
     let mut version_set = Vec::new();
     for version in version.get_version_list() {
-        let version_number = if let Some(version_number) = version.get_version() {
-            version_number.get_version_number()
-        } else {
-            continue;
-        };
-
-        let version_op = if let Some(version_op) = version.get_op() {
-            match version_op.get_op() {
-                BinaryOperator::OpGt => LuaVersionCondOp::Gt,
-                BinaryOperator::OpLt => LuaVersionCondOp::Lt,
-                _ => LuaVersionCondOp::Eq,
-            }
-        } else {
-            LuaVersionCondOp::Eq
-        };
-
-        if let Some(version_number) = version_number {
-            version_set.push(LuaVersionCond::new(version_number, version_op));
+        if let Some(version_condition) = version.get_version_condition() {
+            version_set.push(version_condition);
         }
     }
 
@@ -104,4 +86,4 @@ pub fn analyze_async(analyzer: &mut DocAnalyzer) -> Option<()> {
         .add_async(analyzer.file_id, owner_id);
 
     Some(())
-}
+}

crates/code_analysis/src/db_index/mod.rs

@@ -22,9 +22,7 @@ use meta::MetaFile;
 use module::LuaModuleIndex;
 pub use module::ModuleInfo;
 pub use operators::{LuaOperator, LuaOperatorId, LuaOperatorIndex, LuaOperatorMetaMethod};
-pub use property::{
-    LuaPropertyId, LuaPropertyIndex, LuaPropertyOwnerId, LuaVersionCond, LuaVersionCondOp,
-};
+pub use property::{LuaPropertyId, LuaPropertyIndex, LuaPropertyOwnerId};
 pub use r#type::*;
 pub use reference::LuaReferenceIndex;
 pub use signature::*;

crates/code_analysis/src/db_index/module/mod.rs

@@ -2,6 +2,7 @@ mod module_info;
 mod module_node;
 mod test;
 
+use emmylua_parser::LuaVersionCondition;
 use log::{error, info};
 pub use module_info::ModuleInfo;
 use module_node::{ModuleNode, ModuleNodeId};
@@ -129,6 +130,7 @@ impl LuaModuleIndex {
             module_id: parent_node_id,
             visible: true,
             export_type: None,
+            version_conds: None,
         };
 
         self.file_module_map.insert(file_id, module_info);
@@ -150,6 +152,16 @@ impl LuaModuleIndex {
         }
     }
 
+    pub fn set_module_version_conds(
+        &mut self,
+        file_id: FileId,
+        version_conds: Vec<LuaVersionCondition>,
+    ) {
+        if let Some(module_info) = self.file_module_map.get_mut(&file_id) {
+            module_info.version_conds = Some(Box::new(version_conds));
+        }
+    }
+
     pub fn find_module(&self, module_path: &str) -> Option<&ModuleInfo> {
         let module_path = module_path.replace(['\\', '/'], ".");
         let module_parts: Vec<&str> = module_path.split('.').collect();

crates/code_analysis/src/db_index/module/module_info.rs

@@ -1,3 +1,5 @@
+use emmylua_parser::{LuaVersionCondition, LuaVersionNumber};
+
 use crate::{db_index::LuaType, FileId};
 
 use super::module_node::ModuleNodeId;
@@ -10,4 +12,25 @@ pub struct ModuleInfo {
     pub module_id: ModuleNodeId,
     pub visible: bool,
     pub export_type: Option<LuaType>,
-}
+    pub version_conds: Option<Box<Vec<LuaVersionCondition>>>,
+}
+
+impl ModuleInfo {
+    pub fn is_visible(&self, version_number: &LuaVersionNumber) -> bool {
+        if !self.visible {
+            return false;
+        }
+
+        if let Some(version_conds) = &self.version_conds {
+            for cond in version_conds.iter() {
+                if cond.check(version_number) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        true
+    }
+}

crates/code_analysis/src/db_index/property/mod.rs

@@ -1,12 +1,9 @@
 mod property;
-mod version;
-
 use std::collections::{HashMap, HashSet};
 
-use emmylua_parser::VisibilityKind;
+use emmylua_parser::{LuaVersionCondition, VisibilityKind};
 use property::LuaProperty;
 pub use property::{LuaPropertyId, LuaPropertyOwnerId};
-pub use version::{LuaVersionCond, LuaVersionCondOp};
 
 use crate::FileId;
 
@@ -134,7 +131,7 @@ impl LuaPropertyIndex {
         &mut self,
         file_id: FileId,
         owner_id: LuaPropertyOwnerId,
-        version_conds: Vec<LuaVersionCond>,
+        version_conds: Vec<LuaVersionCondition>,
     ) {
         let property = self.get_or_create_property(owner_id.clone());
         property.version_conds = Some(Box::new(version_conds));

crates/code_analysis/src/db_index/property/property.rs

@@ -1,10 +1,8 @@
-use emmylua_parser::VisibilityKind;
+use emmylua_parser::{LuaVersionCondition, VisibilityKind};
 use serde::{Deserialize, Serialize};
 
 use crate::db_index::{member::LuaMemberId, LuaDeclId, LuaSignatureId, LuaTypeDeclId};
 
-use super::version::LuaVersionCond;
-
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub struct LuaProperty {
     pub id: LuaPropertyId,
@@ -14,7 +12,7 @@ pub struct LuaProperty {
     pub is_nodiscard: bool,
     pub is_deprecated: bool,
     pub deprecated_message: Option<Box<String>>,
-    pub version_conds: Option<Box<Vec<LuaVersionCond>>>,
+    pub version_conds: Option<Box<Vec<LuaVersionCondition>>>,
     pub is_async: bool,
 }
 

crates/code_analysis/src/db_index/property/version.rs

@@ -15,6 +15,7 @@ use super::completion_builder::CompletionBuilder;
 fn check_visibility(builder: &CompletionBuilder, id: LuaPropertyOwnerId) -> Option<()> {
     match id {
         LuaPropertyOwnerId::Member(_) => {}
+        LuaPropertyOwnerId::LuaDecl(_) => {}
         _ => return Some(()),
     }
 
@@ -26,10 +27,16 @@ fn check_visibility(builder: &CompletionBuilder, id: LuaPropertyOwnerId) -> Opti
     if property.is_none() {
         return Some(());
     }
-    // let decl = property.unwrap();
-    // if let Some(visib) = &decl.visibility {
-    // }
-    // todo check
+
+    let property = property.unwrap();
+    if let Some(version_conds) = &property.version_conds {
+        let emmyrc = builder.semantic_model.get_emmyrc();
+        let version_number = emmyrc.runtime.version.to_lua_version_number();
+        let visiable = version_conds.iter().any(|cond| cond.check(&version_number));
+        if !visiable {
+            return None;
+        }
+    }
 
     Some(())
 }

crates/emmylua_ls/src/handlers/completion/add_completions/mod.rs

@@ -20,11 +20,11 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
     let name_expr = LuaNameExpr::cast(builder.trigger_token.parent()?)?;
     // optimize for large project
     let prefix = name_expr.get_name_text()?.to_lowercase();
-    let file_convension = builder
-        .semantic_model
-        .get_emmyrc()
+    let emmyrc = builder.semantic_model.get_emmyrc();
+    let file_convension = emmyrc
         .completion
         .auto_require_naming_convention;
+    let version_number = emmyrc.runtime.version.to_lua_version_number();
     let file_id = builder.semantic_model.get_file_id();
     let module_infos = builder
         .semantic_model
@@ -37,7 +37,7 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
 
     let mut completions = Vec::new();
     for module_info in module_infos {
-        if module_info.visible
+        if module_info.is_visible(&version_number)
             && module_info.file_id != file_id
             && module_info.export_type.is_some()
         {