add trailing commas in arrays, dictionaries and enums

Author: shadr

queries/gdscript.scm

@@ -29,12 +29,14 @@
   "[" @append_empty_softline @append_indent_start
   "]" @prepend_empty_softline @append_empty_softline @prepend_indent_end)
 (array "," @append_spaced_softline . (comment)? @do_nothing)
+(array ((_expression) @append_delimiter (#delimiter! ",") . ","? @do_nothing . (comment)? . "]") (#multi_line_only!))
 
 (dictionary
   "{" @append_empty_softline @append_indent_start
   "}" @prepend_empty_softline @append_empty_softline @prepend_indent_end)
 (dictionary "," @append_spaced_softline . (comment)? @do_nothing)
 (pair ":" @append_space)
+(dictionary ((pair (_expression)) @append_delimiter (#delimiter! ",") . ","? @do_nothing . (comment)? . "}") (#multi_line_only!))
 
 ; FUNCTIONS
 (function_definition (name) @append_antispace)
@@ -83,6 +85,7 @@
   "{" @append_input_softline @append_indent_start
   "}" @prepend_input_softline @prepend_indent_end)
 (enumerator_list "," @append_spaced_softline . (comment)? @do_nothing)
+(enumerator_list ((enumerator) @append_delimiter (#delimiter! ",") . ","? @do_nothing . (comment)? . "}") (#multi_line_only!))
 (enumerator_list) @prepend_space
 
 ; CONSTRUCTORS

tests/expected/array_long_strings.gd

@@ -3,5 +3,5 @@ var dialogue_items: Array[String] = [
 	"...and it is a little bit complicated.",
 	"Let's see if I got it right: an array is a list of values!",
 	"Did I get it right? Did I?",
-	"Hehe! Bye bye~!"
+	"Hehe! Bye bye~!",
 ]

tests/expected/comments_inline.gd

@@ -8,7 +8,7 @@ var prop = 10: # var comment
 enum Foo {
 	A, # Comment
 	B, # Comment
-	C
+	C,
 }
 
 

tests/expected/enums.gd

@@ -10,7 +10,7 @@ enum ThirdEnum {
 	Eeeeee,
 	Ffffff,
 	Gggggg,
-	Hhhhhh
+	Hhhhhh,
 }
 
 

tests/expected/trailing_comma.gd

@@ -0,0 +1,55 @@
+var a = [
+	1,
+	2,
+	3,
+]
+
+var aa = [1, 2, 3]
+
+var b = [
+	1,
+	2,
+	3, # comment
+]
+
+var c = {
+	"a": 1,
+	"b": 2,
+	"c": 3, # comment
+}
+
+var d = {
+	"a": 1,
+	"b": 2,
+	"c": 3,
+}
+
+var dd = {"a": 1, "b": 2, "c": 3}
+
+enum Foo {
+	A,
+	B,
+	C,
+}
+
+enum Foo2 {
+	A,
+	B,
+	C, # comment
+}
+
+enum Foo3 { A, B, C }
+
+
+func foo(
+		a,
+		b,
+):
+	pass
+
+
+func bar(
+		a,
+		b, # comment
+):
+	pass

tests/input/trailing_comma.gd

@@ -0,0 +1,54 @@
+var a = [
+	1,
+	2,
+	3
+]
+
+var aa = [1, 2, 3]
+
+var b = [
+	1,
+	2,
+	3 # comment
+]
+
+var c = {
+	"a": 1,
+	"b": 2,
+	"c": 3 # comment
+}
+
+var d = {
+	"a": 1,
+	"b": 2,
+	"c": 3
+}
+
+var dd = {"a": 1, "b": 2, "c": 3}
+
+enum Foo {
+	A,
+	B,
+	C
+}
+
+enum Foo2 {
+	A,
+	B,
+	C # comment
+}
+
+enum Foo3 {A, B, C}
+
+func foo(
+	a,
+	b
+):
+	pass
+
+
+func bar(
+	a,
+	b # comment
+):
+	pass