fix hover visible

Author: xuhuanzy

crates/emmylua_ls/src/handlers/completion/completion_data.rs

@@ -7,6 +7,7 @@ use super::completion_builder::CompletionBuilder;
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct CompletionData {
     pub field_id: FileId,
+    pub trigger_offset: Option<u32>,
     pub typ: CompletionDataType,
     /// Total count of function overloads
     pub overload_count: Option<usize>,
@@ -21,6 +22,7 @@ impl CompletionData {
     ) -> Option<Value> {
         let data = Self {
             field_id: builder.semantic_model.get_file_id(),
+            trigger_offset: Some(builder.position_offset.into()),
             typ: CompletionDataType::PropertyOwnerId(id),
             overload_count,
         };
@@ -35,6 +37,7 @@ impl CompletionData {
     ) -> Option<Value> {
         let data = Self {
             field_id: builder.semantic_model.get_file_id(),
+            trigger_offset: Some(builder.position_offset.into()),
             typ: CompletionDataType::Overload((id, index)),
             overload_count,
         };
@@ -44,6 +47,7 @@ impl CompletionData {
     pub fn from_module(builder: &CompletionBuilder, module: String) -> Option<Value> {
         let data = Self {
             field_id: builder.semantic_model.get_file_id(),
+            trigger_offset: Some(builder.position_offset.into()),
             typ: CompletionDataType::Module(module),
             overload_count: None,
         };

crates/emmylua_ls/src/handlers/completion/providers/member_provider.rs

@@ -2,7 +2,7 @@ use emmylua_code_analysis::{
     DbIndex, LuaMemberInfo, LuaMemberKey, LuaSemanticDeclId, LuaType, LuaTypeDeclId, SemanticModel,
     enum_variable_is_param, get_tpl_ref_extend_type,
 };
-use emmylua_parser::{LuaAstNode, LuaAstToken, LuaIndexExpr, LuaStringToken};
+use emmylua_parser::{LuaAstNode, LuaAstToken, LuaIndexExpr, LuaStringToken, LuaSyntaxToken};
 use std::collections::HashMap;
 
 use crate::handlers::completion::{
@@ -134,8 +134,11 @@ fn add_resolve_member_infos(
         return Some(());
     }
 
-    let (filtered_member_infos, overload_count) =
-        filter_member_infos(&builder.semantic_model, member_infos)?;
+    let (filtered_member_infos, overload_count) = filter_member_infos(
+        &builder.semantic_model,
+        &builder.trigger_token,
+        member_infos,
+    )?;
 
     let resolve_state = get_resolve_state(builder.semantic_model.get_db(), &filtered_member_infos);
 
@@ -182,20 +185,33 @@ fn add_resolve_member_infos(
 /// 过滤成员信息，返回需要的成员列表和重载数量
 fn filter_member_infos<'a>(
     semantic_model: &SemanticModel,
+    trigger_token: &LuaSyntaxToken,
     member_infos: &'a Vec<LuaMemberInfo>,
 ) -> Option<(Vec<&'a LuaMemberInfo>, Option<usize>)> {
     if member_infos.is_empty() {
         return None;
     }
 
+    let visible_member_infos: Vec<&LuaMemberInfo> = member_infos
+        .iter()
+        .filter(|member_info| {
+            member_info.property_owner_id.as_ref().is_none_or(|id| {
+                semantic_model.is_semantic_visible(trigger_token.clone(), id.clone())
+            })
+        })
+        .collect();
+    if visible_member_infos.is_empty() {
+        return None;
+    }
+
     let mut file_decl_member: Option<&LuaMemberInfo> = None;
     let mut member_with_owners: Vec<(&LuaMemberInfo, Option<LuaTypeDeclId>)> =
-        Vec::with_capacity(member_infos.len());
+        Vec::with_capacity(visible_member_infos.len());
     let mut all_doc_function = true;
     let mut overload_count = 0;
 
     // 一次遍历收集所有信息
-    for member_info in member_infos {
+    for member_info in visible_member_infos {
         let owner_id = get_owner_type_id(semantic_model.get_db(), member_info);
         member_with_owners.push((member_info, owner_id.clone()));
 

crates/emmylua_ls/src/handlers/completion/resolve_completion.rs

@@ -1,5 +1,7 @@
 use emmylua_code_analysis::{DbIndex, LuaCompilation, SemanticModel};
+use emmylua_parser::{LuaAstNode, LuaSyntaxToken};
 use lsp_types::{CompletionItem, Documentation, MarkedString, MarkupContent};
+use rowan::{TextSize, TokenAtOffset};
 
 use crate::{
     context::ClientId,
@@ -16,11 +18,19 @@ pub fn resolve_completion(
     completion_data: CompletionData,
     client_id: ClientId,
 ) -> Option<()> {
+    let trigger_token =
+        get_completion_trigger_token(semantic_model, completion_data.trigger_offset);
+
     // todo: resolve completion
     match completion_data.typ {
         CompletionDataType::PropertyOwnerId(property_id) => {
-            let hover_builder =
-                build_hover_content_for_completion(compilation, semantic_model, db, property_id);
+            let hover_builder = build_hover_content_for_completion(
+                compilation,
+                semantic_model,
+                db,
+                property_id,
+                trigger_token.clone(),
+            );
             if let Some(mut hover_builder) = hover_builder {
                 update_function_signature_info(&mut hover_builder, completion_data.overload_count);
                 if client_id.is_vscode() {
@@ -31,8 +41,13 @@ pub fn resolve_completion(
             }
         }
         CompletionDataType::Overload((property_id, index)) => {
-            let hover_builder =
-                build_hover_content_for_completion(compilation, semantic_model, db, property_id);
+            let hover_builder = build_hover_content_for_completion(
+                compilation,
+                semantic_model,
+                db,
+                property_id,
+                trigger_token.clone(),
+            );
             if let Some(mut hover_builder) = hover_builder {
                 update_function_signature_info(&mut hover_builder, completion_data.overload_count);
                 if client_id.is_vscode() {
@@ -47,6 +62,23 @@ pub fn resolve_completion(
     Some(())
 }
 
+fn get_completion_trigger_token(
+    semantic_model: &SemanticModel,
+    trigger_offset: Option<u32>,
+) -> Option<LuaSyntaxToken> {
+    let offset = TextSize::from(trigger_offset?);
+    let root = semantic_model.get_root();
+    if offset > root.syntax().text_range().end() {
+        return None;
+    }
+
+    match root.syntax().token_at_offset(offset) {
+        TokenAtOffset::Single(token) => Some(token),
+        TokenAtOffset::Between(left, _) => Some(left),
+        TokenAtOffset::None => None,
+    }
+}
+
 pub fn update_function_signature_info(
     hover_builder: &mut HoverBuilder,
     overload_count: Option<usize>,

crates/emmylua_ls/src/handlers/hover/build_hover.rs

@@ -80,6 +80,7 @@ pub fn build_hover_content_for_completion<'a>(
     semantic_model: &'a SemanticModel,
     db: &DbIndex,
     property_id: LuaSemanticDeclId,
+    token: Option<LuaSyntaxToken>,
 ) -> Option<HoverBuilder<'a>> {
     let typ = match property_id {
         LuaSemanticDeclId::LuaDecl(decl_id) => {
@@ -97,7 +98,7 @@ pub fn build_hover_content_for_completion<'a>(
         typ,
         property_id,
         true,
-        None,
+        token,
     )
 }
 
@@ -230,6 +231,13 @@ fn build_member_hover(
     let mut semantic_decls =
         find_member_origin_owners(builder.compilation, builder.semantic_model, member_id, true)
             .get_types(builder.semantic_model);
+    if let Some(token) = builder.get_trigger_token() {
+        semantic_decls.retain(|(semantic_decl, _)| {
+            builder
+                .semantic_model
+                .is_semantic_visible(token.clone(), semantic_decl.clone())
+        });
+    }
 
     let member_name = match member.get_key() {
         LuaMemberKey::Name(name) => name.to_string(),

crates/emmylua_ls/src/handlers/test/completion_resolve_test.rs

@@ -123,4 +123,38 @@ mod tests {
         ));
         Ok(())
     }
+
+    #[gtest]
+    fn test_version_visibility() -> Result<()> {
+        let mut ws = ProviderVirtualWorkspace::new();
+        ws.def(
+            r#"
+                ---@meta
+                CO = {}
+
+                --- @version 5.1, JIT
+                ---
+                --- 5.1/jit
+                --- @return thread?
+                --- @nodiscard
+                function CO.running() end
+
+                --- @version > 5.2
+                --- 5.2+
+                --- @return thread, boolean
+                --- @nodiscard
+                function CO.running() end
+                "#,
+        );
+        check!(ws.check_completion_resolve(
+            r#"
+            CO.running<??>
+            "#,
+            VirtualCompletionResolveItem {
+                detail: "function CO.running() -> thread, boolean".to_string(),
+                documentation: Some("\n5.2+".to_string()),
+            },
+        ));
+        Ok(())
+    }
 }