Fix icon annotation being reordered below class_name when extends was

before class_name

Close #295

Author: NathanLovato

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 This file documents the changes made to the formatter with each release.
 
-## Unrelease - 0.23.0
+## Unreleased - 0.23.0
 
 ### Added
 

src/reorder.rs

@@ -145,10 +145,10 @@ pub fn build_reorder_plan<'a>(parent: Node<'a>, content: &'a str) -> ReorderPlan
         if kind == GDScriptNodeKind::Comment || kind == GDScriptNodeKind::RegionStart {
             is_child_attached_to_declaration[child_index] = true;
         } else if kind == GDScriptNodeKind::Annotation {
-            // Make sure to keep tool at the top of the script, above class_name
-            // and extends. Otherwise it's a syntax error.
+            // Make sure to keep tool and icon at the top of the script, above
+            // class_name and extends. Otherwise it's a syntax error.
             let annotation_name = get_node_text(child, content);
-            if annotation_name.starts_with("@tool") {
+            if annotation_name.starts_with("@tool") || annotation_name.starts_with("@icon") {
                 items.push(ReorderItem {
                     child_index,
                     sub_child: None,

…/reorder_tool_annotation_before_class.gd …ool_and_icon_annotations_before_class.gdtests/reorder_code/expected/reorder_tool_annotation_before_class.gd renamed to tests/reorder_code/expected/reorder_tool_and_icon_annotations_before_class.gd tests/reorder_code/expected/reorder_tool_annotation_before_class.gd renamed to tests/reorder_code/expected/reorder_tool_and_icon_annotations_before_class.gd

@@ -1,4 +1,5 @@
 @tool
+@icon('res://addons/at-icons/node2d/comet.svg')
 class_name Test
 extends RefCounted
 

…/reorder_tool_annotation_before_class.gd …ool_and_icon_annotations_before_class.gdtests/reorder_code/input/reorder_tool_annotation_before_class.gd renamed to tests/reorder_code/input/reorder_tool_and_icon_annotations_before_class.gd tests/reorder_code/input/reorder_tool_annotation_before_class.gd renamed to tests/reorder_code/input/reorder_tool_and_icon_annotations_before_class.gd

@@ -1,4 +1,5 @@
 @tool
+@icon('res://addons/at-icons/node2d/comet.svg')
 extends RefCounted
 class_name Test