add clauses to support autocomplete better

queries/highlights.scm

@@ -4,10 +4,10 @@
 variable: (identifier) @variable.parameter
 
 
-(block_group
+(block_clause
     (push_block) @type)
 
-(partialdef_group
+(partialdef_clause
     (push_partial) @type)
 
 (verbatim_group

queries/libraries.scm

@@ -34,7 +34,7 @@
     ("trans")
     ("translate")] @library.i18n)
 
-(language_group
+(language_clause
   tag: ("language") @library.i18n)
 
 (get_available_languages
@@ -59,10 +59,10 @@
     ("language_name_local")
     ("language_name_translated")] @library.i18n)
 
-(cache_group
+(cache_clause
   tag: ("cache") @library.cache)
 
-(localize_group
+(localize_clause
   tag: ("localize") @library.l10n)
 
 (filter
@@ -70,10 +70,10 @@
     ("localize")
     ("unlocalize")] @library.l10n)
 
-(localtime_group
+(localtime_clause
   tag: ("localtime") @library.tz)
 
-(timezone_group
+(timezone_clause
   tag: ("timezone") @library.tz)
 
 (get_current_timezone

queries/locals.scm

@@ -3,5 +3,5 @@
 
 variable: (identifier) @local.definition
 
-(with_group) @local.scope
-(for_scope) @local.scope
+(with_clause) @local.scope
+(for_clause) @local.scope

queries/tags.scm

@@ -1,15 +1,17 @@
 (load
     (identifier) @name) @definition.function
 
-(partialdef_group (push_partial) @name) @definition.method
+(partialdef_clause (push_partial) @name) @definition.method
 (partial (identifier) @name) @reference.call
 
+; every tag that opens a group names itself in a clause of its own, and every
+; tag that does not is a group member directly
 (template_block_groups
     [
         (_
-            tag: _ @name) @reference.call
-        (for_group
-            (for_scope
-                tag: "for" @reference.call))])
+            tag: _ @name)
+        (_
+            (_
+                tag: _ @name))] @reference.call)
 
 (filter) @reference.call