refactor paired statements to generic constructors

queries/highlights.scm

@@ -35,56 +35,52 @@
 
 ([
   "as"
+  "assign"
+  "break"
   "by"
-  "in"
-  "with"
-  "liquid"
-  "cycle"
-
+  "capture"
   "case"
-  "when"
+  "continue"
+  "cycle"
+  "decrement"
+  "echo"
+  "else"
+  "elsif"
+  "endcapture"
   "endcase"
-
-  "for"
   "endfor"
-
-  "form"
   "endform"
-
-  "style"
-  "endstyle"
-
-  "javascript"
-  "endjavascript"
-
-  "capture"
-  "endcapture"
-
-  "if"
-  "else"
-  "elsif"
   "endif"
-
-  "unless"
-  "endunless"
-
-  "schema"
-  "endschema"
-
-  "raw"
+  "endjavascript"
+  "endpaginate"
   "endraw"
-
-  "tablerow"
+  "endschema"
+  "endstyle"
   "endtablerow"
-
+  "endunless"
+  "for"
+  "form"
+  "if"
+  "in"
+  "include"
+  "increment"
+  "javascript"
+  "layout"
+  "liquid"
   "paginate"
-  "endpaginate"
-
-  (statement)
+  "raw"
+  "render"
+  "schema"
+  "section"
+  "sections"
+  "style"
+  "tablerow"
+  "unless"
+  "when"
+  "with"
   ] @keyword 
  (#set! priority 101))
 
-
 ((identifier) @variable (#set! priority 101))
 ((string) @string (#set! priority 101))
 ((boolean) @boolean (#set! priority 101))
@@ -93,7 +89,7 @@
 (filter
   name: (identifier) @function.call (#set! priority 101))
 
-(raw_tag
+(raw_statement
   (raw_content) @text.reference (#set! priority 102))
 
 ((comment) @comment (#set! priority 102))

queries/injections.scm

@@ -1,18 +1,19 @@
-((content) @injection.content
+((template_content) @injection.content
  (#set! injection.language "html")
  (#set! injection.combined))
 
-((schema_tag
-  (content) @injection.content)
+((schema_statement
+  (template_content) @injection.content)
  (#set! injection.language "json")
  (#set! injection.combined))
 
-((style_tag
-  (content) @injection.content)
+((style_statement
+  (template_content) @injection.content)
  (#set! injection.language "css")
  (#set! injection.combined))
 
-((javascript_tag
-  (content) @injection.content)
- (#set! injection.language "javascript"))
+((javascript_statement
+  (template_content) @injection.content)
+ (#set! injection.language "javascript")
+ (#set! injection.combined))