git.iko.soy/helix
on master help sign in
Improve dart indent (#3419)
ccae718seb-bl
languages.toml+1−1
compare with master
unifiedsplit
@@ -923,7 +923,7 @@ indent = { tab-width = 2, unit = " " }
923
923
924[[grammar]]
924[[grammar]]
925name = "dart"
925name = "dart"
926−source = { git = "https://github.com/UserNobody14/tree-sitter-dart", rev = "6a25376685d1d47968c2cef06d4db8d84a70025e" }
926+source = { git = "https://github.com/UserNobody14/tree-sitter-dart", rev = "2d7f66651c9319c1a0e4dda226cc2628fbb66528" }
927
927
928[[language]]
928[[language]]
929name = "scala"
929name = "scala"
runtime/queries/dart/indents.scm+89−9
@@ -1,16 +1,95 @@
1+; things surrounded by ({[]})
1[
2[
2− (class_body)
3+ (template_substitution)
3− (function_body)
4+ (list_literal)
4− (function_expression_body)
5+ (set_or_map_literal)
5− (declaration)
6+ (parenthesized_expression)
6− (initializers)
7+ (arguments)
8+ (index_selector)
9+ (block)
10+ (assertion_arguments)
7 (switch_block)
11 (switch_block)
8− (if_statement)
12+ (catch_parameters)
13+ (for_loop_parts)
14+ (configuration_uri_condition)
15+ (enum_body)
16+ (class_body)
17+ (extension_body)
18+ (parameter_type_list)
19+ (optional_positional_parameter_types)
20+ (named_parameter_types)
9 (formal_parameter_list)
21 (formal_parameter_list)
10− (formal_parameter)
22+ (optional_formal_parameters)
11− (list_literal)
23+] @indent
24+
25+; control flow statement which accept one line as body
26+
27+(for_statement
28+ body: _ @indent
29+ (#not-kind-eq? @indent block)
30+ (#set! "scope" "all")
31+)
32+
33+(while_statement
34+ body: _ @indent
35+ (#not-kind-eq? @indent block)
36+ (#set! "scope" "all")
37+)
38+
39+(do_statement
40+ body: _ @indent
41+ (#not-kind-eq? @indent block)
42+ (#set! "scope" "all")
43+)
44+
45+(if_statement
46+ consequence: _ @indent
47+ (#not-kind-eq? @indent block)
48+ (#set! "scope" "all")
49+)
50+(if_statement
51+ alternative: _ @indent
52+ (#not-kind-eq? @indent if_statement)
53+ (#not-kind-eq? @indent block)
54+ (#set! "scope" "all")
55+)
56+(if_statement
57+ "else" @else
58+ alternative: (if_statement) @indent
59+ (#not-same-line? @indent @else)
60+ (#set! "scope" "all")
61+)
62+
63+(if_element
64+ consequence: _ @indent
65+ (#set! "scope" "all")
66+)
67+(if_element
68+ alternative: _ @indent
69+ (#not-kind-eq? @indent if_element)
70+ (#set! "scope" "all")
71+)
72+(if_element
73+ "else" @else
74+ alternative: (if_element) @indent
75+ (#not-same-line? @indent @else)
76+ (#set! "scope" "all")
77+)
78+
79+(for_element
80+ body: _ @indent
81+ (#set! "scope" "all")
82+)
83+
84+; simple statements
85+[
86+ (local_variable_declaration)
87+ (break_statement)
88+ (continue_statement)
12 (return_statement)
89 (return_statement)
13− (arguments)
90+ (yield_statement)
91+ (yield_each_statement)
92+ (expression_statement)
14] @indent
93] @indent
15
94
16[
95[
@@ -18,3 +97,4 @@
18 "]"
97 "]"
19 ")"
98 ")"
20] @outdent
99] @outdent
100+