2 files changed, 17 insertions, 10 deletions
diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm
index 54832ffa56..14e5a8128f 100644
--- a/runtime/queries/vim/highlights.scm
+++ b/runtime/queries/vim/highlights.scm
@@ -42,9 +42,8 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (scoped_identifier
-      (identifier) @function.call))
+  function: (scoped_identifier
+    (identifier) @function.call))
 
 (parameters
   (identifier) @variable.parameter)
@@ -127,11 +126,14 @@
   "view"
   "eval"
   "sign"
+  "abort"
 ] @keyword
 
 (map_statement
   cmd: _ @keyword)
 
+(keycode) @character.special
+
 (command_name) @function.macro
 
 ; Filetype command
@@ -204,10 +206,9 @@
 
 (command_attribute
   name: _ @property
-  val:
-    (behavior
-      name: _ @constant
-      val: (identifier)? @function)?)
+  val: (behavior
+    name: _ @constant
+    val: (identifier)? @function)?)
 
 ; Edit command
 (plus_plus_opt
@@ -277,8 +278,6 @@
   "/"
   "%"
   ".."
-  "is"
-  "isnot"
   "=="
   "!="
   ">"
@@ -297,9 +296,15 @@
   "..="
   "<<"
   "=<<"
+  "->"
   (match_case)
 ] @operator
 
+[
+  "is"
+  "isnot"
+] @keyword.operator
+
 ; Some characters have different meanings based on the context
 (unary_operation
   "!" @operator)
diff --git a/runtime/queries/vim/injections.scm b/runtime/queries/vim/injections.scm
index 16ec57ca99..5feb832ec4 100644
--- a/runtime/queries/vim/injections.scm
+++ b/runtime/queries/vim/injections.scm
@@ -28,5 +28,7 @@
 ((set_item
   option: (option_name) @_option
   value: (set_value) @injection.content)
-  (#any-of? @_option "includeexpr" "inex" "printexpr" "pexpr" "formatexpr" "fex" "indentexpr" "inde" "foldtext" "fdt" "foldexpr" "fde" "diffexpr" "dex" "patchexpr" "pex" "charconvert" "ccv")
+  (#any-of? @_option
+    "includeexpr" "inex" "printexpr" "pexpr" "formatexpr" "fex" "indentexpr" "inde" "foldtext" "fdt"
+    "foldexpr" "fde" "diffexpr" "dex" "patchexpr" "pex" "charconvert" "ccv")
   (#set! injection.language "vim"))