Fix export annotation detection to avoid false positives

Fix #308

Author: NathanLovato

CHANGELOG.md

@@ -11,6 +11,7 @@ This file documents the changes made to the formatter with each release.
 ### Fixed
 
 - Fixed an extra comma being inserted after a trailing comment in a lambda function argument (#304)
+- fixed certain export annotations being moved out of their respective groups (#308)
 
 ## Release 0.24.0 (2026-07-25)
 

src/reorder.rs

@@ -76,26 +76,6 @@ pub enum MethodType {
     Custom,             // all other user methods
 }
 
-/// Checks whether a single `annotation` node's `identifier` child has text
-/// equal to `expected_name`.
-fn annotation_identifier_matches(
-    annotation_node: Node,
-    content: &str,
-    expected_name: &str,
-) -> bool {
-    let count = annotation_node.child_count();
-    let mut child_index = 0;
-    while child_index < count {
-        if let Some(child) = annotation_node.child(child_index as u32) {
-            if GDScriptNodeKind::get_kind_from_ast_node(child) == GDScriptNodeKind::Identifier {
-                return get_node_text(child, content) == expected_name;
-            }
-        }
-        child_index += 1;
-    }
-    false
-}
-
 /// Slice the source string at a node's byte range.
 /// Tree-sitter byte offsets are always on UTF-8 char boundaries.
 fn get_node_text<'a>(node: Node<'a>, content: &'a str) -> &'a str {
@@ -496,11 +476,55 @@ fn classify_child<'a>(node: Node<'a>, content: &'a str) -> ChildClassification<'
 }
 
 fn classify_variable<'a>(node: Node<'a>, content: &'a str) -> ChildClassification<'a> {
+    fn get_annotation_identifier<'a>(annotation: Node<'a>, content: &'a str) -> Option<&'a str> {
+        let child_count = annotation.child_count();
+        let mut child_index = 0;
+        while child_index < child_count {
+            if let Some(child) = annotation.child(child_index as u32) {
+                if GDScriptNodeKind::get_kind_from_ast_node(child) == GDScriptNodeKind::Identifier {
+                    return Some(get_node_text(child, content));
+                }
+            }
+            child_index += 1;
+        }
+        None
+    }
+
     let name = extract_name(node, content).unwrap_or("unknown_var");
 
-    if has_annotation_with_name(node, content, "export") {
+    let mut has_export_annotation = false;
+    let mut has_onready_annotation = false;
+    for child_index in 0..node.child_count() {
+        let Some(child) = node.child(child_index as u32) else {
+            continue;
+        };
+        if GDScriptNodeKind::get_kind_from_ast_node(child) != GDScriptNodeKind::Annotations {
+            continue;
+        }
+
+        for annotation_index in 0..child.child_count() {
+            let Some(annotation) = child.child(annotation_index as u32) else {
+                continue;
+            };
+            if GDScriptNodeKind::get_kind_from_ast_node(annotation) != GDScriptNodeKind::Annotation
+            {
+                continue;
+            }
+
+            let Some(annotation_name) = get_annotation_identifier(annotation, content) else {
+                continue;
+            };
+            if annotation_name.starts_with("export") {
+                has_export_annotation = true;
+            } else if annotation_name == "onready" {
+                has_onready_annotation = true;
+            }
+        }
+    }
+
+    if has_export_annotation {
         ChildClassification::new(DeclarationKind::ExportVariable, name)
-    } else if has_annotation_with_name(node, content, "onready") {
+    } else if has_onready_annotation {
         ChildClassification::new(DeclarationKind::OnReadyVariable, name)
     } else if has_static_keyword_child(node) {
         ChildClassification::new(DeclarationKind::StaticVariable, name)
@@ -554,44 +578,6 @@ fn has_static_keyword_child(node: Node) -> bool {
     false
 }
 
-/// Returns true if `node` has an `annotations` child containing an
-/// `annotation` whose identifier matches `annotation_name`.
-///
-/// This replaces fragile source-text checks like `text.contains("@export")`
-/// which can falsely match comments or strings containing those substrings.
-fn has_annotation_with_name(node: Node, content: &str, annotation_name: &str) -> bool {
-    let count = node.child_count();
-    let mut child_index = 0;
-    while child_index < count {
-        if let Some(child) = node.child(child_index as u32) {
-            if GDScriptNodeKind::get_kind_from_ast_node(child) == GDScriptNodeKind::Annotations
-                && annotations_contain_name(child, content, annotation_name)
-            {
-                return true;
-            }
-        }
-        child_index += 1;
-    }
-    false
-}
-
-/// Walks the children of an `annotations` container node and checks whether
-/// any `annotation` child has an `identifier` whose text matches `name`.
-fn annotations_contain_name(annotations_node: Node, content: &str, name: &str) -> bool {
-    let count = annotations_node.child_count();
-    let mut child_index = 0;
-    while child_index < count {
-        if let Some(child) = annotations_node.child(child_index as u32) {
-            if GDScriptNodeKind::get_kind_from_ast_node(child) == GDScriptNodeKind::Annotation
-                && annotation_identifier_matches(child, content, name)
-            {
-                return true;
-            }
-        }
-        child_index += 1;
-    }
-    false
-}
 /// Maps built-in virtual method names to Godot lifecycle priority.
 fn get_builtin_virtual_priority(method_name: &str) -> u8 {
     match method_name {

tests/reorder_code/expected/reorder_export_annotation_variants.gd

@@ -0,0 +1,16 @@
+class_name StatsData
+extends Resource
+
+@export_category("Survival")
+@export_range(1, 999) var max_health: int
+
+@export_category("Movement")
+@export var can_move: bool
+@export var movement_acceleration: float
+@export_range(0.01, 10.0) var movement_speed: float
+
+@export_category("Perception")
+@export_group("Vision", "vision")
+@export var can_see: bool
+@export_subgroup("Details")
+@export_flags_2d_physics var vision_collision_layer: int

tests/reorder_code/input/reorder_export_annotation_variants.gd

@@ -0,0 +1,16 @@
+class_name StatsData
+extends Resource
+
+@export_category("Survival")
+@export_range(1, 999) var max_health: int
+
+@export_category("Movement")
+@export var can_move: bool
+@export var movement_acceleration: float
+@export_range(0.01, 10.0) var movement_speed: float
+
+@export_category("Perception")
+@export_group("Vision", "vision")
+@export var can_see: bool
+@export_subgroup("Details")
+@export_flags_2d_physics var vision_collision_layer: int