Skip to content

Commit cb446ce

Browse files
authored
Merge pull request #48 from shadr/fix-new-line-before-closing-bracket-in-enums
Ensure new line character before closing brace in enums (closes #47)
2 parents 0d94a29 + ff7958a commit cb446ce

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

queries/gdscript.scm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
(dictionary
3535
"{" @append_empty_softline @append_indent_start
36-
"}" @prepend_empty_softline @append_empty_softline @prepend_indent_end)
36+
"}" @prepend_empty_softline @prepend_indent_end)
3737
(dictionary "," @append_spaced_softline . (comment)? @do_nothing)
3838
(dictionary "{" @append_space "}" @prepend_space (#single_line_only!))
3939
(pair ":" @append_space)
@@ -86,8 +86,9 @@
8686

8787
; ENUMS
8888
(enumerator_list
89-
"{" @append_input_softline @append_indent_start
90-
"}" @prepend_input_softline @prepend_indent_end)
89+
"{" @append_empty_softline @append_indent_start
90+
"}" @prepend_empty_softline @prepend_indent_end)
91+
(enumerator_list "{" @append_space "}" @prepend_space (#single_line_only!))
9192
(enumerator_list "," @append_spaced_softline . (comment)? @do_nothing)
9293
(enumerator_list ((enumerator) @append_delimiter (#delimiter! ",") . ","? @do_nothing . (comment)? . "}") (#multi_line_only!))
9394
(enumerator_list) @prepend_space

tests/expected/enums.gd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,8 @@ enum ThirdEnum {
1616

1717
func foo():
1818
pass
19+
20+
enum Test {
21+
A,
22+
B,
23+
}

tests/input/enums.gd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ Ffffff,
1616
}
1717
func foo():
1818
pass
19+
20+
21+
enum Test {
22+
A, B }

0 commit comments

Comments
 (0)