Merge branch 'update' into merge

Author: xuhuanzy

crates/emmylua_code_analysis/src/diagnostic/test/return_type_mismatch_test.rs

@@ -470,4 +470,30 @@ mod tests {
             "#
         ));
     }
+
+    #[test]
+    fn test_generic_type_1() {
+        let mut ws = VirtualWorkspace::new();
+        ws.def(
+            r#"
+            ---@class Range: Observable<integer>
+            ---@class Observable<T>
+
+            ---@return Range
+            function newRange()
+            end
+            "#,
+        );
+        assert!(ws.check_code_for(
+            DiagnosticCode::ReturnTypeMismatch,
+            r#"
+
+            ---@return Observable<integer>
+            function range()
+                return newRange()
+            end
+
+            "#
+        ));
+    }
 }

crates/emmylua_code_analysis/src/semantic/type_check/generic_type.rs

@@ -6,8 +6,8 @@ use crate::{
 };
 
 use super::{
-    check_general_type_compact, type_check_fail_reason::TypeCheckFailReason,
-    type_check_guard::TypeCheckGuard, TypeCheckResult,
+    check_general_type_compact, check_ref_type_compact,
+    type_check_fail_reason::TypeCheckFailReason, type_check_guard::TypeCheckGuard, TypeCheckResult,
 };
 
 pub fn check_generic_type_compact(
@@ -53,6 +53,12 @@ pub fn check_generic_type_compact(
             LuaMemberOwner::Element(range.clone()),
             check_guard.next_level()?,
         ),
+        LuaType::Ref(_) | LuaType::Def(_) => check_ref_type_compact(
+            db,
+            &source_generic.get_base_type_id(),
+            compact_type,
+            check_guard.next_level()?,
+        ),
         _ => Err(TypeCheckFailReason::TypeNotMatch),
     }
 }

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

@@ -259,14 +259,13 @@ fn hover_doc_function_type(
     } else {
         func_name.to_string()
     };
-
     let params = lua_func
         .get_params()
         .iter()
         .enumerate()
         .map(|(index, param)| {
             let name = param.0.clone();
-            if index == 0 && is_method {
+            if index == 0 && is_method && !lua_func.is_colon_define() {
                 "".to_string()
             } else if let Some(ty) = &param.1 {
                 format!("{}: {}", name, humanize_type(db, ty, RenderLevel::Normal))

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

@@ -395,4 +395,35 @@ mod tests {
             },
         ));
     }
+
+    #[test]
+    fn test_generic_function() {
+        let mut ws = ProviderVirtualWorkspace::new();
+        ws.def_file(
+            "test.lua",
+            r#"
+                    ---@class Observable<T>
+                    local Observable
+
+                    ---@generic R
+                    ---@param selector fun(value: T, index?: integer): R
+                    function Observable:select(selector)
+                    end
+
+                    ---@type Observable<integer>
+                    source = {}
+
+            "#,
+        );
+        assert!(ws.check_hover(
+            r#"
+                    source:sel<??>ect(function(value)
+                        return value
+                    end)
+            "#,
+            VirtualHoverResult {
+                value: "```lua\n(method) Observable:select(selector: fun(value: integer, index: integer?) -> R)\n```".to_string(),
+            },
+        ));
+    }
 }