From e610215727126f5af84cdde99224aa402ef477fc Mon Sep 17 00:00:00 2001 From: Nesterov Nikita Date: Fri, 19 Sep 2025 15:34:39 +0300 Subject: [PATCH 1/2] add new line before enums closing brace --- queries/gdscript.scm | 5 +++-- tests/expected/enums.gd | 5 +++++ tests/input/enums.gd | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/queries/gdscript.scm b/queries/gdscript.scm index 49ec6f0..222f123 100644 --- a/queries/gdscript.scm +++ b/queries/gdscript.scm @@ -86,8 +86,9 @@ ; ENUMS (enumerator_list - "{" @append_input_softline @append_indent_start - "}" @prepend_input_softline @prepend_indent_end) + "{" @append_empty_softline @append_indent_start + "}" @prepend_empty_softline @prepend_indent_end) +(enumerator_list "{" @append_space "}" @prepend_space (#single_line_only!)) (enumerator_list "," @append_spaced_softline . (comment)? @do_nothing) (enumerator_list ((enumerator) @append_delimiter (#delimiter! ",") . ","? @do_nothing . (comment)? . "}") (#multi_line_only!)) (enumerator_list) @prepend_space diff --git a/tests/expected/enums.gd b/tests/expected/enums.gd index 4abaf1e..34b8187 100644 --- a/tests/expected/enums.gd +++ b/tests/expected/enums.gd @@ -16,3 +16,8 @@ enum ThirdEnum { func foo(): pass + +enum Test { + A, + B, +} diff --git a/tests/input/enums.gd b/tests/input/enums.gd index 66a84aa..b08e895 100644 --- a/tests/input/enums.gd +++ b/tests/input/enums.gd @@ -16,3 +16,7 @@ Ffffff, } func foo(): pass + + +enum Test { + A, B } From ff7958aa06ac29ccb74a9f4b80fe403a829b099b Mon Sep 17 00:00:00 2001 From: Nesterov Nikita Date: Fri, 19 Sep 2025 15:35:23 +0300 Subject: [PATCH 2/2] remove unnecessary topiary capture in dictionary rule --- queries/gdscript.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/queries/gdscript.scm b/queries/gdscript.scm index 222f123..76effc4 100644 --- a/queries/gdscript.scm +++ b/queries/gdscript.scm @@ -33,7 +33,7 @@ (dictionary "{" @append_empty_softline @append_indent_start - "}" @prepend_empty_softline @append_empty_softline @prepend_indent_end) + "}" @prepend_empty_softline @prepend_indent_end) (dictionary "," @append_spaced_softline . (comment)? @do_nothing) (dictionary "{" @append_space "}" @prepend_space (#single_line_only!)) (pair ":" @append_space)