Function annotations: preserve input formatting and allow inline annotations with function definitions

NathanLovato · NathanLovato · commit 57c4d29077f8 · 2025-10-05T18:06:54.000+02:00
Close #118
diff --git a/queries/gdscript.scm b/queries/gdscript.scm
@@ -169,7 +169,7 @@
  . (comment)? @do_nothing)
 
 (comment) @append_empty_softline @prepend_input_softline
-(region_start) @append_empty_softline @prepend_input_softline  
+(region_start) @append_empty_softline @prepend_input_softline
 (region_end) @append_empty_softline @prepend_input_softline
 
 ; Allow one blank line before following statements
@@ -238,7 +238,6 @@
 (annotation) @append_space
 ((annotation (identifier) @append_space) @append_empty_softline . (comment)? @do_nothing (#not-match? @append_space "^(onready|export)$"))
 (annotation (arguments "(" @prepend_antispace))
-(function_definition (annotations (annotation) @append_hardline))
 
 ; This is used to preserve new lines after semicolons for people who use them on
 ; all code lines
diff --git a/tests/expected/function_annotations.gd b/tests/expected/function_annotations.gd
@@ -1,5 +1,4 @@
-@rpc
-func foo():
+@abstract func foo():
 	pass
 
 
diff --git a/tests/input/function_annotations.gd b/tests/input/function_annotations.gd
@@ -1,4 +1,4 @@
-@rpc func foo():
+@abstract func foo():
 	pass
 
 

-Original file line number
+Diff line change
@@ @@ -1,5 +1,4 @@ @@
 -@rpc
 -func foo():
 +@abstract func foo():
 	pass