Migrate all existing indentation queries.

Add more options to ComplexNode and use them to improve C/C++ indentation.

helix-core/src/indent.rs

@@ -267,39 +267,54 @@ fn get_first_in_line(mut node: Node, byte_pos: usize, new_line: bool) -> Vec<boo
     result
 }
 
-// This assumes that the name matches and checks for all the other conditions
+// This assumes that the kind matches and checks for all the other conditions
 fn matches<'a>(query_node: &IndentQueryNode, node: Node<'a>, cursor: &mut TreeCursor<'a>) -> bool {
     match query_node {
         IndentQueryNode::SimpleNode(_) => true,
         IndentQueryNode::ComplexNode {
             kind: _,
-            field_name,
+            kind_not_in,
             parent_kind_in,
+            field_name_in,
         } => {
+            if let Some(kind_not_in) = kind_not_in {
+                let kind = node.kind();
+                if kind_not_in.iter().any(|k| k == kind) {
+                    return false;
+                }
+            }
             if let Some(parent_kind_in) = parent_kind_in {
                 let parent_matches = node.parent().map_or(false, |p| {
-                    parent_kind_in.iter().any(|kind| kind.as_str() == p.kind())
+                    let parent_kind = p.kind();
+                    parent_kind_in
+                        .iter()
+                        .any(|kind| kind.as_str() == parent_kind)
                 });
                 if !parent_matches {
                     return false;
                 }
             }
-            if let Some(field_name) = field_name {
+            if let Some(field_name_in) = field_name_in {
                 let parent = match node.parent() {
                     None => {
                         return false;
                     }
                     Some(p) => p,
                 };
-                let mut found_child = false;
-                for child in parent.children_by_field_name(field_name, cursor) {
-                    if child == node {
-                        found_child = true;
+                cursor.reset(parent);
+                debug_assert!(cursor.goto_first_child());
+                loop {
+                    if cursor.node() == node {
+                        if let Some(cursor_name) = cursor.field_name() {
+                            if !field_name_in.iter().any(|n| n == cursor_name) {
+                                return false;
+                            }
+                        } else {
+                            return false;
+                        }
                         break;
                     }
-                }
-                if !found_child {
-                    return false;
+                    debug_assert!(cursor.goto_next_sibling());
                 }
             }
             true
@@ -525,6 +540,25 @@ mod test {
         really_long_variable_name_using_up_the_line |=
             really_long_fn_that_should_definitely_go_on_the_next_line();
 
+        let (
+            a_long_variable_name_in_this_tuple,
+            b_long_variable_name_in_this_tuple,
+            c_long_variable_name_in_this_tuple,
+            d_long_variable_name_in_this_tuple,
+            e_long_variable_name_in_this_tuple,
+        ): (usize, usize, usize, usize, usize) =
+            if really_long_fn_that_should_definitely_go_on_the_next_line() {
+                (
+                    03294239434,
+                    1213412342314,
+                    21231234134,
+                    834534234549898789,
+                    9879234234543853457,
+                )
+            } else {
+                (0, 1, 2, 3, 4)
+            };
+
         let test_function = function_with_param(this_param,
             that_param
         );

helix-core/src/syntax.rs

@@ -114,8 +114,9 @@ pub enum IndentQueryNode {
     // A node given by a list of characteristics which must all be fulfilled in order to match
     ComplexNode {
         kind: Option<String>,
-        field_name: Option<String>,
+        kind_not_in: Option<Vec<String>>,
         parent_kind_in: Option<Vec<String>>,
+        field_name_in: Option<Vec<String>>,
     },
 }
 impl IndentQueryNode {

runtime/queries/c/indents.toml

@@ -1,4 +1,10 @@
-indent = [
+[indent]
+all = [
+  # Indent non-grouped bodies of if-, while- and do-while-statements.
+  # TODO Add indent for the for-statement (ideally the body of a for-statement should have a field name in the tree-sitter grammar)
+  { kind_not_in = ["compound_statement"], parent_kind_in = ["if_statement", "while_statement", "do_statement"], field_name_in = ["consequence", "body"] }
+]
+tail = [
   "compound_statement",
   "field_declaration_list",
   "enumerator_list",
@@ -9,7 +15,8 @@ indent = [
   "expression_statement",
 ]
 
-outdent = [
+[outdent]
+all = [
   "case",
   "}",
   "]",

runtime/queries/cmake/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "if_condition",
   "foreach_loop",
   "while_loop",
@@ -7,6 +7,6 @@ indent = [
   "normal_command",
 ]
 
-outdent = [
+outdent.all = [
   ")"
 ]

runtime/queries/cpp/indents.toml

@@ -1,4 +1,10 @@
-indent = [
+[indent]
+all = [
+  # Indent non-grouped bodies of if-, while- and do-while-statements.
+  # TODO Add indent for the for-statement (ideally the body of a for-statement should have a field name in the tree-sitter grammar)
+  { kind_not_in = ["compound_statement"], parent_kind_in = ["if_statement", "while_statement", "do_statement"], field_name_in = ["consequence", "body"] }
+]
+tail = [
   "compound_statement",
   "field_declaration_list",
   "enumerator_list",
@@ -9,7 +15,8 @@ indent = [
   "expression_statement",
 ]
 
-outdent = [
+[outdent]
+all = [
   "case",
   "access_specifier",
   "}",

runtime/queries/dart/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "class_body",
   "function_body",
   "function_expression_body",
@@ -13,7 +13,7 @@ indent = [
   "arguments"
 ]
 
-outdent = [
+outdent.all = [
  "}",
  "]",
  ")"

runtime/queries/fish/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "function_definition",
   "while_statement",
   "for_statement",
@@ -7,6 +7,6 @@ indent = [
   "switch_statement",
 ]
 
-outdent = [
+outdent.all = [
   "end"
 ]

runtime/queries/glsl/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "init_declarator",
   "compound_statement",
   "preproc_arg",
@@ -10,7 +10,7 @@ indent = [
   "compound_literal_expression"
 ]
 
-outdent = [
+outdent.all = [
   "#define",
   "#ifdef",
   "#endif",

runtime/queries/javascript/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
  "array",
  "object",
  "arguments",
@@ -21,7 +21,7 @@ indent = [
  "object_type",
 ]
 
-outdent = [
+outdent.all = [
  "}",
  "]",
  ")"

runtime/queries/json/indents.toml

@@ -1,9 +1,9 @@
-indent = [
+indent.tail = [
   "object",
   "array"
 ]
 
-outdent = [
+outdent.all = [
   "]",
   "}"
 ]

runtime/queries/llvm-mir-yaml/indents.toml

@@ -1,3 +1,3 @@
-indent = [
+indent.tail = [
     "block_mapping_pair",
 ]

runtime/queries/llvm-mir/indents.toml

@@ -1,7 +1,7 @@
-indent = [
+indent.tail = [
   "basic_block",
 ]
 
-outdent = [
+outdent.all = [
   "label",
 ]

runtime/queries/llvm/indents.toml

@@ -1,8 +1,8 @@
-indent = [
+indent.tail = [
  "function_body",
  "instruction",
 ]
 
-outdent = [
+outdent.all = [
  "}",
 ]

runtime/queries/lua/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "function_definition",
   "variable_declaration",
   "local_variable_declaration",

runtime/queries/nix/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
  # "function",
  "bind",
  "assert",
@@ -12,7 +12,7 @@ indent = [
  "parenthesized",
 ]
 
-outdent = [
+outdent.all = [
   "}",
   "]",
 ]

runtime/queries/ocaml/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
     "let_binding",
     "type_binding",
     "structure",
@@ -8,6 +8,6 @@ indent = [
     "match_case",
 ]
 
-outdent = [
+outdent.all = [
     "}",
 ]

runtime/queries/perl/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "function",
   "identifier",
   "method_invocation",
@@ -12,6 +12,6 @@ indent = [
   "word_list_qw"
 ]
 
-outdent = [
+outdent.all = [
  "}"
 ]

runtime/queries/php/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "array_creation_expression",
   "arguments",
   "formal_parameters",

runtime/queries/protobuf/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "messageBody",
   "enumBody",
   "oneofBody",
@@ -7,6 +7,6 @@ indent = [
   "msgLit",
 ]
 
-outdent = [
+outdent.all = [
   "}",
 ]

runtime/queries/python/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "list",
   "tuple",
   "dictionary",
@@ -27,7 +27,7 @@ indent = [
   "class_definition",
 ]
 
-outdent = [
+outdent.all = [
   ")",
   "]",
   "}",

runtime/queries/ruby/indents.toml

@@ -1,4 +1,4 @@
-indent = [
+indent.tail = [
   "argument_list",
   "array",
   "begin",
@@ -16,7 +16,7 @@ indent = [
   "singleton_method",
 ]
 
-outdent = [
+outdent.all = [
   ")",
   "}",
   "]",

runtime/queries/rust/indents.toml

@@ -1,7 +1,7 @@
 [indent]
 all = [
- { parent_kind_in = ["assignment_expression", "compound_assignment_expr"], field_name = "right"},
- { parent_kind_in = ["let_declaration"], field_name = "value" }
+ { parent_kind_in = ["assignment_expression", "compound_assignment_expr"], field_name_in = ["right"]},
+ { parent_kind_in = ["let_declaration"], field_name_in = ["value"] }
 ]
 tail = [
  "use_list",

runtime/queries/scala/indents.toml

@@ -1,5 +1,5 @@
 
-indent = [
+indent.tail = [
  "block",
  "arguments",
  "parameter",
@@ -16,7 +16,7 @@ indent = [
  "match_expression"
 ]
 
-outdent = [
+outdent.all = [
  "}",
  "]",
  ")"

runtime/queries/svelte/indents.toml

@@ -1,11 +1,11 @@
-indent = [
+indent.tail = [
   "element"
   "if_statement"
   "each_statement"
   "await_statement"
 ]
 
-outdent = [
+outdent.all = [
   "end_tag"
   "else_statement"
   "if_end_expr"