1 files changed, 31 insertions, 13 deletions
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 0ea6f6355..9f7661a45 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -2,27 +2,45 @@
 
 ;;; Builtins
 ;; Keywords
-(
-  "if" @conditional
-  "end" @conditional
-)
+
+(if_statement
+[
+  "if" 
+  "then"
+  "end"
+] @conditional)
+
 [
   "else"
   "elseif"
-  "then"
-] @conditional
+] @contional
 
+(for_statement
+[
+  "for"
+  "do"
+  "end"
+] @repeat)
 
-(
-  [
+(for_in_statement
+[
+  "for"
   "do"
+  "end"
+] @repeat)
+
+(while_statement
+[
   "while"
-  "repeat"
-  "for"
-  ] @repeat
+  "do"
+  "end"
+] @repeat)
 
-  "end" @repeat
-)
+(repeat_statement
+[
+  "repeat"
+  "until"
+] @repeat)
 
 [
  "in"