kakrc.sample

@@ -31,7 +31,6 @@ a,arguments
 s,statement
 d,declaration
 n,number
-b,block
 \",string" |
 while IFS=, read -r cmd group ; do
     echo "map -docstring '$group child' global tree-children '$cmd' ':tree-select-children $group<ret>'"

rc/default_config.toml

@@ -2,19 +2,8 @@
 group.identifier = ["identifier", "scoped_identifier"]
 group.declaration = ["const_item", "macro_invocation", "macro_definition", "empty_statement", "attribute_item", "inner_attribute_item", "mod_item", "foreign_mod_item", "struct_item", "union_item", "enum_item", "type_item", "function_item", "function_signature_item", "impl_item", "trait_item", "associated_type", "let_declaration", "use_declaration", "extern_crate_declaration", "static_item"]
 group.call = ["macro_invocation", "call_expression"]
-group.arguments = ["arguments", "token_tree", "parameters"]
+group.arguments = ["arguments", "token_tree"]
 group.statement = ["expression_statement", "let_declaration"]
 group.string = ["string_literal", "raw_string_literal"]
 group.number = ["integer_literal", "float_literal", "negative_literal"]
 group.type = ["abstract_type", "reference_type", "metavariable", "pointer_type", "generic_type", "scoped_type_identifier", "tuple_type", "unit_type", "array_type", "function_type", "macro_invocation", "empty_type", "dynamic_type", "bounded_type", "primitive_type"]
-
-[filetype.python]
-group.identifier = ["identifier"]
-group.declaration = ["function_definition", "class_definition"]
-group.statement = ["expression_statement", "for_statement", "if_statement", "return_statement", "while_statement", "raise_statement", "try_statement", "assert_statement", "import_statement"]
-group.call = ["call"]
-group.arguments = ["arguments", "parameters"]
-group.string = ["string"]
-group.number = ["integer", "float"]
-group.type = ["type", "generic_type"]
-

src/main.rs

@@ -215,6 +215,9 @@ fn handle_request(config: &Config, request: &Request) -> String {
 }
 
 fn select_nodes(node: &Node, kinds: &[String], new_ranges: &mut Vec<Range>) {
+    if kinds.iter().any(|kind| kind == node.kind()) {
+        new_ranges.push(node.range());
+    } else {
         for child in tree::named_children(&node) {
             if kinds.iter().any(|kind| kind == child.kind()) {
                 new_ranges.push(child.range());
@@ -223,6 +226,7 @@ fn select_nodes(node: &Node, kinds: &[String], new_ranges: &mut Vec<Range>) {
             }
         }
     }
+}
 
 fn traverse_up_to_node_which_matters<'a>(
     filetype_config: &FiletypeConfig,