fix format error for vararg param

Author: CppCXY

crates/emmylua_formatter/src/formatter/render/comments.rs

@@ -22,10 +22,10 @@ pub(crate) fn extract_trailing_comment_rendered(
         LuaSyntaxKind::LocalStat | LuaSyntaxKind::AssignStat
     ) && trailing_gap_requests_alignment(
         node,
-        comment.syntax().text_range(),
+        comment.get_range(),
         ctx.config.comments.line_comment_min_spaces_before.max(1),
     );
-    Some((docs, comment.syntax().text_range(), align_hint))
+    Some((docs, comment.get_range(), align_hint))
 }
 
 pub(crate) fn append_trailing_comment_suffix(

crates/emmylua_formatter/src/formatter/render/comments_ast.rs

@@ -3,8 +3,8 @@ use crate::formatter::model::{FormatPlan, TokenSpacingExpected};
 use crate::ir;
 use crate::ir::DocIR;
 use emmylua_parser::{
-    LuaAstNode, LuaAstToken, LuaComment, LuaDocDescriptionOwner, LuaDocTag, LuaSyntaxId,
-    LuaSyntaxToken, LuaTokenKind,
+    LuaAstNode, LuaAstToken, LuaComment, LuaDocDescription, LuaDocDescriptionOwner, LuaDocFieldKey,
+    LuaDocTag, LuaSyntaxId, LuaSyntaxToken, LuaTokenKind,
 };
 use std::collections::HashMap;
 
@@ -477,10 +477,14 @@ fn extract_columns(
     let desc = tag_description(tag);
     match tag {
         LuaDocTag::Param(t) => {
-            let name = t
-                .get_name_token()
-                .map(|n| n.get_name_text().to_string())
-                .unwrap_or_default();
+            let name = if t.is_vararg() {
+                "...".to_string()
+            } else if let Some(name_token) = t.get_name_token() {
+                name_token.get_name_text().to_string()
+            } else {
+                "".to_string()
+            };
+
             let nullable = if t.is_nullable() { "?" } else { "" };
             let ty = t
                 .get_type()
@@ -544,12 +548,12 @@ fn extract_columns(
             let key = f
                 .get_field_key()
                 .map(|k| match k {
-                    emmylua_parser::LuaDocFieldKey::Name(n) => n.get_name_text().to_string(),
-                    emmylua_parser::LuaDocFieldKey::String(s) => format!("[\"{}\"]", s.get_value()),
-                    emmylua_parser::LuaDocFieldKey::Integer(i) => {
+                    LuaDocFieldKey::Name(n) => n.get_name_text().to_string(),
+                    LuaDocFieldKey::String(s) => format!("[\"{}\"]", s.get_value()),
+                    LuaDocFieldKey::Integer(i) => {
                         format!("[{}]", i.syntax().text())
                     }
-                    emmylua_parser::LuaDocFieldKey::Type(ty) => {
+                    LuaDocFieldKey::Type(ty) => {
                         format!("[{}]", format_node_tokens(plan, ty.syntax()))
                     }
                 })
@@ -649,7 +653,7 @@ fn extract_columns(
 }
 
 fn tag_description(tag: &LuaDocTag) -> String {
-    let d: Option<emmylua_parser::LuaDocDescription> = match tag {
+    let d: Option<LuaDocDescription> = match tag {
         LuaDocTag::Class(t) => t.get_description(),
         LuaDocTag::Param(t) => t.get_description(),
         LuaDocTag::Return(t) => t.get_description(),
@@ -674,7 +678,7 @@ fn comment_desc_for_tag(c: &LuaComment, tag: &LuaDocTag) -> String {
                     found_tag = true;
                     continue;
                 }
-                if found_tag && let Some(desc) = emmylua_parser::LuaDocDescription::cast(n) {
+                if found_tag && let Some(desc) = LuaDocDescription::cast(n) {
                     return desc.syntax().text().to_string().trim().to_string();
                 }
             }

crates/emmylua_formatter/src/test/comment_tests.rs

@@ -2370,6 +2370,22 @@ local a = 1
             r#"---@cast assert [function]
 "#,
             r#"---@cast assert [function]
+"#
+        );
+    }
+
+    #[test]
+    fn test_param_vararg() {
+        assert_format!(
+            r#"
+---@param a string
+---@param ... any
+function foo(a, ...) end
+"#,
+            r#"
+---@param a   string
+---@param ... any
+function foo(a, ...) end
 "#
         );
     }