Use block_statement_else and block_statement_else_if in queries

Author: mogstad

queries/glimmer/highlights.scm

@@ -31,9 +31,11 @@
 (block_statement_end
   path: (identifier) @keyword.conditional)
 
-((mustache_statement
-  (identifier) @keyword.conditional)
-  (#lua-match? @keyword.conditional "else"))
+[
+  "else"
+  "else if"
+]  @keyword.conditional
+
 
 ; == Mustache Statements ===
 ; Highlight the whole statement, to color brackets and separators

queries/glimmer/indents.scm

@@ -22,13 +22,6 @@
   "}}"
 ] @indent.branch
 
-(mustache_statement
-  (helper_invocation
-    helper: (identifier) @_identifier
-    (#eq? @_identifier "else"))) @indent.branch
-
-(mustache_statement
-  ((identifier) @_identifier
-    (#eq? @_identifier "else"))) @indent.branch
+(block_statement_inverse) @indent.branch
 
 (comment_statement) @indent.ignore