c

tree-sitter/queries/topiary.scm

@@ -20,30 +20,40 @@
   value: (_) @prepend_indent_start @append_indent_end
   body: (_) @prepend_hardline)
 
-; TODO: report assertion error
-;(await_binding
-;  body: (_) @prepend_hardline)
+; TODO: (await_binding)
 
 (def
   ":" @prepend_space @append_spaced_softline
   signature: (_) @prepend_spaced_softline @prepend_indent_start @append_indent_end)
 
 (def
-  "=" @prepend_space @append_spaced_softline @append_indent_start
-  value: (_) @append_indent_end)
+  "=" @prepend_space @append_spaced_softline
+  value: (_) @prepend_indent_start @prepend_begin_scope
+             @append_indent_end @append_end_scope
+  (#scope_id! "def"))
 
 (def "def" @append_space)
 
+(if_expr
+  then: (_) @prepend_begin_scope @append_end_scope
+  (#scope_id! "if_expr.then"))
+(if_expr
+  else: (_) @prepend_begin_scope @append_end_scope
+  (#scope_id! "if_expr.else"))
 (if_expr
   "if" @prepend_space @append_space
   "then" @prepend_space @append_spaced_softline
-  then: (_) @prepend_indent_start @append_indent_end @append_hardline
+  then: (_) @prepend_indent_start
+            @append_indent_end @append_hardline
   "else" @prepend_space @append_spaced_softline
-  else: (_) @prepend_indent_start @append_indent_end)
+  else: (_) @prepend_indent_start
+            @append_indent_end)
 
 ((match_arm) @append_hardline . (match_arm))
 (match_arm
   "->" @append_spaced_softline @prepend_indent_start @append_indent_end)
+(match_arm
+  "|" @prepend_spaced_softline @append_space)
 (match_expr
   "|" @append_space)
 (match_expr
@@ -56,14 +66,11 @@
 
 (list_expression 
   "," @append_spaced_softline)
-(list_expression
-  "[" @append_empty_softline
-  "]" @prepend_empty_softline)
-(list_expression) @prepend_space @append_space
 
-(atom
-  "(" @append_empty_softline
-  ")" @prepend_empty_softline)
+(list_expression
+  "[" @append_begin_scope @append_empty_softline @append_indent_start
+  "]" @append_end_scope @prepend_empty_softline @append_indent_end
+  (#scope_id! "list_expr"))
 
 (extensible_union
   "extensible" @append_space
@@ -105,8 +112,36 @@
   "{" @append_empty_softline
   "}" @prepend_empty_softline)
 
-; TODO: unify binary exprs
-; TODO: scopes
-; TODO: non-atom exprs
+(atom
+  "(" @append_begin_scope @append_empty_softline @append_indent_start
+  ")" @append_end_scope @prepend_empty_softline @append_indent_end
+  (#scope_id! "paren_expr"))
+
+(await_expr
+  "await" @append_space)
+
+(type_downcast
+  "::" @prepend_spaced_softline @append_space)
+
+(lambda
+  ":" @prepend_space @append_space)
+(lambda
+  "->" @prepend_space @append_spaced_softline
+  body: (_) @prepend_indent_start @append_indent_end)
+
+
+(type_atom
+  "(" @append_begin_scope @append_empty_softline @append_indent_start
+  ")" @append_end_scope @prepend_empty_softline @append_indent_end
+  (#scope_id! "paren_type"))
+
+(tag_expr
+  tag: (_) @append_space)
+
+(binary_expr
+  left: (_) @append_spaced_softline
+  right: (_) @prepend_space)
+
 ; TODO: types
-; TODO: disable format regions
+; TODO: disable-format-regions
+; TODO: folding query