fix generic_index range

Author: xuhuanzy

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

@@ -37,7 +37,7 @@ pub fn analyze_class(analyzer: &mut DocAnalyzer, tag: LuaDocTagClass) -> Option<
             .get_type_index_mut()
             .add_generic_params(class_decl_id.clone(), generic_params.clone());
 
-        add_generic_index(analyzer, generic_params);
+        add_generic_index(analyzer, generic_params, &tag);
     }
 
     if let Some(supers) = tag.get_supers() {
@@ -200,10 +200,13 @@ fn get_generic_params(
     params_result
 }
 
-fn add_generic_index(analyzer: &mut DocAnalyzer, generic_params: Vec<GenericParam>) {
+fn add_generic_index(
+    analyzer: &mut DocAnalyzer,
+    generic_params: Vec<GenericParam>,
+    tag: &LuaDocTagClass,
+) {
     let mut ranges = Vec::new();
-    let range = analyzer.comment.get_range();
-    ranges.push(range);
+    ranges.push(tag.get_effective_range());
     if let Some(comment_owner) = analyzer.comment.get_owner() {
         let range = comment_owner.get_range();
         ranges.push(range);
@@ -222,8 +225,6 @@ fn add_generic_index(analyzer: &mut DocAnalyzer, generic_params: Vec<GenericPara
         }
     }
 
-    dbg!(&ranges);
-
     analyzer
         .generic_index
         .add_generic_scope(ranges, generic_params, false);

crates/emmylua_code_analysis/src/diagnostic/checker/param_type_check.rs

@@ -40,7 +40,6 @@ fn check_call_expr(
         .infer_expr_list_types(&arg_exprs, None)
         .into_iter()
         .unzip();
-    dbg!(&func);
 
     let colon_call = call_expr.is_colon_call();
     let colon_define = func.is_colon_define();

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

@@ -1141,7 +1141,7 @@ mod test {
         ws.def(
             r#"
                 ---@class ObserverParams<T>
-                ---@field next fun( value: T)
+                ---@field next fun(value: T)
                 ---@field errorResume? fun(error: any)
 
 

crates/emmylua_code_analysis/src/semantic/generic/instantiate_type/mod.rs

@@ -186,17 +186,6 @@ pub fn instantiate_doc_function(
             },
             _ => {
                 let new_type = instantiate_type_generic(db, origin_param_type, substitutor);
-                // 如果是 rest 参数且实例化后的类型是 tuple, 那么我们将展开 tuple
-                // if origin_param.0 == "..." && tpl_func_params.len() == i + 1 {
-                //     if let LuaType::Tuple(tuple_type) = &new_type {
-                //         let base_index = new_params.len();
-                //         for (offset, tuple_element) in tuple_type.get_types().iter().enumerate() {
-                //             let param_name = format!("var{}", base_index + offset);
-                //             new_params.push((param_name, Some(tuple_element.clone())));
-                //         }
-                //         continue;
-                //     }
-                // }
                 new_params.push((origin_param.0.clone(), Some(new_type)));
             }
         }
@@ -283,8 +272,6 @@ fn instantiate_generic(
     generic: &LuaGenericType,
     substitutor: &TypeSubstitutor,
 ) -> LuaType {
-    dbg!(generic);
-    dbg!(substitutor);
     let generic_params = generic.get_params();
     let mut new_params = Vec::new();
     for param in generic_params {

crates/emmylua_parser/src/syntax/node/doc/tag.rs

@@ -255,6 +255,30 @@ impl LuaDocTagClass {
     pub fn get_attrib(&self) -> Option<LuaDocAttribute> {
         self.child()
     }
+
+    pub fn get_effective_range(&self) -> rowan::TextRange {
+        let mut range = self.syntax().text_range();
+
+        let mut next = self.syntax().next_sibling();
+        while let Some(sibling) = next {
+            if let LuaKind::Syntax(kind) = sibling.kind() {
+                if matches!(
+                    kind,
+                    LuaSyntaxKind::DocTagClass
+                        | LuaSyntaxKind::DocTagAlias
+                        | LuaSyntaxKind::DocTagEnum
+                        | LuaSyntaxKind::DocTagType
+                ) {
+                    break;
+                }
+            }
+
+            range = range.cover(sibling.text_range());
+            next = sibling.next_sibling();
+        }
+
+        range
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]