fix: @type现在会绑定右侧的注释

Author: xuhuanzy

crates/emmylua_code_analysis/src/compilation/analyzer/doc/type_ref_tags.rs

@@ -25,6 +25,12 @@ use super::{
 };
 
 pub fn analyze_type(analyzer: &mut DocAnalyzer, tag: LuaDocTagType) -> Option<()> {
+    let description = if let Some(des) = tag.get_description() {
+        Some(preprocess_description(&des.get_description_text(), None))
+    } else {
+        None
+    };
+
     let mut type_list = Vec::new();
     for lua_doc_type in tag.get_type_list() {
         let type_ref = infer_type(analyzer, lua_doc_type);
@@ -50,6 +56,17 @@ pub fn analyze_type(analyzer: &mut DocAnalyzer, tag: LuaDocTagType) -> Option<()
                             .db
                             .get_type_index_mut()
                             .bind_type(decl_id.into(), LuaTypeCache::DocType(type_ref.clone()));
+
+                        // bind description
+                        if let Some(ref desc) = description {
+                            if !desc.is_empty() {
+                                analyzer.db.get_property_index_mut().add_description(
+                                    analyzer.file_id,
+                                    LuaSemanticDeclId::LuaDecl(decl_id),
+                                    desc.clone(),
+                                );
+                            }
+                        }
                     }
                     LuaVarExpr::IndexExpr(index_expr) => {
                         let member_id =
@@ -58,6 +75,17 @@ pub fn analyze_type(analyzer: &mut DocAnalyzer, tag: LuaDocTagType) -> Option<()
                             .db
                             .get_type_index_mut()
                             .bind_type(member_id.into(), LuaTypeCache::DocType(type_ref.clone()));
+
+                        // bind description
+                        if let Some(ref desc) = description {
+                            if !desc.is_empty() {
+                                analyzer.db.get_property_index_mut().add_description(
+                                    analyzer.file_id,
+                                    LuaSemanticDeclId::Member(member_id),
+                                    desc.clone(),
+                                );
+                            }
+                        }
                     }
                 }
             }
@@ -77,6 +105,17 @@ pub fn analyze_type(analyzer: &mut DocAnalyzer, tag: LuaDocTagType) -> Option<()
                     .db
                     .get_type_index_mut()
                     .bind_type(decl_id.into(), LuaTypeCache::DocType(type_ref.clone()));
+
+                // bind description
+                if let Some(ref desc) = description {
+                    if !desc.is_empty() {
+                        analyzer.db.get_property_index_mut().add_description(
+                            analyzer.file_id,
+                            LuaSemanticDeclId::LuaDecl(decl_id),
+                            desc.clone(),
+                        );
+                    }
+                }
             }
         }
         LuaAst::LuaTableField(table_field) => {
@@ -87,6 +126,17 @@ pub fn analyze_type(analyzer: &mut DocAnalyzer, tag: LuaDocTagType) -> Option<()
                     .db
                     .get_type_index_mut()
                     .bind_type(member_id.into(), LuaTypeCache::DocType(first_type.clone()));
+
+                // bind description
+                if let Some(ref desc) = description {
+                    if !desc.is_empty() {
+                        analyzer.db.get_property_index_mut().add_description(
+                            analyzer.file_id,
+                            LuaSemanticDeclId::Member(member_id),
+                            desc.clone(),
+                        );
+                    }
+                }
             }
         }
         _ => {}

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

@@ -227,4 +227,22 @@ mod tests {
             },
         ));
     }
+
+    #[test]
+    fn test_type_desc() {
+        let mut ws = ProviderVirtualWorkspace::new();
+        assert!(ws.check_hover(
+            r#"
+                local export = {
+                    ---@type number? activeSub
+                    vvv = nil
+                }
+
+                export.v<??>vv
+            "#,
+            VirtualHoverResult {
+                value: "```lua\n(field) vvv: number?\n```\n\n---\n\nactiveSub".to_string(),
+            },
+        ));
+    }
 }