Add line wrapping in annotation arguments, fix space after ... variadic

parameter

Close #330
Close #331

Author: NathanLovato

CHANGELOG.md

@@ -13,6 +13,7 @@ This file documents the changes made to the formatter with each release.
 - Removed space between lambda function name and parameter list
 - Force @export and @onready annotations to stay on the same line as a variable but keep other annotations separate
 - Stop trying to format any code containing parse errors. Until now we tried to still format definitions around the code with errors, but this can lead to cases where the formatter produces invalid code
+- Add line wrapping for annotation arguments (#330)
 
 ### Fixed
 
@@ -23,6 +24,7 @@ This file documents the changes made to the formatter with each release.
 - Fixed various edge cases with ignored directories: paths are now normalized before comparison
 - Fixed special get syntax with parentheses having an extra space (#314)
 - Output warnings to stderr when using reorder and safe mode together (#332)
+- Removed the space between `...` and variadic parameter names (#331)
 
 ## Release 0.24.0 (2026-07-25)
 

src/formatter.rs

@@ -360,6 +360,15 @@ fn process_node(
         }
         GDScriptNodeKind::Lambda => process_lambda(input, node, render_elements),
         GDScriptNodeKind::Function => process_function(input, node, render_elements),
+        GDScriptNodeKind::Variable
+        | GDScriptNodeKind::ExportVariable
+        | GDScriptNodeKind::OnReadyVariable
+            if has_inline_annotations_child(node) =>
+        {
+            let group_index = begin_group(render_elements);
+            process_children_with_spacing(input, node, render_elements);
+            finish_group(render_elements, group_index);
+        }
         GDScriptNodeKind::SetGet => process_setget(input, node, render_elements),
         GDScriptNodeKind::ParenthesizedExpression => {
             process_parenthesized_expression(input, node, render_elements)
@@ -371,6 +380,46 @@ fn process_node(
     }
 }
 
+fn has_inline_annotations_child(node: tree_sitter::Node) -> bool {
+    let mut child_index = 0;
+    while child_index < node.child_count() {
+        if let Some(child) = node.child(child_index as u32)
+            && GDScriptNodeKind::get_kind_from_ast_node(child) == GDScriptNodeKind::Annotations
+        {
+            let Some(next_child) = node.child((child_index + 1) as u32) else {
+                return false;
+            };
+            return child.end_position().row == next_child.start_position().row;
+        }
+        child_index += 1;
+    }
+    false
+}
+
+fn is_inline_variable_annotation_arguments(node: tree_sitter::Node) -> bool {
+    let Some(annotation) = node.parent() else {
+        return false;
+    };
+    if GDScriptNodeKind::get_kind_from_ast_node(annotation) != GDScriptNodeKind::Annotation {
+        return false;
+    }
+    let Some(annotations) = annotation.parent() else {
+        return false;
+    };
+    if GDScriptNodeKind::get_kind_from_ast_node(annotations) != GDScriptNodeKind::Annotations {
+        return false;
+    }
+    let Some(variable) = annotations.parent() else {
+        return false;
+    };
+    matches!(
+        GDScriptNodeKind::get_kind_from_ast_node(variable),
+        GDScriptNodeKind::Variable
+            | GDScriptNodeKind::ExportVariable
+            | GDScriptNodeKind::OnReadyVariable
+    ) && has_inline_annotations_child(variable)
+}
+
 /// Groups a function header (the declaration line/first line) separately from
 /// its body so the complete header, including the return type, is treated as
 /// one unit when deciding whether parameters need to be wrapped onto multiple
@@ -1588,9 +1637,7 @@ fn process_container(
         if let Some(open) = node.child(0) {
             process_node(input, open, render_elements);
         }
-        if node_kind == GDScriptNodeKind::Dictionary
-            || node_kind == GDScriptNodeKind::EnumeratorList
-        {
+        if node_kind == GDScriptNodeKind::Dictionary {
             render_elements.push(RenderElement::Space);
         }
         if let Some(close) = node.child(1) {
@@ -1603,7 +1650,10 @@ fn process_container(
         && node.parent().is_some_and(|parent| {
             GDScriptNodeKind::get_kind_from_ast_node(parent) == GDScriptNodeKind::Function
         });
-    let group_index = if is_function_parameters {
+    let group_index = if is_function_parameters
+        || (node_kind == GDScriptNodeKind::Arguments
+            && is_inline_variable_annotation_arguments(node))
+    {
         None
     } else {
         Some(begin_group(render_elements))
@@ -1620,8 +1670,7 @@ fn process_container(
     render_elements.push(RenderElement::SoftLine);
 
     // When we have delimiters like in a function calls, we apply just one
-    // indent. Before, we applied double indents by default, treating them as
-    // continuation lines.
+    // indent. We don't treat them as continuation lines.
     let indent_index = begin_indent(render_elements, 1);
 
     let mut has_comment = false;
@@ -3106,6 +3155,10 @@ fn process_separator_between_sibling_nodes(
         return;
     }
 
+    if previous_child.kind() == "..." {
+        return;
+    }
+
     if parent_kind == GDScriptNodeKind::UnaryOperator
         && (previous_child.kind() == "~"
             || previous_child.kind() == "!"

tests/expected/func_calls_variadic_parameters.gd

@@ -0,0 +1,11 @@
+func only_variadic(...args):
+	pass
+
+
+func call_with_many_arguments(
+	first_argument: String,
+	second_argument: String,
+	third_argument: String,
+	...args: Array,
+):
+	pass

tests/expected/variable_annotations.gd

@@ -4,6 +4,10 @@
 @onready var health := max_health
 @export_range(10.0, 200.0) var jump_height := 50.0
 @export_range(0.1, 1.5) var jump_time_to_peak := 0.37
+@export_custom(
+	PROPERTY_HINT_TYPE_STRING,
+	"%d/%d:Zero,One,Two" % [TYPE_INT, PROPERTY_HINT_ENUM],
+) var test_export_custom: Array
 
 @export_group("my group")
 @export var v = 1

tests/input/func_calls_variadic_parameters.gd

@@ -0,0 +1,11 @@
+func only_variadic(...args):
+	pass
+
+
+func call_with_many_arguments(
+	first_argument: String,
+	second_argument: String,
+	third_argument: String,
+	...args: Array
+):
+	pass

tests/input/variable_annotations.gd

@@ -6,6 +6,7 @@ var health:=max_health
 @export_range(10.0, 200.0) var jump_height:=50.0
 @export_range(0.1, 1.5)
 var jump_time_to_peak:=0.37
+@export_custom(PROPERTY_HINT_TYPE_STRING, "%d/%d:Zero,One,Two" % [TYPE_INT, PROPERTY_HINT_ENUM]) var test_export_custom: Array
 
 @export_group("my group")
 @export var v = 1