优化泛型诊断提示

Author: xuhuanzy

crates/emmylua_code_analysis/locales/lint.yml

@@ -241,10 +241,10 @@ Cannot use `...` outside a vararg function.:
   en: "Duplicate index `%{name}`."
   zh_CN: "重复定义的索引 `%{name}`."
   zh_HK: "重複定義的索引 `%{name}`."
-"the generic constraint must be a subclass of `%{source}`. %{reason}":
-  en: "the generic constraint must be a subclass of `%{source}`. %{reason}"
-  zh_CN: "泛型约束要求类型为 `%{source}` 子类。%{reason}"
-  zh_HK: "泛型約束要求類型為 `%{source}` 子類。%{reason}"
+"type `%{found}` does not satisfy the constraint `%{source}`. %{reason}":
+  en: "type `%{found}` does not satisfy the constraint `%{source}`. %{reason}"
+  zh_CN: "泛型约束要求为 `%{source}` 的子类, 但找到了 `%{found}`. %{reason}"
+  zh_HK: "泛型约束要求为 `%{source}` 的子类, 但找到了 `%{found}`. %{reason}"
 "the string template type does not match any type declaration":
   en: "the string template type does not match any type declaration"
   zh_CN: "字符串模板类型与任何类型声明不匹配"

crates/emmylua_code_analysis/src/diagnostic/checker/generic/generic_constraint_mismatch.rs

@@ -59,6 +59,7 @@ fn check_doc_tag_type(
                     semantic_model,
                     doc_type.get_range(),
                     &extend_type,
+                    &param_type,
                     result,
                 );
             }
@@ -223,6 +224,7 @@ fn check_str_tpl_ref(
                             semantic_model,
                             range,
                             &extend_type,
+                            &ref_type,
                             result,
                         );
                     }
@@ -252,7 +254,14 @@ fn check_tpl_ref(
     let arg_info = arg_info?;
     let result = semantic_model.type_check(&extend_type, &arg_info.0);
     if !result.is_ok() {
-        add_type_check_diagnostic(context, semantic_model, arg_info.1, &extend_type, result);
+        add_type_check_diagnostic(
+            context,
+            semantic_model,
+            arg_info.1,
+            &extend_type,
+            &arg_info.0,
+            result,
+        );
     }
     Some(())
 }
@@ -262,6 +271,7 @@ fn add_type_check_diagnostic(
     semantic_model: &SemanticModel,
     range: TextRange,
     extend_type: &LuaType,
+    expr_type: &LuaType,
     result: TypeCheckResult,
 ) {
     let db = semantic_model.get_db();
@@ -279,8 +289,9 @@ fn add_type_check_diagnostic(
                 DiagnosticCode::GenericConstraintMismatch,
                 range,
                 t!(
-                    "the generic constraint must be a subclass of `%{source}`. %{reason}",
+                    "type `%{found}` does not satisfy the constraint `%{source}`. %{reason}",
                     source = humanize_type(db, &extend_type, RenderLevel::Simple),
+                    found = humanize_type(db, &expr_type, RenderLevel::Simple),
                     reason = reason_message
                 )
                 .to_string(),