Merge pull request #46 from shadr/add-trailing-commas

Add trailing commas (closes #37)

Author: NathanLovato

queries/gdscript.scm

@@ -29,13 +29,15 @@
   "[" @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)
 (dictionary "{" @append_space "}" @prepend_space (#single_line_only!))
 (pair ":" @append_space)
+(dictionary ((pair (_expression)) @append_delimiter (#delimiter! ",") . ","? @do_nothing . (comment)? . "}") (#multi_line_only!))
 
 ; FUNCTIONS
 (function_definition (name) @append_antispace)
@@ -57,6 +59,7 @@
     "(" @append_hardline @append_indent_start
     ")" @prepend_hardline @prepend_indent_end
     (#multi_line_only!))
+(arguments ((_expression) @append_delimiter (#delimiter! ",") . ","? @do_nothing . (comment)? . ")") (#multi_line_only!))
 
 ; MULTI-LINE PARAMETERS (in function definitions)
 (parameters
@@ -66,6 +69,7 @@
 (parameters
     ([(typed_parameter) (typed_default_parameter) (identifier) (default_parameter)]) @prepend_hardline @prepend_indent_start @append_indent_end
     (#multi_line_only!))
+(parameters (([(typed_parameter) (typed_default_parameter) (identifier) (default_parameter)]) @append_delimiter (#delimiter! ",") . ","? @do_nothing . (comment)? . ")") (#multi_line_only!))
 
 ; CLASS DEFINITIONS
 (class_definition (body) @prepend_hardline)
@@ -84,6 +88,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/func_args_multiline.gd

@@ -2,7 +2,7 @@ func test(
 		a: int,
 		b: String,
 		c,
-		d = 42
+		d = 42,
 ) -> void:
 	pass
 

tests/expected/func_constructor_args_multiline.gd

@@ -1,7 +1,7 @@
 func _init(
 		init_mob: Mob3D,
 		init_spawning_point: Node3D,
-		init_projectile_scene: PackedScene
+		init_projectile_scene: PackedScene,
 ) -> void:
 	pass
 

tests/expected/func_multiline_calls.gd

@@ -2,25 +2,25 @@ func test():
 	print(
 		"Testing",
 		"multiline",
-		"print"
+		"print",
 	)
 
 	print(
 		"Testing",
 		"multiline",
-		"print"
+		"print",
 	)
 
 	print("Testing", "multiline", "print")
 
 	print(
 		"Testing",
 		"multiline",
-		"print"
+		"print",
 	)
 
 	print(
 		"Testing",
 		"multiline",
-		"print"
+		"print",
 	)

tests/expected/trailing_comma.gd

@@ -0,0 +1,62 @@
+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
+
+
+func f():
+	foo(
+		1,
+		2,
+	)

tests/input/trailing_comma.gd

@@ -0,0 +1,61 @@
+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
+
+
+func f():
+	foo(
+		1,
+		2
+	)