display documentation for intersection type completion

Author: xuhuanzy

crates/emmylua_code_analysis/src/semantic/member/find_members.rs

@@ -407,7 +407,7 @@ fn find_intersection_members(
             member_set.insert(key.clone());
 
             result.push(LuaMemberInfo {
-                property_owner_id: None,
+                property_owner_id: member.property_owner_id.clone(),
                 key: key.clone(),
                 typ: typ.clone(),
                 feature: None,

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

@@ -27,6 +27,7 @@ mod tests {
                 detail:
                     "local function test(event: string, callback: fun(trg: string, data: number)) -> number (+2 overloads)"
                         .to_string(),
+                documentation: None,
             },
         ));
         Ok(())
@@ -46,6 +47,7 @@ mod tests {
             "#,
             VirtualCompletionResolveItem {
                 detail: "(field) Test2.event(event: \"游戏-初始化\") (+1 overloads)".to_string(),
+                documentation: None,
             },
         ));
         Ok(())
@@ -66,6 +68,7 @@ mod tests {
             "#,
             VirtualCompletionResolveItem {
                 detail: "(field) T.func(self: string)".to_string(),
+                documentation: Some("\n注释注释".to_string()),
             },
         ));
         Ok(())
@@ -86,6 +89,36 @@ mod tests {
             "#,
             VirtualCompletionResolveItem {
                 detail: "(method) T:func()".to_string(),
+                documentation: Some("\n注释注释".to_string()),
+            },
+        ));
+        Ok(())
+    }
+
+    #[gtest]
+    fn test_intersection() -> Result<()> {
+        let mut ws = ProviderVirtualWorkspace::new();
+        ws.def(
+            r#"
+            ---@class Matchers
+            ---@field toBe fun(self: Assertion, expected: any) -- 测试
+
+            ---@class Inverse<T>
+            ---@field not_ T
+
+            ---@class Assertion<T>: Matchers<T>
+        "#,
+        );
+        check!(ws.check_completion_resolve(
+            r#"
+
+            ---@type Assertion<any>
+            local expect
+            expect:<??>
+            "#,
+            VirtualCompletionResolveItem {
+                detail: "(method) Matchers:toBe(expected: any)".to_string(),
+                documentation: Some("\n测试".to_string()),
             },
         ));
         Ok(())

crates/emmylua_ls/src/handlers/test_lib/mod.rs

@@ -3,9 +3,10 @@ use googletest::prelude::*;
 use itertools::Itertools;
 use lsp_types::{
     CodeActionOrCommand, CompletionItem, CompletionItemKind, CompletionResponse,
-    CompletionTriggerKind, GotoDefinitionResponse, Hover, HoverContents, InlayHintLabel, Location,
-    MarkupContent, Position, SemanticTokenModifier, SemanticTokenType, SemanticTokensResult,
-    SignatureHelpContext, SignatureHelpTriggerKind, SignatureInformation, TextEdit,
+    CompletionTriggerKind, Documentation, GotoDefinitionResponse, Hover, HoverContents,
+    InlayHintLabel, Location, MarkupContent, Position, SemanticTokenModifier, SemanticTokenType,
+    SemanticTokensResult, SignatureHelpContext, SignatureHelpTriggerKind, SignatureInformation,
+    TextEdit,
 };
 use std::collections::HashSet;
 use std::{ops::Deref, sync::Arc};
@@ -72,6 +73,7 @@ impl Default for VirtualCompletionItem {
 #[derive(Debug)]
 pub struct VirtualCompletionResolveItem {
     pub detail: String,
+    pub documentation: Option<String>,
 }
 
 #[derive(Debug)]
@@ -279,7 +281,18 @@ impl ProviderVirtualWorkspace {
             .or_fail()?;
         let item = completion_resolve(&self.analysis, param.clone(), ClientId::VSCode);
         let item_detail = item.detail.ok_or("item detail is empty").or_fail()?;
-        verify_eq!(item_detail, expected.detail)
+        verify_eq!(item_detail, expected.detail)?;
+        match (item.documentation.as_ref(), expected.documentation.as_ref()) {
+            (None, None) => Ok(()),
+            (Some(doc), Some(expected_doc)) => match doc {
+                Documentation::String(s) => verify_eq!(s, expected_doc),
+                Documentation::MarkupContent(MarkupContent { value, .. }) => {
+                    verify_eq!(value, expected_doc)
+                }
+            },
+            (Some(_), None) => fail!("unexpected documentation in completion resolve result"),
+            (None, Some(_)) => fail!("expected documentation missing in completion resolve result"),
+        }
     }
 
     pub fn check_implementation(