refactor: manual pre-cleanup

Moving comments, adding `format-ignore` to lines that will be better
with it

37 files changed, 1656 insertions, 1595 deletions

diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 729a84d15..692fccb1b 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -136,7 +136,7 @@
 [
   (boolean_type)
   (void_type)
-] @type.builtin;;
+] @type.builtin
 
 ; Fields
 
diff --git a/queries/apex/locals.scm b/queries/apex/locals.scm
index 6ffa8648f..5661b911d 100644
--- a/queries/apex/locals.scm
+++ b/queries/apex/locals.scm
@@ -22,7 +22,7 @@
 ; loops
 
 (for_statement) @local.scope
-(for_statement         ; "for" body in case there are no braces
+(for_statement  ; "for" body in case there are no braces
   body: (_) @local.scope)
 (do_statement
   body: (_) @local.scope)
diff --git a/queries/arduino/highlights.scm b/queries/arduino/highlights.scm
index a4e74ae89..a2e121a06 100644
--- a/queries/arduino/highlights.scm
+++ b/queries/arduino/highlights.scm
@@ -1,75 +1,75 @@
 ; inherits: cpp
 
 ((identifier) @function.builtin
- (#any-of? @function.builtin
-           ; Digital I/O
-           "digitalRead"
-           "digitalWrite"
-           "pinMode"
-           ; Analog I/O
-           "analogRead"
-           "analogReference"
-           "analogWrite"
-           ; Zero, Due & MKR Family
-           "analogReadResolution"
-           "analogWriteResolution"
-           ; Advanced I/O
-           "noTone"
-           "pulseIn"
-           "pulseInLong"
-           "shiftIn"
-           "shiftOut"
-           "tone"
-           ; Time
-           "delay"
-           "delayMicroseconds"
-           "micros"
-           "millis"
-           ; Math
-           "abs"
-           "constrain"
-           "map"
-           "max"
-           "min"
-           "pow"
-           "sq"
-           "sqrt"
-           ; Trigonometry
-           "cos"
-           "sin"
-           "tan"
-           ; Characters
-           "isAlpha"
-           "isAlphaNumeric"
-           "isAscii"
-           "isControl"
-           "isDigit"
-           "isGraph"
-           "isHexadecimalDigit"
-           "isLowerCase"
-           "isPrintable"
-           "isPunct"
-           "isSpace"
-           "isUpperCase"
-           "isWhitespace"
-           ; Random Numbers
-           "random"
-           "randomSeed"
-           ; Bits and Bytes
-           "bit"
-           "bitClear"
-           "bitRead"
-           "bitSet"
-           "bitWrite"
-           "highByte"
-           "lowByte"
-           ; External Interrupts
-           "attachInterrupt"
-           "detachInterrupt"
-           ; Interrupts
-           "interrupts"
-           "noInterrupts"
-           ))
+  ; format-ignore
+  (#any-of? @function.builtin
+     ; Digital I/O
+     "digitalRead"
+     "digitalWrite"
+     "pinMode"
+     ; Analog I/O
+     "analogRead"
+     "analogReference"
+     "analogWrite"
+     ; Zero, Due & MKR Family
+     "analogReadResolution"
+     "analogWriteResolution"
+     ; Advanced I/O
+     "noTone"
+     "pulseIn"
+     "pulseInLong"
+     "shiftIn"
+     "shiftOut"
+     "tone"
+     ; Time
+     "delay"
+     "delayMicroseconds"
+     "micros"
+     "millis"
+     ; Math
+     "abs"
+     "constrain"
+     "map"
+     "max"
+     "min"
+     "pow"
+     "sq"
+     "sqrt"
+     ; Trigonometry
+     "cos"
+     "sin"
+     "tan"
+     ; Characters
+     "isAlpha"
+     "isAlphaNumeric"
+     "isAscii"
+     "isControl"
+     "isDigit"
+     "isGraph"
+     "isHexadecimalDigit"
+     "isLowerCase"
+     "isPrintable"
+     "isPunct"
+     "isSpace"
+     "isUpperCase"
+     "isWhitespace"
+     ; Random Numbers
+     "random"
+     "randomSeed"
+     ; Bits and Bytes
+     "bit"
+     "bitClear"
+     "bitRead"
+     "bitSet"
+     "bitWrite"
+     "highByte"
+     "lowByte"
+     ; External Interrupts
+     "attachInterrupt"
+     "detachInterrupt"
+     ; Interrupts
+     "interrupts"
+     "noInterrupts"))
 
 ((identifier) @type.builtin
  (#any-of? @type.builtin
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 033f9fbee..5820680ef 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -127,7 +127,8 @@
 (command_name (word) @function.call)
 
 ((command_name (word) @function.builtin)
- (#any-of? @function.builtin
+  ; format-ignore
+  (#any-of? @function.builtin
     "alias" "bg" "bind" "break" "builtin" "caller" "cd"
     "command" "compgen" "complete" "compopt" "continue"
     "coproc" "dirs" "disown" "echo" "enable" "eval"
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index c4f51d624..eafe60b4d 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -109,15 +109,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((python_identifier) @constant.builtin
- (#any-of? @constant.builtin
-           ;; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
-           "Ellipsis"
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
+  ; format-ignore
+  (#any-of? @constant.builtin 
+    ; https://docs.python.org/3/library/constants.html
+    "NotImplemented" "Ellipsis" 
+    "quit" "exit" "copyright" "credits" "license"))
 
 ((assignment
   left: (python_identifier) @type.definition
@@ -338,21 +334,22 @@
 (type_conversion) @function.macro
 
 ([(identifier) (python_identifier)] @type.builtin
- (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
-              "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-              "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
-              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-              "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
-              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+  ; format-ignore
+  (#any-of? @type.builtin
+      ; https://docs.python.org/3/library/exceptions.html
+      "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+      "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
+      "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+      "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+      "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+      "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+      "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+      "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+      "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+      "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+      "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+      ; https://docs.python.org/3/library/stdtypes.html
+      "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+      "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 
 (comment) @comment @spell
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 33c30f095..0a6145e3e 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -124,12 +124,12 @@
 ((preproc_arg) @function.macro (#set! "priority" 90))
 (preproc_defined) @function.macro
 
-(((field_expression
-     (field_identifier) @property)) @_parent
+((field_expression
+     (field_identifier) @property) @_parent
  (#not-has-parent? @_parent template_method function_declarator call_expression))
 
 (field_designator) @property
-(((field_identifier) @property)
+((field_identifier) @property
  (#has-ancestor? @property field_declaration)
  (#not-has-ancestor? @property function_declarator))
 
@@ -168,6 +168,7 @@
   value: (identifier) @constant)
 
 ((identifier) @constant.builtin
+  ; format-ignore
   (#any-of? @constant.builtin
     "stderr" "stdin" "stdout"
     "__FILE__" "__LINE__" "__DATE__" "__TIME__"
@@ -181,6 +182,7 @@
     "__FUNCTION__" "__func__" "__PRETTY_FUNCTION__"
     "__VA_ARGS__" "__VA_OPT__"))
 (preproc_def (preproc_arg) @constant.builtin
+  ; format-ignore
   (#any-of? @constant.builtin
     "stderr" "stdin" "stdout"
     "__FILE__" "__LINE__" "__DATE__" "__TIME__"
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 086dede9e..c025b0f07 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -16,59 +16,65 @@
   function: (identifier) @_function
   arguments: (argument_list
                . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "printf" "printf_s"
-                      "vprintf" "vprintf_s"
-                      "scanf" "scanf_s"
-                      "vscanf" "vscanf_s"
-                      "wprintf" "wprintf_s"
-                      "vwprintf" "vwprintf_s"
-                      "wscanf" "wscanf_s"
-                      "vwscanf" "vwscanf_s"
-                      "cscanf" "_cscanf"
-                      "printw"
-                      "scanw")
+  ; format-ignore
+  (#any-of? @_function 
+    "printf" "printf_s"
+    "vprintf" "vprintf_s"
+    "scanf" "scanf_s"
+    "vscanf" "vscanf_s"
+    "wprintf" "wprintf_s"
+    "vwprintf" "vwprintf_s"
+    "wscanf" "wscanf_s"
+    "vwscanf" "vwscanf_s"
+    "cscanf" "_cscanf"
+    "printw"
+    "scanw")
  (#set! injection.language "printf"))
 
 ((call_expression
   function: (identifier) @_function
   arguments: (argument_list
                (_) . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "fprintf" "fprintf_s"
-                      "sprintf"
-                      "dprintf"
-                      "fscanf" "fscanf_s"
-                      "sscanf" "sscanf_s"
-                      "vsscanf" "vsscanf_s"
-                      "vfprintf" "vfprintf_s"
-                      "vsprintf"
-                      "vdprintf"
-                      "fwprintf" "fwprintf_s"
-                      "vfwprintf" "vfwprintf_s"
-                      "fwscanf" "fwscanf_s"
-                      "swscanf" "swscanf_s"
-                      "vswscanf" "vswscanf_s"
-                      "vfscanf" "vfscanf_s"
-                      "vfwscanf" "vfwscanf_s"
-                      "wprintw"
-                      "vw_printw" "vwprintw"
-                      "wscanw"
-                      "vw_scanw" "vwscanw")
+  ; format-ignore
+  (#any-of? @_function 
+    "fprintf" "fprintf_s"
+    "sprintf"
+    "dprintf"
+    "fscanf" "fscanf_s"
+    "sscanf" "sscanf_s"
+    "vsscanf" "vsscanf_s"
+    "vfprintf" "vfprintf_s"
+    "vsprintf"
+    "vdprintf"
+    "fwprintf" "fwprintf_s"
+    "vfwprintf" "vfwprintf_s"
+    "fwscanf" "fwscanf_s"
+    "swscanf" "swscanf_s"
+    "vswscanf" "vswscanf_s"
+    "vfscanf" "vfscanf_s"
+    "vfwscanf" "vfwscanf_s"
+    "wprintw"
+    "vw_printw" "vwprintw"
+    "wscanw"
+    "vw_scanw" "vwscanw")
  (#set! injection.language "printf"))
 
 ((call_expression
   function: (identifier) @_function
   arguments: (argument_list
                (_) . (_) . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "sprintf_s"
-                      "snprintf" "snprintf_s"
-                      "vsprintf_s"
-                      "vsnprintf" "vsnprintf_s"
-                      "swprintf" "swprintf_s"
-                      "snwprintf_s"
-                      "vswprintf" "vswprintf_s"
-                      "vsnwprintf_s"
-                      "mvprintw"
-                      "mvscanw")
+  ; format-ignore
+  (#any-of? @_function 
+    "sprintf_s"
+    "snprintf" "snprintf_s"
+    "vsprintf_s"
+    "vsnprintf" "vsnprintf_s"
+    "swprintf" "swprintf_s"
+    "snwprintf_s"
+    "vswprintf" "vswprintf_s"
+    "vsnwprintf_s"
+    "mvprintw"
+    "mvscanw")
  (#set! injection.language "printf"))
 
 ((call_expression
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index d0b0bf0cb..974a17c0a 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -67,19 +67,20 @@
 
 ; Builtin dynamic variables
 ((sym_lit) @variable.builtin
- (#any-of? @variable.builtin
-  "*agent*" "*allow-unresolved-vars*" "*assert*"
-  "*clojure-version*" "*command-line-args*"
-  "*compile-files*" "*compile-path*" "*compiler-options*"
-  "*data-readers*" "*default-data-reader-fn*"
-  "*err*" "*file*" "*flush-on-newline*" "*fn-loader*"
-  "*in*" "*math-context*" "*ns*" "*out*"
-  "*print-dup*" "*print-length*" "*print-level*"
-  "*print-meta*" "*print-namespace-maps*" "*print-readably*"
-  "*read-eval*" "*reader-resolver*"
-  "*source-path*" "*suppress-read*"
-  "*unchecked-math*" "*use-context-classloader*"
-  "*verbose-defrecords*" "*warn-on-reflection*"))
+  ; format-ignore
+  (#any-of? @variable.builtin
+    "*agent*" "*allow-unresolved-vars*" "*assert*"
+    "*clojure-version*" "*command-line-args*"
+    "*compile-files*" "*compile-path*" "*compiler-options*"
+    "*data-readers*" "*default-data-reader-fn*"
+    "*err*" "*file*" "*flush-on-newline*" "*fn-loader*"
+    "*in*" "*math-context*" "*ns*" "*out*"
+    "*print-dup*" "*print-length*" "*print-level*"
+    "*print-meta*" "*print-namespace-maps*" "*print-readably*"
+    "*read-eval*" "*reader-resolver*"
+    "*source-path*" "*suppress-read*"
+    "*unchecked-math*" "*use-context-classloader*"
+    "*verbose-defrecords*" "*warn-on-reflection*"))
 
 ; Builtin repl variables
 ((sym_lit) @variable.builtin
@@ -172,17 +173,18 @@
 ; Builtin macros
 ;; TODO: Do all these items belong here?
 ((sym_lit) @function.macro
- (#any-of? @function.macro
-  "." ".." "->" "->>" "amap" "areduce" "as->" "assert"
-  "binding" "bound-fn" "delay" "do" "dosync"
-  "doto" "extend-protocol" "extend-type"
-  "gen-class" "gen-interface" "io!" "lazy-cat"
-  "lazy-seq" "let" "letfn" "locking" "memfn" "monitor-enter"
-  "monitor-exit" "proxy" "proxy-super" "pvalues"
-  "refer-clojure" "reify" "set!" "some->" "some->>"
-  "time" "unquote" "unquote-splicing" "var" "vswap!"
-  "with-bindings" "with-in-str" "with-loading-context" "with-local-vars"
-  "with-open" "with-out-str" "with-precision" "with-redefs"))
+  ; format-ignore
+  (#any-of? @function.macro
+    "." ".." "->" "->>" "amap" "areduce" "as->" "assert"
+    "binding" "bound-fn" "delay" "do" "dosync"
+    "doto" "extend-protocol" "extend-type"
+    "gen-class" "gen-interface" "io!" "lazy-cat"
+    "lazy-seq" "let" "letfn" "locking" "memfn" "monitor-enter"
+    "monitor-exit" "proxy" "proxy-super" "pvalues"
+    "refer-clojure" "reify" "set!" "some->" "some->>"
+    "time" "unquote" "unquote-splicing" "var" "vswap!"
+    "with-bindings" "with-in-str" "with-loading-context" "with-local-vars"
+    "with-open" "with-out-str" "with-precision" "with-redefs"))
 
 ; All builtin functions
 ; (->> (ns-publics *ns*)
@@ -191,128 +193,129 @@
 ;      clojure.pprint/pprint))
 ;; ...and then lots of manual filtering...
 ((sym_lit) @function.builtin
- (#any-of? @function.builtin
-  "->ArrayChunk" "->Eduction" "->Vec" "->VecNode" "->VecSeq"
-  "-cache-protocol-fn" "-reset-methods" "PrintWriter-on"
-  "StackTraceElement->vec" "Throwable->map" "accessor"
-  "aclone" "add-classpath" "add-tap" "add-watch" "agent"
-  "agent-error" "agent-errors" "aget" "alength" "alias"
-  "all-ns" "alter" "alter-meta!" "alter-var-root" "ancestors"
-  "any?" "apply" "array-map" "aset" "aset-boolean" "aset-byte"
-  "aset-char" "aset-double" "aset-float" "aset-int"
-  "aset-long" "aset-short" "assoc" "assoc!" "assoc-in"
-  "associative?" "atom" "bases" "bean" "bigdec" "bigint" "biginteger"
-  "bit-and" "bit-and-not" "bit-clear" "bit-flip" "bit-not" "bit-or"
-  "bit-set" "bit-shift-left" "bit-shift-right" "bit-test"
-  "bit-xor" "boolean" "boolean-array" "boolean?"
-  "booleans" "bound-fn*" "bound?" "bounded-count"
-  "butlast" "byte" "byte-array" "bytes" "bytes?"
-  "cast" "cat" "char" "char-array" "char-escape-string"
-  "char-name-string" "char?" "chars" "chunk" "chunk-append"
-  "chunk-buffer" "chunk-cons" "chunk-first" "chunk-next"
-  "chunk-rest" "chunked-seq?" "class" "class?"
-  "clear-agent-errors" "clojure-version" "coll?"
-  "commute" "comp" "comparator" "compare" "compare-and-set!"
-  "compile" "complement" "completing" "concat" "conj"
-  "conj!" "cons" "constantly" "construct-proxy" "contains?"
-  "count" "counted?" "create-ns" "create-struct" "cycle"
-  "dec" "dec'" "decimal?" "dedupe" "default-data-readers"
-  "delay?" "deliver" "denominator" "deref" "derive"
-  "descendants" "destructure" "disj" "disj!" "dissoc"
-  "dissoc!" "distinct" "distinct?" "doall" "dorun" "double"
-  "double-array" "eduction" "empty" "empty?" "ensure" "ensure-reduced"
-  "enumeration-seq" "error-handler" "error-mode" "eval"
-  "even?" "every-pred" "every?" "extend" "extenders" "extends?"
-  "false?" "ffirst" "file-seq" "filter" "filterv" "find"
-  "find-keyword" "find-ns" "find-protocol-impl"
-  "find-protocol-method" "find-var" "first" "flatten"
-  "float" "float-array" "float?" "floats" "flush" "fn?"
-  "fnext" "fnil" "force" "format" "frequencies"
-  "future-call" "future-cancel" "future-cancelled?"
-  "future-done?" "future?" "gensym" "get" "get-in"
-  "get-method" "get-proxy-class" "get-thread-bindings"
-  "get-validator" "group-by" "halt-when" "hash"
-  "hash-combine" "hash-map" "hash-ordered-coll" "hash-set"
-  "hash-unordered-coll" "ident?" "identical?" "identity"
-  "ifn?" "in-ns" "inc" "inc'" "indexed?" "init-proxy"
-  "inst-ms" "inst-ms*" "inst?" "instance?" "int" "int-array"
-  "int?" "integer?" "interleave" "intern" "interpose" "into"
-  "into-array" "ints" "isa?" "iterate" "iterator-seq" "juxt"
-  "keep" "keep-indexed" "key" "keys" "keyword" "keyword?"
-  "last" "line-seq" "list" "list*" "list?" "load" "load-file"
-  "load-reader" "load-string" "loaded-libs" "long" "long-array"
-  "longs" "macroexpand" "macroexpand-1" "make-array" "make-hierarchy"
-  "map" "map-entry?" "map-indexed" "map?" "mapcat" "mapv"
-  "max" "max-key" "memoize" "merge" "merge-with" "meta"
-  "method-sig" "methods" "min" "min-key" "mix-collection-hash"
-  "mod" "munge" "name" "namespace" "namespace-munge" "nat-int?"
-  "neg-int?" "neg?" "newline" "next" "nfirst" "nil?" "nnext"
-  "not-any?" "not-empty" "not-every?" "ns-aliases"
-  "ns-imports" "ns-interns" "ns-map" "ns-name" "ns-publics"
-  "ns-refers" "ns-resolve" "ns-unalias" "ns-unmap" "nth"
-  "nthnext" "nthrest" "num" "number?" "numerator" "object-array"
-  "odd?" "parents" "partial" "partition" "partition-all"
-  "partition-by" "pcalls" "peek" "persistent!" "pmap" "pop"
-  "pop!" "pop-thread-bindings" "pos-int?" "pos?" "pr"
-  "pr-str" "prefer-method" "prefers" "primitives-classnames"
-  "print" "print-ctor" "print-dup" "print-method" "print-simple"
-  "print-str" "printf" "println" "println-str" "prn" "prn-str"
-  "promise" "proxy-call-with-super" "proxy-mappings" "proxy-name"
-  "push-thread-bindings" "qualified-ident?" "qualified-keyword?"
-  "qualified-symbol?" "quot" "rand" "rand-int" "rand-nth" "random-sample"
-  "range" "ratio?" "rational?" "rationalize" "re-find" "re-groups"
-  "re-matcher" "re-matches" "re-pattern" "re-seq" "read"
-  "read+string" "read-line" "read-string" "reader-conditional"
-  "reader-conditional?" "realized?" "record?" "reduce"
-  "reduce-kv" "reduced" "reduced?" "reductions" "ref" "ref-history-count"
-  "ref-max-history" "ref-min-history" "ref-set" "refer"
-  "release-pending-sends" "rem" "remove" "remove-all-methods"
-  "remove-method" "remove-ns" "remove-tap" "remove-watch"
-  "repeat" "repeatedly" "replace" "replicate"
-  "requiring-resolve" "reset!" "reset-meta!" "reset-vals!"
-  "resolve" "rest" "restart-agent" "resultset-seq" "reverse"
-  "reversible?" "rseq" "rsubseq" "run!" "satisfies?"
-  "second" "select-keys" "send" "send-off" "send-via"
-  "seq" "seq?" "seqable?" "seque" "sequence" "sequential?"
-  "set" "set-agent-send-executor!" "set-agent-send-off-executor!"
-  "set-error-handler!" "set-error-mode!" "set-validator!"
-  "set?" "short" "short-array" "shorts" "shuffle"
-  "shutdown-agents" "simple-ident?" "simple-keyword?"
-  "simple-symbol?" "slurp" "some" "some-fn" "some?"
-  "sort" "sort-by" "sorted-map" "sorted-map-by"
-  "sorted-set" "sorted-set-by" "sorted?" "special-symbol?"
-  "spit" "split-at" "split-with" "str" "string?"
-  "struct" "struct-map" "subs" "subseq" "subvec" "supers"
-  "swap!" "swap-vals!" "symbol" "symbol?" "tagged-literal"
-  "tagged-literal?" "take" "take-last" "take-nth" "take-while"
-  "tap>" "test" "the-ns" "thread-bound?" "to-array"
-  "to-array-2d" "trampoline" "transduce" "transient"
-  "tree-seq" "true?" "type" "unchecked-add" "unchecked-add-int"
-  "unchecked-byte" "unchecked-char" "unchecked-dec"
-  "unchecked-dec-int" "unchecked-divide-int" "unchecked-double"
-  "unchecked-float" "unchecked-inc" "unchecked-inc-int"
-  "unchecked-int" "unchecked-long" "unchecked-multiply"
-  "unchecked-multiply-int" "unchecked-negate" "unchecked-negate-int"
-  "unchecked-remainder-int" "unchecked-short" "unchecked-subtract"
-  "unchecked-subtract-int" "underive" "unquote"
-  "unquote-splicing" "unreduced" "unsigned-bit-shift-right"
-  "update" "update-in" "update-proxy" "uri?" "uuid?"
-  "val" "vals" "var-get" "var-set" "var?" "vary-meta" "vec"
-  "vector" "vector-of" "vector?" "volatile!" "volatile?"
-  "vreset!" "with-bindings*" "with-meta" "with-redefs-fn" "xml-seq"
-  "zero?" "zipmap"
-  ;; earlier
-  "drop" "drop-last" "drop-while"
-  "double?" "doubles"
-  "ex-data" "ex-info"
-  ;; 1.10
-  "ex-cause" "ex-message"
-  ;; 1.11
-  "NaN?" "abs" "infinite?" "iteration" "random-uuid"
-  "parse-boolean" "parse-double" "parse-long" "parse-uuid"
-  "seq-to-map-for-destructuring" "update-keys" "update-vals"
-  ;; 1.12
-  "partitionv" "partitionv-all" "splitv-at"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    "->ArrayChunk" "->Eduction" "->Vec" "->VecNode" "->VecSeq"
+    "-cache-protocol-fn" "-reset-methods" "PrintWriter-on"
+    "StackTraceElement->vec" "Throwable->map" "accessor"
+    "aclone" "add-classpath" "add-tap" "add-watch" "agent"
+    "agent-error" "agent-errors" "aget" "alength" "alias"
+    "all-ns" "alter" "alter-meta!" "alter-var-root" "ancestors"
+    "any?" "apply" "array-map" "aset" "aset-boolean" "aset-byte"
+    "aset-char" "aset-double" "aset-float" "aset-int"
+    "aset-long" "aset-short" "assoc" "assoc!" "assoc-in"
+    "associative?" "atom" "bases" "bean" "bigdec" "bigint" "biginteger"
+    "bit-and" "bit-and-not" "bit-clear" "bit-flip" "bit-not" "bit-or"
+    "bit-set" "bit-shift-left" "bit-shift-right" "bit-test"
+    "bit-xor" "boolean" "boolean-array" "boolean?"
+    "booleans" "bound-fn*" "bound?" "bounded-count"
+    "butlast" "byte" "byte-array" "bytes" "bytes?"
+    "cast" "cat" "char" "char-array" "char-escape-string"
+    "char-name-string" "char?" "chars" "chunk" "chunk-append"
+    "chunk-buffer" "chunk-cons" "chunk-first" "chunk-next"
+    "chunk-rest" "chunked-seq?" "class" "class?"
+    "clear-agent-errors" "clojure-version" "coll?"
+    "commute" "comp" "comparator" "compare" "compare-and-set!"
+    "compile" "complement" "completing" "concat" "conj"
+    "conj!" "cons" "constantly" "construct-proxy" "contains?"
+    "count" "counted?" "create-ns" "create-struct" "cycle"
+    "dec" "dec'" "decimal?" "dedupe" "default-data-readers"
+    "delay?" "deliver" "denominator" "deref" "derive"
+    "descendants" "destructure" "disj" "disj!" "dissoc"
+    "dissoc!" "distinct" "distinct?" "doall" "dorun" "double"
+    "double-array" "eduction" "empty" "empty?" "ensure" "ensure-reduced"
+    "enumeration-seq" "error-handler" "error-mode" "eval"
+    "even?" "every-pred" "every?" "extend" "extenders" "extends?"
+    "false?" "ffirst" "file-seq" "filter" "filterv" "find"
+    "find-keyword" "find-ns" "find-protocol-impl"
+    "find-protocol-method" "find-var" "first" "flatten"
+    "float" "float-array" "float?" "floats" "flush" "fn?"
+    "fnext" "fnil" "force" "format" "frequencies"
+    "future-call" "future-cancel" "future-cancelled?"
+    "future-done?" "future?" "gensym" "get" "get-in"
+    "get-method" "get-proxy-class" "get-thread-bindings"
+    "get-validator" "group-by" "halt-when" "hash"
+    "hash-combine" "hash-map" "hash-ordered-coll" "hash-set"
+    "hash-unordered-coll" "ident?" "identical?" "identity"
+    "ifn?" "in-ns" "inc" "inc'" "indexed?" "init-proxy"
+    "inst-ms" "inst-ms*" "inst?" "instance?" "int" "int-array"
+    "int?" "integer?" "interleave" "intern" "interpose" "into"
+    "into-array" "ints" "isa?" "iterate" "iterator-seq" "juxt"
+    "keep" "keep-indexed" "key" "keys" "keyword" "keyword?"
+    "last" "line-seq" "list" "list*" "list?" "load" "load-file"
+    "load-reader" "load-string" "loaded-libs" "long" "long-array"
+    "longs" "macroexpand" "macroexpand-1" "make-array" "make-hierarchy"
+    "map" "map-entry?" "map-indexed" "map?" "mapcat" "mapv"
+    "max" "max-key" "memoize" "merge" "merge-with" "meta"
+    "method-sig" "methods" "min" "min-key" "mix-collection-hash"
+    "mod" "munge" "name" "namespace" "namespace-munge" "nat-int?"
+    "neg-int?" "neg?" "newline" "next" "nfirst" "nil?" "nnext"
+    "not-any?" "not-empty" "not-every?" "ns-aliases"
+    "ns-imports" "ns-interns" "ns-map" "ns-name" "ns-publics"
+    "ns-refers" "ns-resolve" "ns-unalias" "ns-unmap" "nth"
+    "nthnext" "nthrest" "num" "number?" "numerator" "object-array"
+    "odd?" "parents" "partial" "partition" "partition-all"
+    "partition-by" "pcalls" "peek" "persistent!" "pmap" "pop"
+    "pop!" "pop-thread-bindings" "pos-int?" "pos?" "pr"
+    "pr-str" "prefer-method" "prefers" "primitives-classnames"
+    "print" "print-ctor" "print-dup" "print-method" "print-simple"
+    "print-str" "printf" "println" "println-str" "prn" "prn-str"
+    "promise" "proxy-call-with-super" "proxy-mappings" "proxy-name"
+    "push-thread-bindings" "qualified-ident?" "qualified-keyword?"
+    "qualified-symbol?" "quot" "rand" "rand-int" "rand-nth" "random-sample"
+    "range" "ratio?" "rational?" "rationalize" "re-find" "re-groups"
+    "re-matcher" "re-matches" "re-pattern" "re-seq" "read"
+    "read+string" "read-line" "read-string" "reader-conditional"
+    "reader-conditional?" "realized?" "record?" "reduce"
+    "reduce-kv" "reduced" "reduced?" "reductions" "ref" "ref-history-count"
+    "ref-max-history" "ref-min-history" "ref-set" "refer"
+    "release-pending-sends" "rem" "remove" "remove-all-methods"
+    "remove-method" "remove-ns" "remove-tap" "remove-watch"
+    "repeat" "repeatedly" "replace" "replicate"
+    "requiring-resolve" "reset!" "reset-meta!" "reset-vals!"
+    "resolve" "rest" "restart-agent" "resultset-seq" "reverse"
+    "reversible?" "rseq" "rsubseq" "run!" "satisfies?"
+    "second" "select-keys" "send" "send-off" "send-via"
+    "seq" "seq?" "seqable?" "seque" "sequence" "sequential?"
+    "set" "set-agent-send-executor!" "set-agent-send-off-executor!"
+    "set-error-handler!" "set-error-mode!" "set-validator!"
+    "set?" "short" "short-array" "shorts" "shuffle"
+    "shutdown-agents" "simple-ident?" "simple-keyword?"
+    "simple-symbol?" "slurp" "some" "some-fn" "some?"
+    "sort" "sort-by" "sorted-map" "sorted-map-by"
+    "sorted-set" "sorted-set-by" "sorted?" "special-symbol?"
+    "spit" "split-at" "split-with" "str" "string?"
+    "struct" "struct-map" "subs" "subseq" "subvec" "supers"
+    "swap!" "swap-vals!" "symbol" "symbol?" "tagged-literal"
+    "tagged-literal?" "take" "take-last" "take-nth" "take-while"
+    "tap>" "test" "the-ns" "thread-bound?" "to-array"
+    "to-array-2d" "trampoline" "transduce" "transient"
+    "tree-seq" "true?" "type" "unchecked-add" "unchecked-add-int"
+    "unchecked-byte" "unchecked-char" "unchecked-dec"
+    "unchecked-dec-int" "unchecked-divide-int" "unchecked-double"
+    "unchecked-float" "unchecked-inc" "unchecked-inc-int"
+    "unchecked-int" "unchecked-long" "unchecked-multiply"
+    "unchecked-multiply-int" "unchecked-negate" "unchecked-negate-int"
+    "unchecked-remainder-int" "unchecked-short" "unchecked-subtract"
+    "unchecked-subtract-int" "underive" "unquote"
+    "unquote-splicing" "unreduced" "unsigned-bit-shift-right"
+    "update" "update-in" "update-proxy" "uri?" "uuid?"
+    "val" "vals" "var-get" "var-set" "var?" "vary-meta" "vec"
+    "vector" "vector-of" "vector?" "volatile!" "volatile?"
+    "vreset!" "with-bindings*" "with-meta" "with-redefs-fn" "xml-seq"
+    "zero?" "zipmap"
+    ;; earlier
+    "drop" "drop-last" "drop-while"
+    "double?" "doubles"
+    "ex-data" "ex-info"
+    ;; 1.10
+    "ex-cause" "ex-message"
+    ;; 1.11
+    "NaN?" "abs" "infinite?" "iteration" "random-uuid"
+    "parse-boolean" "parse-double" "parse-long" "parse-uuid"
+    "seq-to-map-for-destructuring" "update-keys" "update-vals"
+    ;; 1.12
+    "partitionv" "partitionv-all" "splitv-at"))
 
 
 
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index bdad657e3..13544661f 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -91,13 +91,15 @@
   (argument_list
     (argument) @keyword.operator
   )
-  (#any-of? @keyword.operator "NOT" "AND" "OR"
-                              "COMMAND" "POLICY" "TARGET" "TEST" "DEFINED" "IN_LIST"
-                              "EXISTS" "IS_NEWER_THAN" "IS_DIRECTORY" "IS_SYMLINK" "IS_ABSOLUTE"
-                              "MATCHES"
-                              "LESS" "GREATER" "EQUAL" "LESS_EQUAL" "GREATER_EQUAL"
-                              "STRLESS" "STRGREATER" "STREQUAL" "STRLESS_EQUAL" "STRGREATER_EQUAL"
-                              "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"
+  ; format-ignore
+  (#any-of? @keyword.operator 
+    "NOT" "AND" "OR"
+    "COMMAND" "POLICY" "TARGET" "TEST" "DEFINED" "IN_LIST"
+    "EXISTS" "IS_NEWER_THAN" "IS_DIRECTORY" "IS_SYMLINK" "IS_ABSOLUTE"
+    "MATCHES"
+    "LESS" "GREATER" "EQUAL" "LESS_EQUAL" "GREATER_EQUAL"
+    "STRLESS" "STRGREATER" "STREQUAL" "STRLESS_EQUAL" "STRGREATER_EQUAL"
+    "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"
   )
 )
 (elseif_command
@@ -105,13 +107,15 @@
   (argument_list
     (argument) @keyword.operator
   )
-  (#any-of? @keyword.operator "NOT" "AND" "OR"
-                              "COMMAND" "POLICY" "TARGET" "TEST" "DEFINED" "IN_LIST"
-                              "EXISTS" "IS_NEWER_THAN" "IS_DIRECTORY" "IS_SYMLINK" "IS_ABSOLUTE"
-                              "MATCHES"
-                              "LESS" "GREATER" "EQUAL" "LESS_EQUAL" "GREATER_EQUAL"
-                              "STRLESS" "STRGREATER" "STREQUAL" "STRLESS_EQUAL" "STRGREATER_EQUAL"
-                              "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"
+  ; format-ignore
+  (#any-of? @keyword.operator 
+    "NOT" "AND" "OR"
+    "COMMAND" "POLICY" "TARGET" "TEST" "DEFINED" "IN_LIST"
+    "EXISTS" "IS_NEWER_THAN" "IS_DIRECTORY" "IS_SYMLINK" "IS_ABSOLUTE"
+    "MATCHES"
+    "LESS" "GREATER" "EQUAL" "LESS_EQUAL" "GREATER_EQUAL"
+    "STRLESS" "STRGREATER" "STREQUAL" "STRLESS_EQUAL" "STRGREATER_EQUAL"
+    "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"
   )
 )
 
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 4c6501de6..42da34d0e 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -110,9 +110,10 @@
 (list_lit
  .
  (sym_lit) @function.macro
- ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
- (#any-of? @function.macro
-  "do*" "step" "handler-bind" "decf" "prog1" "destructuring-bind" "defconstant" "do" "lambda" "with-standard-io-syntax" "case" "restart-bind" "ignore-errors" "with-slots" "prog2" "defclass" "define-condition" "print-unreadable-object" "defvar" "when" "with-open-file" "prog" "incf" "declaim" "and" "loop-finish" "multiple-value-bind" "pop" "psetf" "defmacro" "with-open-stream" "define-modify-macro" "defsetf" "formatter" "call-method" "handler-case" "pushnew" "or" "with-hash-table-iterator" "ecase" "cond" "defun" "remf" "ccase" "define-compiler-macro" "dotimes" "multiple-value-list" "assert" "deftype" "with-accessors" "trace" "with-simple-restart" "do-symbols" "nth-value" "define-symbol-macro" "psetq" "rotatef" "dolist" "check-type" "multiple-value-setq" "push" "pprint-pop" "loop" "define-setf-expander" "pprint-exit-if-list-exhausted" "with-condition-restarts" "defstruct" "with-input-from-string" "with-compilation-unit" "defgeneric" "with-output-to-string" "untrace" "defparameter" "ctypecase" "do-external-symbols" "etypecase" "do-all-symbols" "with-package-iterator" "unless" "defmethod" "in-package" "defpackage" "return" "typecase" "shiftf" "setf" "pprint-logical-block" "time" "restart-case" "prog*" "define-method-combination" "optimize"))
+  ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
+  ; format-ignore
+  (#any-of? @function.macro
+    "do*" "step" "handler-bind" "decf" "prog1" "destructuring-bind" "defconstant" "do" "lambda" "with-standard-io-syntax" "case" "restart-bind" "ignore-errors" "with-slots" "prog2" "defclass" "define-condition" "print-unreadable-object" "defvar" "when" "with-open-file" "prog" "incf" "declaim" "and" "loop-finish" "multiple-value-bind" "pop" "psetf" "defmacro" "with-open-stream" "define-modify-macro" "defsetf" "formatter" "call-method" "handler-case" "pushnew" "or" "with-hash-table-iterator" "ecase" "cond" "defun" "remf" "ccase" "define-compiler-macro" "dotimes" "multiple-value-list" "assert" "deftype" "with-accessors" "trace" "with-simple-restart" "do-symbols" "nth-value" "define-symbol-macro" "psetq" "rotatef" "dolist" "check-type" "multiple-value-setq" "push" "pprint-pop" "loop" "define-setf-expander" "pprint-exit-if-list-exhausted" "with-condition-restarts" "defstruct" "with-input-from-string" "with-compilation-unit" "defgeneric" "with-output-to-string" "untrace" "defparameter" "ctypecase" "do-external-symbols" "etypecase" "do-all-symbols" "with-package-iterator" "unless" "defmethod" "in-package" "defpackage" "return" "typecase" "shiftf" "setf" "pprint-logical-block" "time" "restart-case" "prog*" "define-method-combination" "optimize"))
 
 ;; constant
 ((sym_lit) @constant
@@ -128,8 +129,9 @@
   .
   (sym_lit) @function.builtin
   ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
+  ; format-ignore
   (#any-of? @function.builtin
-   "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*" "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream" "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type" "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if" "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort" "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords" "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp" "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream" "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size" "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max" "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1" "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang" "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar" "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar" "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth" "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p" "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not" "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab" "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance" "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda" "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring" "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p" "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case" "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file" "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect" "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor" "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp" "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf" "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character" "alphanumericp" "find-method" "nintersection" "defclass" "define-condition" "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp" "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash" "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf" "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random" "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not" "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and" "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop" "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<=" "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize" "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read" "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble" "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output" "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr" "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method" "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value" "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type" "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst" "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<" "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator" "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character" "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase" "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension" "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code" "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host" "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second" "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp" "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval" "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or" "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp" "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte" "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep" "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall" "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if" "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete" "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr" "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport" "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth" "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value" "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn" "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<" "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort" "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring" "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim" "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-" "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length" "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*" "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion" "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output" "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array" "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet" "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if" "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod" "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe" "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>=" "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance" "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits" "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar" "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar" "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length" "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string" "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase" "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class" "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search" "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp" "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator" "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole" "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member" "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position" "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan" "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference" "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate" "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand" "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of" "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find" "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr" "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern" "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase" "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size" "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length" "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh" "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand" "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line" "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream" "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize" "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly" "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast"))
+    "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*" "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream" "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type" "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if" "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort" "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords" "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp" "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream" "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size" "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max" "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1" "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang" "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar" "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar" "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth" "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p" "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not" "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab" "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance" "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda" "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring" "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p" "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case" "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file" "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect" "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor" "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp" "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf" "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character" "alphanumericp" "find-method" "nintersection" "defclass" "define-condition" "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp" "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash" "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf" "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random" "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not" "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and" "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop" "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<=" "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize" "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read" "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble" "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output" "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr" "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method" "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value" "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type" "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst" "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<" "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator" "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character" "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase" "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension" "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code" "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host" "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second" "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp" "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval" "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or" "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp" "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte" "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep" "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall" "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if" "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete" "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr" "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport" "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth" "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value" "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn" "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<" "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort" "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring" "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim" "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-" "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length" "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*" "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion" "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output" "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array" "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet" "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if" "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod" "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe" "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>=" "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance" "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits" "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar" "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar" "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length" "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string" "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase" "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class" "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search" "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp" "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator" "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole" "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member" "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position" "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan" "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference" "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate" "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand" "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of" "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find" "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr" "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern" "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase" "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size" "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length" "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh" "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand" "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line" "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream" "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize" "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly" "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast"))
 
 (list_lit
  .
diff --git a/queries/elixir/locals.scm b/queries/elixir/locals.scm
index ae37b9ca8..59e55eae0 100644
--- a/queries/elixir/locals.scm
+++ b/queries/elixir/locals.scm
@@ -1,41 +1,21 @@
 ; References
 (identifier) @local.reference
+
 (alias) @local.reference
 
 ; Module Definitions
 (call
-  target: ((identifier) @_identifier (#eq? @_identifier "defmodule"))
-  (arguments (alias) @local.definition.type))
+  target: 
+    ((identifier) @_identifier
+      (#eq? @_identifier "defmodule"))
+  (arguments
+    (alias) @local.definition.type))
 
 ; Pattern Match Definitions
-(binary_operator left: [
-  (identifier) @local.definition.var
-  (_ (identifier) @local.definition.var)
-  (_ (_ (identifier) @local.definition.var))
-  (_ (_ (_ (identifier) @local.definition.var)))
-  (_ (_ (_ (_ (identifier) @local.definition.var))))
-  (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))
-  (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))
-  (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
-] operator: "=")
-
-; Stab Clause Definitions
-(stab_clause
-  left: [
-    (arguments [
+(binary_operator
+  ; format-ignore
+  left: 
+    [
       (identifier) @local.definition.var
       (_ (identifier) @local.definition.var)
       (_ (_ (identifier) @local.definition.var))
@@ -57,9 +37,15 @@
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
-    ])
-    (binary_operator
-      left: (arguments [
+    ]
+  operator: "=")
+; Stab Clause Definitions
+; format-ignore
+(stab_clause
+  left:
+    [
+     (arguments
+      [
         (identifier) @local.definition.var
         (_ (identifier) @local.definition.var)
         (_ (_ (identifier) @local.definition.var))
@@ -81,84 +67,131 @@
         (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
         (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
         (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
-  ]) operator: "when")
-])
+      ])
 
+    (binary_operator
+      left:
+        (arguments
+          ; format-ignore
+          [
+            (identifier) @local.definition.var
+            (_ (identifier) @local.definition.var)
+            (_ (_ (identifier) @local.definition.var))
+            (_ (_ (_ (identifier) @local.definition.var)))
+            (_ (_ (_ (_ (identifier) @local.definition.var))))
+            (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))
+            (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))
+            (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
+          ])
+      operator: "when")
+    ])
 ; Aliases
+; format-ignore
 (call
-  target: ((identifier) @_identifier (#any-of? @_identifier "require" "alias" "use" "import"))
-  (arguments [
-    (alias) @local.definition.import
-    (_ (alias) @local.definition.import)
-    (_ (_ (alias) @local.definition.import))
-    (_ (_ (_ (alias) @local.definition.import)))
-    (_ (_ (_ (_ (alias) @local.definition.import))))
-  ]
-))
+  target:
+    ((identifier) @_identifier
+      (#any-of? @_identifier "require" "alias" "use" "import"))
+  (arguments
+    [
+      (alias) @local.definition.import
+      (_ (alias) @local.definition.import)
+      (_ (_ (alias) @local.definition.import))
+      (_ (_ (_ (alias) @local.definition.import)))
+      (_ (_ (_ (_ (alias) @local.definition.import))))
+    ]))
 
 ; Local Function Definitions & Scopes
+; format-ignore
 (call
-  target: ((identifier) @_identifier (#any-of? @_identifier "def" "defp" "defmacro" "defmacrop" "defguard" "defguardp" "defn" "defnp" "for"))
-  (arguments [
-    (identifier) @local.definition.function
-    (binary_operator left: (identifier) @local.definition.function operator: "when")
-    (binary_operator (identifier) @local.definition.parameter)
-    (call target: (identifier) @local.definition.function (arguments [
-      (identifier) @local.definition.parameter
-      (_ (identifier) @local.definition.parameter)
-      (_ (_ (identifier) @local.definition.parameter))
-      (_ (_ (_ (identifier) @local.definition.parameter)))
-      (_ (_ (_ (_ (identifier) @local.definition.parameter))))
-      (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
-      (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
-      (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
-    ]))
-  ]?) (#set! definition.function.scope parent)
-  (do_block)?
-) @local.scope
-
+  target:
+    ((identifier) @_identifier
+      (#any-of? @_identifier "def" "defp" "defmacro" "defmacrop" "defguard" "defguardp" "defn" "defnp" "for"))
+  (arguments
+    [
+      (identifier) @local.definition.function
+      (binary_operator
+        left: (identifier) @local.definition.function
+        operator: "when")
+      (binary_operator
+        (identifier) @local.definition.parameter)
+      (call
+        target: (identifier) @local.definition.function
+        (arguments
+          [
+            (identifier) @local.definition.parameter
+            (_ (identifier) @local.definition.parameter)
+            (_ (_ (identifier) @local.definition.parameter))
+            (_ (_ (_ (identifier) @local.definition.parameter)))
+            (_ (_ (_ (_ (identifier) @local.definition.parameter))))
+            (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
+            (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
+            (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
+          ]))
+    ]?)
+  (#set! definition.function.scope parent)(do_block)?) @local.scope
 ; ExUnit Test Definitions & Scopes
+; format-ignore
 (call
-  target: ((identifier) @_identifier (#eq? @_identifier "test"))
-  (arguments [
-    (string)
-    ((string) . "," . [
-      (identifier) @local.definition.parameter
-      (_ (identifier) @local.definition.parameter)
-      (_ (_ (identifier) @local.definition.parameter))
-      (_ (_ (_ (identifier) @local.definition.parameter)))
-      (_ (_ (_ (_ (identifier) @local.definition.parameter))))
-      (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
-      (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
-      (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
-  ])
-]) (do_block)?) @local.scope
-
+  target:
+    ((identifier) @_identifier
+      (#eq? @_identifier "test"))
+  (arguments
+    [
+      (string)
+      ((string)
+        .
+        ","
+        .
+        [
+          (identifier) @local.definition.parameter
+          (_ (identifier) @local.definition.parameter)
+          (_ (_ (identifier) @local.definition.parameter))
+          (_ (_ (_ (identifier) @local.definition.parameter)))
+          (_ (_ (_ (_ (identifier) @local.definition.parameter))))
+          (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
+          (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
+          (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
+        ])
+    ])
+  (do_block)?) @local.scope
 ; Stab Clause Scopes
 (stab_clause) @local.scope
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 1b4edbc7e..21e0b8e0b 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -82,7 +82,7 @@
 
 ;; Match Pattern
 
-(underscore) @constant          ; The "_" pattern.
+(underscore) @constant         ; The "_" pattern.
 (pattern_open_ending) @operator ; The ".." pattern.
 
 ;; Alternations
@@ -179,21 +179,22 @@
 ;; Built-in Annotations
 
 ((annotation "@" @attribute (identifier) @attribute)
- (#any-of? @attribute
-  ; @GDScript
-  "export" "export_category" "export_color_no_alpha" "export_dir"
-  "export_enum" "export_exp_easing" "export_file" "export_flags"
-  "export_flags_2d_navigation" "export_flags_2d_physics"
-  "export_flags_2d_render" "export_flags_3d_navigation"
-  "export_flags_3d_physics" "export_flags_3d_render" "export_global_dir"
-  "export_global_file" "export_group" "export_multiline" "export_node_path"
-  "export_placeholder" "export_range" "export_subgroup" "icon" "onready"
-  "rpc" "tool" "warning_ignore"
- ))
+  ; format-ignore
+  (#any-of? @attribute
+    ; @GDScript
+    "export" "export_category" "export_color_no_alpha" "export_dir"
+    "export_enum" "export_exp_easing" "export_file" "export_flags"
+    "export_flags_2d_navigation" "export_flags_2d_physics"
+    "export_flags_2d_render" "export_flags_3d_navigation"
+    "export_flags_3d_physics" "export_flags_3d_render" "export_global_dir"
+    "export_global_file" "export_group" "export_multiline" "export_node_path"
+    "export_placeholder" "export_range" "export_subgroup" "icon" "onready"
+    "rpc" "tool" "warning_ignore"))
 
 ;; Builtin Types
 
 ([(identifier) (type)] @type.builtin
+  ; format-ignore
   (#any-of? @type.builtin
    ; from godot-vscode-plugin
    "Vector2" "Vector2i" "Vector3" "Vector3i"
@@ -222,122 +223,122 @@
 ;; Builtin Funcs
 
 (call (identifier) @function.builtin
-      (#any-of? @function.builtin
-       ; @GlobalScope
-       "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative"
-       "bezier_interpolate" "bytes_to_var" "bytes_to_var_with_objects" "ceil" "ceilf"
-       "ceili" "clamp" "clampf" "clampi" "cos" "cosh" "cubic_interpolate"
-       "cubic_interpolate_angle" "cubic_interpolate_angle_in_time"
-       "cubic_interpolate_in_time" "db_to_linear" "deg_to_rad" "ease" "error_string"
-       "exp" "floor" "floorf" "floori" "fmod" "fposmod" "hash" "instance_from_id"
-       "inverse_lerp" "is_equal_approx" "is_finite" "is_inf" "is_instance_id_valid"
-       "is_instance_valid" "is_nan" "is_same" "is_zero_approx" "lerp" "lerp_angle"
-       "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min" "minf" "mini"
-       "move_toward" "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich"
-       "print_verbose" "printerr" "printraw" "prints" "printt" "push_error"
-       "push_warning" "rad_to_deg" "rand_from_seed" "randf" "randf_range" "randfn"
-       "randi" "randi_range" "randomize" "remap" "rid_allocate_id" "rid_from_int64"
-       "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin" "sinh"
-       "smoothstep" "snapped" "snappedf" "snappedi" "sqrt" "step_decimals" "str"
-       "str_to_var" "tan" "tanh" "typeof" "var_to_bytes" "var_to_bytes_with_objects"
-       "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; @GlobalScope
+    "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative"
+    "bezier_interpolate" "bytes_to_var" "bytes_to_var_with_objects" "ceil" "ceilf"
+    "ceili" "clamp" "clampf" "clampi" "cos" "cosh" "cubic_interpolate"
+    "cubic_interpolate_angle" "cubic_interpolate_angle_in_time"
+    "cubic_interpolate_in_time" "db_to_linear" "deg_to_rad" "ease" "error_string"
+    "exp" "floor" "floorf" "floori" "fmod" "fposmod" "hash" "instance_from_id"
+    "inverse_lerp" "is_equal_approx" "is_finite" "is_inf" "is_instance_id_valid"
+    "is_instance_valid" "is_nan" "is_same" "is_zero_approx" "lerp" "lerp_angle"
+    "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min" "minf" "mini"
+    "move_toward" "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich"
+    "print_verbose" "printerr" "printraw" "prints" "printt" "push_error"
+    "push_warning" "rad_to_deg" "rand_from_seed" "randf" "randf_range" "randfn"
+    "randi" "randi_range" "randomize" "remap" "rid_allocate_id" "rid_from_int64"
+    "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin" "sinh"
+    "smoothstep" "snapped" "snappedf" "snappedi" "sqrt" "step_decimals" "str"
+    "str_to_var" "tan" "tanh" "typeof" "var_to_bytes" "var_to_bytes_with_objects"
+    "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
 
-       ; @GDScript
-       "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
-       "is_instance_of" "len" "print_debug" "print_stack" "range"
-       "type_exists"
-      ))
+    ; @GDScript
+    "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
+    "is_instance_of" "len" "print_debug" "print_stack" "range"
+    "type_exists"))
 
 ;; Builtin Constants
 
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin
-  ; @GDScript
-  "PI" "TAU" "INF" "NAN"
+  ; format-ignore
+  (#any-of? @constant.builtin
+    ; @GDScript
+    "PI" "TAU" "INF" "NAN"
 
-  ; @GlobalScope
-  "SIDE_LEFT" "SIDE_TOP" "SIDE_RIGHT" "SIDE_BOTTOM" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT" "CORNER_BOTTOM_RIGHT"
-  "CORNER_BOTTOM_LEFT" "VERTICAL" "HORIZONTAL" "CLOCKWISE" "COUNTERCLOCKWISE" "HORIZONTAL_ALIGNMENT_LEFT"
-  "HORIZONTAL_ALIGNMENT_CENTER" "HORIZONTAL_ALIGNMENT_RIGHT" "HORIZONTAL_ALIGNMENT_FILL" "VERTICAL_ALIGNMENT_TOP"
-  "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_FILL" "INLINE_ALIGNMENT_TOP_TO"
-  "INLINE_ALIGNMENT_CENTER_TO" "INLINE_ALIGNMENT_BASELINE_TO" "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_TO_TOP"
-  "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TOP"
-  "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_BOTTOM" "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK"
-  "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ" "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "KEY_NONE"
-  "KEY_SPECIAL" "KEY_ESCAPE" "KEY_TAB" "KEY_BACKTAB" "KEY_BACKSPACE" "KEY_ENTER" "KEY_KP_ENTER" "KEY_INSERT" "KEY_DELETE"
-  "KEY_PAUSE" "KEY_PRINT" "KEY_SYSREQ" "KEY_CLEAR" "KEY_HOME" "KEY_END" "KEY_LEFT" "KEY_UP" "KEY_RIGHT" "KEY_DOWN"
-  "KEY_PAGEUP" "KEY_PAGEDOWN" "KEY_SHIFT" "KEY_CTRL" "KEY_META" "KEY_ALT" "KEY_CAPSLOCK" "KEY_NUMLOCK" "KEY_SCROLLLOCK"
-  "KEY_F1" "KEY_F2" "KEY_F3" "KEY_F4" "KEY_F5" "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_F10" "KEY_F11" "KEY_F12"
-  "KEY_F13" "KEY_F14" "KEY_F15" "KEY_F16" "KEY_F17" "KEY_F18" "KEY_F19" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24"
-  "KEY_F25" "KEY_F26" "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33" "KEY_F34" "KEY_F35"
-  "KEY_KP_MULTIPLY" "KEY_KP_DIVIDE" "KEY_KP_SUBTRACT" "KEY_KP_PERIOD" "KEY_KP_ADD" "KEY_KP_0" "KEY_KP_1" "KEY_KP_2"
-  "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6" "KEY_KP_7" "KEY_KP_8" "KEY_KP_9" "KEY_MENU" "KEY_HYPER" "KEY_HELP"
-  "KEY_BACK" "KEY_FORWARD" "KEY_STOP" "KEY_REFRESH" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_MEDIAPLAY"
-  "KEY_MEDIASTOP" "KEY_MEDIAPREVIOUS" "KEY_MEDIANEXT" "KEY_MEDIARECORD" "KEY_HOMEPAGE" "KEY_FAVORITES" "KEY_SEARCH"
-  "KEY_STANDBY" "KEY_OPENURL" "KEY_LAUNCHMAIL" "KEY_LAUNCHMEDIA" "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3"
-  "KEY_LAUNCH4" "KEY_LAUNCH5" "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA" "KEY_LAUNCHB"
-  "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_UNKNOWN" "KEY_SPACE" "KEY_EXCLAM" "KEY_QUOTEDBL"
-  "KEY_NUMBERSIGN" "KEY_DOLLAR" "KEY_PERCENT" "KEY_AMPERSAND" "KEY_APOSTROPHE" "KEY_PARENLEFT" "KEY_PARENRIGHT"
-  "KEY_ASTERISK" "KEY_PLUS" "KEY_COMMA" "KEY_MINUS" "KEY_PERIOD" "KEY_SLASH" "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4"
-  "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9" "KEY_COLON" "KEY_SEMICOLON" "KEY_LESS" "KEY_EQUAL" "KEY_GREATER" "KEY_QUESTION"
-  "KEY_AT" "KEY_A" "KEY_B" "KEY_C" "KEY_D" "KEY_E" "KEY_F" "KEY_G" "KEY_H" "KEY_I" "KEY_J" "KEY_K" "KEY_L" "KEY_M"
-  "KEY_N" "KEY_O" "KEY_P" "KEY_Q" "KEY_R" "KEY_S" "KEY_T" "KEY_U" "KEY_V" "KEY_W" "KEY_X" "KEY_Y" "KEY_Z"
-  "KEY_BRACKETLEFT" "KEY_BACKSLASH" "KEY_BRACKETRIGHT" "KEY_ASCIICIRCUM" "KEY_UNDERSCORE" "KEY_QUOTELEFT" "KEY_BRACELEFT"
-  "KEY_BAR" "KEY_BRACERIGHT" "KEY_ASCIITILDE" "KEY_YEN" "KEY_SECTION" "KEY_GLOBE" "KEY_KEYBOARD" "KEY_JIS_EISU"
-  "KEY_JIS_KANA" "KEY_CODE_MASK" "KEY_MODIFIER_MASK" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_SHIFT" "KEY_MASK_ALT"
-  "KEY_MASK_META" "KEY_MASK_CTRL" "KEY_MASK_KPAD" "KEY_MASK_GROUP_SWITCH" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_LEFT"
-  "MOUSE_BUTTON_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_WHEEL_DOWN" "MOUSE_BUTTON_WHEEL_LEFT"
-  "MOUSE_BUTTON_WHEEL_RIGHT" "MOUSE_BUTTON_XBUTTON1" "MOUSE_BUTTON_XBUTTON2" "MOUSE_BUTTON_MASK_LEFT"
-  "MOUSE_BUTTON_MASK_RIGHT" "MOUSE_BUTTON_MASK_MIDDLE" "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2"
-  "JOY_BUTTON_INVALID" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_X" "JOY_BUTTON_Y" "JOY_BUTTON_BACK" "JOY_BUTTON_GUIDE"
-  "JOY_BUTTON_START" "JOY_BUTTON_LEFT_STICK" "JOY_BUTTON_RIGHT_STICK" "JOY_BUTTON_LEFT_SHOULDER"
-  "JOY_BUTTON_RIGHT_SHOULDER" "JOY_BUTTON_DPAD_UP" "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT"
-  "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2" "JOY_BUTTON_PADDLE3" "JOY_BUTTON_PADDLE4"
-  "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_MAX" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X" "JOY_AXIS_LEFT_Y"
-  "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y" "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_AXIS_SDL_MAX"
-  "JOY_AXIS_MAX" "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_AFTERTOUCH"
-  "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_CHANNEL_PRESSURE" "MIDI_MESSAGE_PITCH_BEND"
-  "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_QUARTER_FRAME" "MIDI_MESSAGE_SONG_POSITION_POINTER"
-  "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_TUNE_REQUEST" "MIDI_MESSAGE_TIMING_CLOCK" "MIDI_MESSAGE_START"
-  "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_STOP" "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_SYSTEM_RESET" "OK" "FAILED"
-  "ERR_UNAVAILABLE" "ERR_UNCONFIGURED" "ERR_UNAUTHORIZED" "ERR_PARAMETER_RANGE_ERROR" "ERR_OUT_OF_MEMORY"
-  "ERR_FILE_NOT_FOUND" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_NO_PERMISSION" "ERR_FILE_ALREADY_IN_USE"
-  "ERR_FILE_CANT_OPEN" "ERR_FILE_CANT_WRITE" "ERR_FILE_CANT_READ" "ERR_FILE_UNRECOGNIZED" "ERR_FILE_CORRUPT"
-  "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_EOF" "ERR_CANT_OPEN" "ERR_CANT_CREATE" "ERR_QUERY_FAILED"
-  "ERR_ALREADY_IN_USE" "ERR_LOCKED" "ERR_TIMEOUT" "ERR_CANT_CONNECT" "ERR_CANT_RESOLVE" "ERR_CONNECTION_ERROR"
-  "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_FORK" "ERR_INVALID_DATA" "ERR_INVALID_PARAMETER" "ERR_ALREADY_EXISTS"
-  "ERR_DOES_NOT_EXIST" "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE" "ERR_COMPILATION_FAILED" "ERR_METHOD_NOT_FOUND"
-  "ERR_LINK_FAILED" "ERR_SCRIPT_FAILED" "ERR_CYCLIC_LINK" "ERR_INVALID_DECLARATION" "ERR_DUPLICATE_SYMBOL"
-  "ERR_PARSE_ERROR" "ERR_BUSY" "ERR_SKIP" "ERR_HELP" "ERR_BUG" "ERR_PRINTER_ON_FIRE" "PROPERTY_HINT_NONE"
-  "PROPERTY_HINT_RANGE" "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
-  "PROPERTY_HINT_LINK" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_LAYERS_2D_RENDER" "PROPERTY_HINT_LAYERS_2D_PHYSICS"
-  "PROPERTY_HINT_LAYERS_2D_NAVIGATION" "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
-  "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_DIR" "PROPERTY_HINT_GLOBAL_FILE"
-  "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_RESOURCE_TYPE" "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_EXPRESSION"
-  "PROPERTY_HINT_PLACEHOLDER_TEXT" "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_TYPE_STRING"
-  "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_NODE_PATH_VALID_TYPES"
-  "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE" "PROPERTY_HINT_INT_IS_OBJECTID"
-  "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_ARRAY_TYPE" "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING"
-  "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_PASSWORD" "PROPERTY_HINT_MAX"
-  "PROPERTY_USAGE_NONE" "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_EDITOR" "PROPERTY_USAGE_INTERNAL"
-  "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_CATEGORY"
-  "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_CLASS_IS_BITFIELD" "PROPERTY_USAGE_NO_INSTANCE_STATE"
-  "PROPERTY_USAGE_RESTART_IF_CHANGED" "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_STORE_IF_NULL"
-  "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE" "PROPERTY_USAGE_CLASS_IS_ENUM"
-  "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_ALWAYS_DUPLICATE"
-  "PROPERTY_USAGE_NEVER_DUPLICATE" "PROPERTY_USAGE_HIGH_END_GFX" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT"
-  "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT" "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
-  "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_EDITOR_BASIC_SETTING" "PROPERTY_USAGE_READ_ONLY"
-  "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_NO_EDITOR" "METHOD_FLAG_NORMAL" "METHOD_FLAG_EDITOR" "METHOD_FLAG_CONST"
-  "METHOD_FLAG_VIRTUAL" "METHOD_FLAG_VARARG" "METHOD_FLAG_STATIC" "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAGS_DEFAULT"
-  "TYPE_NIL" "TYPE_BOOL" "TYPE_INT" "TYPE_FLOAT" "TYPE_STRING" "TYPE_VECTOR2" "TYPE_VECTOR2I" "TYPE_RECT2" "TYPE_RECT2I"
-  "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_TRANSFORM2D" "TYPE_VECTOR4" "TYPE_VECTOR4I" "TYPE_PLANE" "TYPE_QUATERNION"
-  "TYPE_AABB" "TYPE_BASIS" "TYPE_TRANSFORM3D" "TYPE_PROJECTION" "TYPE_COLOR" "TYPE_STRING_NAME" "TYPE_NODE_PATH"
-  "TYPE_RID" "TYPE_OBJECT" "TYPE_CALLABLE" "TYPE_SIGNAL" "TYPE_DICTIONARY" "TYPE_ARRAY" "TYPE_PACKED_BYTE_ARRAY"
-  "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY" "TYPE_PACKED_FLOAT64_ARRAY"
-  "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY" "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_MAX"
-  "OP_EQUAL" "OP_NOT_EQUAL" "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT"
-  "OP_MULTIPLY" "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
-  "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN" "OP_MAX"
- ))
+    ; @GlobalScope
+    "SIDE_LEFT" "SIDE_TOP" "SIDE_RIGHT" "SIDE_BOTTOM" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT" "CORNER_BOTTOM_RIGHT"
+    "CORNER_BOTTOM_LEFT" "VERTICAL" "HORIZONTAL" "CLOCKWISE" "COUNTERCLOCKWISE" "HORIZONTAL_ALIGNMENT_LEFT"
+    "HORIZONTAL_ALIGNMENT_CENTER" "HORIZONTAL_ALIGNMENT_RIGHT" "HORIZONTAL_ALIGNMENT_FILL" "VERTICAL_ALIGNMENT_TOP"
+    "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_FILL" "INLINE_ALIGNMENT_TOP_TO"
+    "INLINE_ALIGNMENT_CENTER_TO" "INLINE_ALIGNMENT_BASELINE_TO" "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_TO_TOP"
+    "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TOP"
+    "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_BOTTOM" "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK"
+    "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ" "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "KEY_NONE"
+    "KEY_SPECIAL" "KEY_ESCAPE" "KEY_TAB" "KEY_BACKTAB" "KEY_BACKSPACE" "KEY_ENTER" "KEY_KP_ENTER" "KEY_INSERT" "KEY_DELETE"
+    "KEY_PAUSE" "KEY_PRINT" "KEY_SYSREQ" "KEY_CLEAR" "KEY_HOME" "KEY_END" "KEY_LEFT" "KEY_UP" "KEY_RIGHT" "KEY_DOWN"
+    "KEY_PAGEUP" "KEY_PAGEDOWN" "KEY_SHIFT" "KEY_CTRL" "KEY_META" "KEY_ALT" "KEY_CAPSLOCK" "KEY_NUMLOCK" "KEY_SCROLLLOCK"
+    "KEY_F1" "KEY_F2" "KEY_F3" "KEY_F4" "KEY_F5" "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_F10" "KEY_F11" "KEY_F12"
+    "KEY_F13" "KEY_F14" "KEY_F15" "KEY_F16" "KEY_F17" "KEY_F18" "KEY_F19" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24"
+    "KEY_F25" "KEY_F26" "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33" "KEY_F34" "KEY_F35"
+    "KEY_KP_MULTIPLY" "KEY_KP_DIVIDE" "KEY_KP_SUBTRACT" "KEY_KP_PERIOD" "KEY_KP_ADD" "KEY_KP_0" "KEY_KP_1" "KEY_KP_2"
+    "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6" "KEY_KP_7" "KEY_KP_8" "KEY_KP_9" "KEY_MENU" "KEY_HYPER" "KEY_HELP"
+    "KEY_BACK" "KEY_FORWARD" "KEY_STOP" "KEY_REFRESH" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_MEDIAPLAY"
+    "KEY_MEDIASTOP" "KEY_MEDIAPREVIOUS" "KEY_MEDIANEXT" "KEY_MEDIARECORD" "KEY_HOMEPAGE" "KEY_FAVORITES" "KEY_SEARCH"
+    "KEY_STANDBY" "KEY_OPENURL" "KEY_LAUNCHMAIL" "KEY_LAUNCHMEDIA" "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3"
+    "KEY_LAUNCH4" "KEY_LAUNCH5" "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA" "KEY_LAUNCHB"
+    "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_UNKNOWN" "KEY_SPACE" "KEY_EXCLAM" "KEY_QUOTEDBL"
+    "KEY_NUMBERSIGN" "KEY_DOLLAR" "KEY_PERCENT" "KEY_AMPERSAND" "KEY_APOSTROPHE" "KEY_PARENLEFT" "KEY_PARENRIGHT"
+    "KEY_ASTERISK" "KEY_PLUS" "KEY_COMMA" "KEY_MINUS" "KEY_PERIOD" "KEY_SLASH" "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4"
+    "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9" "KEY_COLON" "KEY_SEMICOLON" "KEY_LESS" "KEY_EQUAL" "KEY_GREATER" "KEY_QUESTION"
+    "KEY_AT" "KEY_A" "KEY_B" "KEY_C" "KEY_D" "KEY_E" "KEY_F" "KEY_G" "KEY_H" "KEY_I" "KEY_J" "KEY_K" "KEY_L" "KEY_M"
+    "KEY_N" "KEY_O" "KEY_P" "KEY_Q" "KEY_R" "KEY_S" "KEY_T" "KEY_U" "KEY_V" "KEY_W" "KEY_X" "KEY_Y" "KEY_Z"
+    "KEY_BRACKETLEFT" "KEY_BACKSLASH" "KEY_BRACKETRIGHT" "KEY_ASCIICIRCUM" "KEY_UNDERSCORE" "KEY_QUOTELEFT" "KEY_BRACELEFT"
+    "KEY_BAR" "KEY_BRACERIGHT" "KEY_ASCIITILDE" "KEY_YEN" "KEY_SECTION" "KEY_GLOBE" "KEY_KEYBOARD" "KEY_JIS_EISU"
+    "KEY_JIS_KANA" "KEY_CODE_MASK" "KEY_MODIFIER_MASK" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_SHIFT" "KEY_MASK_ALT"
+    "KEY_MASK_META" "KEY_MASK_CTRL" "KEY_MASK_KPAD" "KEY_MASK_GROUP_SWITCH" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_LEFT"
+    "MOUSE_BUTTON_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_WHEEL_DOWN" "MOUSE_BUTTON_WHEEL_LEFT"
+    "MOUSE_BUTTON_WHEEL_RIGHT" "MOUSE_BUTTON_XBUTTON1" "MOUSE_BUTTON_XBUTTON2" "MOUSE_BUTTON_MASK_LEFT"
+    "MOUSE_BUTTON_MASK_RIGHT" "MOUSE_BUTTON_MASK_MIDDLE" "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2"
+    "JOY_BUTTON_INVALID" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_X" "JOY_BUTTON_Y" "JOY_BUTTON_BACK" "JOY_BUTTON_GUIDE"
+    "JOY_BUTTON_START" "JOY_BUTTON_LEFT_STICK" "JOY_BUTTON_RIGHT_STICK" "JOY_BUTTON_LEFT_SHOULDER"
+    "JOY_BUTTON_RIGHT_SHOULDER" "JOY_BUTTON_DPAD_UP" "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT"
+    "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2" "JOY_BUTTON_PADDLE3" "JOY_BUTTON_PADDLE4"
+    "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_MAX" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X" "JOY_AXIS_LEFT_Y"
+    "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y" "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_AXIS_SDL_MAX"
+    "JOY_AXIS_MAX" "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_AFTERTOUCH"
+    "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_CHANNEL_PRESSURE" "MIDI_MESSAGE_PITCH_BEND"
+    "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_QUARTER_FRAME" "MIDI_MESSAGE_SONG_POSITION_POINTER"
+    "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_TUNE_REQUEST" "MIDI_MESSAGE_TIMING_CLOCK" "MIDI_MESSAGE_START"
+    "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_STOP" "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_SYSTEM_RESET" "OK" "FAILED"
+    "ERR_UNAVAILABLE" "ERR_UNCONFIGURED" "ERR_UNAUTHORIZED" "ERR_PARAMETER_RANGE_ERROR" "ERR_OUT_OF_MEMORY"
+    "ERR_FILE_NOT_FOUND" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_NO_PERMISSION" "ERR_FILE_ALREADY_IN_USE"
+    "ERR_FILE_CANT_OPEN" "ERR_FILE_CANT_WRITE" "ERR_FILE_CANT_READ" "ERR_FILE_UNRECOGNIZED" "ERR_FILE_CORRUPT"
+    "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_EOF" "ERR_CANT_OPEN" "ERR_CANT_CREATE" "ERR_QUERY_FAILED"
+    "ERR_ALREADY_IN_USE" "ERR_LOCKED" "ERR_TIMEOUT" "ERR_CANT_CONNECT" "ERR_CANT_RESOLVE" "ERR_CONNECTION_ERROR"
+    "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_FORK" "ERR_INVALID_DATA" "ERR_INVALID_PARAMETER" "ERR_ALREADY_EXISTS"
+    "ERR_DOES_NOT_EXIST" "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE" "ERR_COMPILATION_FAILED" "ERR_METHOD_NOT_FOUND"
+    "ERR_LINK_FAILED" "ERR_SCRIPT_FAILED" "ERR_CYCLIC_LINK" "ERR_INVALID_DECLARATION" "ERR_DUPLICATE_SYMBOL"
+    "ERR_PARSE_ERROR" "ERR_BUSY" "ERR_SKIP" "ERR_HELP" "ERR_BUG" "ERR_PRINTER_ON_FIRE" "PROPERTY_HINT_NONE"
+    "PROPERTY_HINT_RANGE" "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
+    "PROPERTY_HINT_LINK" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_LAYERS_2D_RENDER" "PROPERTY_HINT_LAYERS_2D_PHYSICS"
+    "PROPERTY_HINT_LAYERS_2D_NAVIGATION" "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
+    "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_DIR" "PROPERTY_HINT_GLOBAL_FILE"
+    "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_RESOURCE_TYPE" "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_EXPRESSION"
+    "PROPERTY_HINT_PLACEHOLDER_TEXT" "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_TYPE_STRING"
+    "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_NODE_PATH_VALID_TYPES"
+    "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE" "PROPERTY_HINT_INT_IS_OBJECTID"
+    "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_ARRAY_TYPE" "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING"
+    "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_PASSWORD" "PROPERTY_HINT_MAX"
+    "PROPERTY_USAGE_NONE" "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_EDITOR" "PROPERTY_USAGE_INTERNAL"
+    "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_CATEGORY"
+    "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_CLASS_IS_BITFIELD" "PROPERTY_USAGE_NO_INSTANCE_STATE"
+    "PROPERTY_USAGE_RESTART_IF_CHANGED" "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_STORE_IF_NULL"
+    "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE" "PROPERTY_USAGE_CLASS_IS_ENUM"
+    "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_ALWAYS_DUPLICATE"
+    "PROPERTY_USAGE_NEVER_DUPLICATE" "PROPERTY_USAGE_HIGH_END_GFX" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT"
+    "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT" "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
+    "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_EDITOR_BASIC_SETTING" "PROPERTY_USAGE_READ_ONLY"
+    "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_NO_EDITOR" "METHOD_FLAG_NORMAL" "METHOD_FLAG_EDITOR" "METHOD_FLAG_CONST"
+    "METHOD_FLAG_VIRTUAL" "METHOD_FLAG_VARARG" "METHOD_FLAG_STATIC" "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAGS_DEFAULT"
+    "TYPE_NIL" "TYPE_BOOL" "TYPE_INT" "TYPE_FLOAT" "TYPE_STRING" "TYPE_VECTOR2" "TYPE_VECTOR2I" "TYPE_RECT2" "TYPE_RECT2I"
+    "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_TRANSFORM2D" "TYPE_VECTOR4" "TYPE_VECTOR4I" "TYPE_PLANE" "TYPE_QUATERNION"
+    "TYPE_AABB" "TYPE_BASIS" "TYPE_TRANSFORM3D" "TYPE_PROJECTION" "TYPE_COLOR" "TYPE_STRING_NAME" "TYPE_NODE_PATH"
+    "TYPE_RID" "TYPE_OBJECT" "TYPE_CALLABLE" "TYPE_SIGNAL" "TYPE_DICTIONARY" "TYPE_ARRAY" "TYPE_PACKED_BYTE_ARRAY"
+    "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY" "TYPE_PACKED_FLOAT64_ARRAY"
+    "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY" "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_MAX"
+    "OP_EQUAL" "OP_NOT_EQUAL" "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT"
+    "OP_MULTIPLY" "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
+    "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN" "OP_MAX"))
 
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index 5702a2b93..20d8cd618 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -1,11 +1,11 @@
 (
     (function_declaration
-        name: (identifier) @local.definition.function) ;@function 
+        name: (identifier) @local.definition.function) ; @function 
 )
 
 (
     (method_declaration
-        name: (field_identifier) @local.definition.method); @function.method
+        name: (field_identifier) @local.definition.method) ; @function.method
 )
 
 (short_var_declaration 
diff --git a/queries/hcl/highlights.scm b/queries/hcl/highlights.scm
index bb0de9816..7aa8b86fe 100644
--- a/queries/hcl/highlights.scm
+++ b/queries/hcl/highlights.scm
@@ -58,7 +58,7 @@
 
 [
   (quoted_template_start) ; "
-  (quoted_template_end); "
+  (quoted_template_end) ; "
   (template_literal) ; non-interpolation/directive content
 ] @string
 
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
index 804b6ee63..6b1d2bd96 100644
--- a/queries/ispc/highlights.scm
+++ b/queries/ispc/highlights.scm
@@ -92,134 +92,134 @@
 ((type_identifier) @type.builtin
   (#lua-match? @type.builtin "^RNGState"))
 
+; format-ignore
 (call_expression
   function: (identifier) @function.builtin
   (#any-of? @function.builtin
-   "abs"
-   "acos"
-   "all"
-   "alloca"
-   "and"
-   "any"
-   "aos_to_soa2"
-   "aos_to_soa3"
-   "aos_to_soa4"
-   "asin"
-   "assert"
-   "assume"
-   "atan"
-   "atan2"
-   "atomic_add_global"
-   "atomic_add_local"
-   "atomic_and_global"
-   "atomic_and_local"
-   "atomic_compare_exchange_global"
-   "atomic_compare_exchange_local"
-   "atomic_max_global"
-   "atomic_max_local"
-   "atomic_min_global"
-   "atomic_min_local"
-   "atomic_or_global"
-   "atomic_or_local"
-   "atomic_subtract_global"
-   "atomic_subtract_local"
-   "atomic_swap_global"
-   "atomic_swap_local"
-   "atomic_xor_global"
-   "atomic_xor_local"
-   "avg_down"
-   "avg_up"
-   "broadcast"
-   "ceil"
-   "clamp"
-   "clock"
-   "cos"
-   "count_leading_zeros"
-   "count_trailing_zeros"
-   "doublebits"
-   "exclusive_scan_add"
-   "exclusive_scan_and"
-   "exclusive_scan_or"
-   "exp"
-   "extract"
-   "fastmath"
-   "float16bits"
-   "floatbits"
-   "float_to_half"
-   "float_to_half_fast"
-   "float_to_srgb8"
-   "floor"
-   "frandom"
-   "frexp"
-   "half_to_float"
-   "half_to_float_fast"
-   "insert"
-   "intbits"
-   "invoke_sycl"
-   "isnan"
-   "ISPCAlloc"
-   "ISPCLaunch"
-   "ISPCSync"
-   "lanemask"
-   "ldexp"
-   "log"
-   "max"
-   "memcpy"
-   "memcpy64"
-   "memmove"
-   "memmove64"
-   "memory_barrier"
-   "memset"
-   "memset64"
-   "min"
-   "none"
-   "num_cores"
-   "or"
-   "packed_load_active"
-   "packed_store_active"
-   "packed_store_active2"
-   "packmask"
-   "popcnt"
-   "pow"
-   "prefetch_l1"
-   "prefetch_l2"
-   "prefetch_l3"
-   "prefetch_nt"
-   "prefetchw_l1"
-   "prefetchw_l2"
-   "prefetchw_l3"
-   "print"
-   "random"
-   "rcp"
-   "rcp_fast"
-   "rdrand"
-   "reduce_add"
-   "reduce_equal"
-   "reduce_max"
-   "reduce_min"
-   "rotate"
-   "round"
-   "rsqrt"
-   "rsqrt_fast"
-   "saturating_add"
-   "saturating_div"
-   "saturating_mul"
-   "saturating_sub"
-   "seed_rng"
-   "select"
-   "shift"
-   "shuffle"
-   "signbits"
-   "sign_extend"
-   "sin"
-   "sincos"
-   "soa_to_aos2"
-   "soa_to_aos3"
-   "soa_to_aos4"
-   "sqrt"
-   "streaming_load"
-   "streaming_load_uniform"
-   "streaming_store"
-   "tan"
-   "trunc"
-   ))
+    "abs"
+    "acos"
+    "all"
+    "alloca"
+    "and"
+    "any"
+    "aos_to_soa2"
+    "aos_to_soa3"
+    "aos_to_soa4"
+    "asin"
+    "assert"
+    "assume"
+    "atan"
+    "atan2"
+    "atomic_add_global"
+    "atomic_add_local"
+    "atomic_and_global"
+    "atomic_and_local"
+    "atomic_compare_exchange_global"
+    "atomic_compare_exchange_local"
+    "atomic_max_global"
+    "atomic_max_local"
+    "atomic_min_global"
+    "atomic_min_local"
+    "atomic_or_global"
+    "atomic_or_local"
+    "atomic_subtract_global"
+    "atomic_subtract_local"
+    "atomic_swap_global"
+    "atomic_swap_local"
+    "atomic_xor_global"
+    "atomic_xor_local"
+    "avg_down"
+    "avg_up"
+    "broadcast"
+    "ceil"
+    "clamp"
+    "clock"
+    "cos"
+    "count_leading_zeros"
+    "count_trailing_zeros"
+    "doublebits"
+    "exclusive_scan_add"
+    "exclusive_scan_and"
+    "exclusive_scan_or"
+    "exp"
+    "extract"
+    "fastmath"
+    "float16bits"
+    "floatbits"
+    "float_to_half"
+    "float_to_half_fast"
+    "float_to_srgb8"
+    "floor"
+    "frandom"
+    "frexp"
+    "half_to_float"
+    "half_to_float_fast"
+    "insert"
+    "intbits"
+    "invoke_sycl"
+    "isnan"
+    "ISPCAlloc"
+    "ISPCLaunch"
+    "ISPCSync"
+    "lanemask"
+    "ldexp"
+    "log"
+    "max"
+    "memcpy"
+    "memcpy64"
+    "memmove"
+    "memmove64"
+    "memory_barrier"
+    "memset"
+    "memset64"
+    "min"
+    "none"
+    "num_cores"
+    "or"
+    "packed_load_active"
+    "packed_store_active"
+    "packed_store_active2"
+    "packmask"
+    "popcnt"
+    "pow"
+    "prefetch_l1"
+    "prefetch_l2"
+    "prefetch_l3"
+    "prefetch_nt"
+    "prefetchw_l1"
+    "prefetchw_l2"
+    "prefetchw_l3"
+    "print"
+    "random"
+    "rcp"
+    "rcp_fast"
+    "rdrand"
+    "reduce_add"
+    "reduce_equal"
+    "reduce_max"
+    "reduce_min"
+    "rotate"
+    "round"
+    "rsqrt"
+    "rsqrt_fast"
+    "saturating_add"
+    "saturating_div"
+    "saturating_mul"
+    "saturating_sub"
+    "seed_rng"
+    "select"
+    "shift"
+    "shuffle"
+    "signbits"
+    "sign_extend"
+    "sin"
+    "sincos"
+    "soa_to_aos2"
+    "soa_to_aos3"
+    "soa_to_aos4"
+    "sqrt"
+    "streaming_load"
+    "streaming_load_uniform"
+    "streaming_store"
+    "tan"
+    "trunc"))
diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 25ce38635..c1408ec68 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -57,51 +57,53 @@
 ;;       (print name))))
 
 ((sym_lit) @function.macro
- (#any-of? @function.macro
-  ;; special forms
-  "break"
-  "def" "do"
-  "fn"
-  "if"
-  "quasiquote" "quote"
-  "set" "splice"
-  "unquote" "upscope"
-  "var"
-  "while"
-  ;; macros
-  "%=" "*="
-  "++" "+="
-  "--" "-="
-  "->" "->>" "-?>" "-?>>"
-  "/="
-  "and" "as->" "as-macro" "as?->" "assert"
-  "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen"
-  "cond" "coro"
-  "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
-  "defn" "defn-"
-  "delay" "doc"
-  "each" "eachk" "eachp"
-  "eachy" ;; XXX: obsolete
-  "edefer"
-  "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
-  "ev/with-deadline"
-  "ffi/defbind"
-  "fiber-fn"
-  "for" "forever" "forv"
-  "generate"
-  "if-let" "if-not" "if-with" "import"
-  "juxt"
-  "label" "let" "loop"
-  "match"
-  "or"
-  "prompt" "protect"
-  "repeat"
-  "seq" "short-fn"
-  "tabseq" "toggle" "tracev" "try"
-  "unless" "use"
-  "var-" "varfn"
-  "when" "when-let" "when-with"
-  "with" "with-dyns" "with-syms" "with-vars"))
+  ; format-ignore
+  (#any-of? @function.macro
+    ; special forms
+    "break"
+    "def" "do"
+    "fn"
+    "if"
+    "quasiquote" "quote"
+    "set" "splice"
+    "unquote" "upscope"
+    "var"
+    "while"
+    ; macros
+    "%=" "*="
+    "++" "+="
+    "--" "-="
+    "->" "->>" "-?>" "-?>>"
+    "/="
+    "and" "as->" "as-macro" "as?->" "assert"
+    "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen"
+    "cond" "coro"
+    "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
+    "defn" "defn-"
+    "delay" "doc"
+    "each" "eachk" "eachp"
+    "eachy" 
+    ; XXX: obsolete
+    "edefer"
+    "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
+    "ev/with-deadline"
+    "ffi/defbind"
+    "fiber-fn"
+    "for" "forever" "forv"
+    "generate"
+    "if-let" "if-not" "if-with" "import"
+    "juxt"
+    "label" "let" "loop"
+    "match"
+    "or"
+    "prompt" "protect"
+    "repeat"
+    "seq" "short-fn"
+    "tabseq" "toggle" "tracev" "try"
+    "unless" "use"
+    "var-" "varfn"
+    "when" "when-let" "when-with"
+    "with" "with-dyns" "with-syms" "with-vars"))
 
 ;; All builtin functions
 ;;
@@ -113,189 +115,190 @@
 ;;       (print name))))
 
 ((sym_lit) @function.builtin
- (#any-of? @function.builtin
-  "%" "*" "+" "-" "/"
-  "<" "<=" "=" ">" ">="
-  ;; debugging -- start janet with -d and use (debug) to see these
-  ".break" ".breakall" ".bytecode"
-  ".clear" ".clearall"
-  ".disasm"
-  ".fiber" ".fn" ".frame"
-  ".locals"
-  ".next" ".nextc"
-  ".ppasm"
-  ".signal" ".slot" ".slots" ".source" ".stack" ".step"
-  ;; back to regularly scheduled program
-  "abstract?" "accumulate" "accumulate2" "all" "all-bindings"
-  "all-dynamics" "any?" "apply"
-  "array"
-  "array/clear" "array/concat" "array/ensure" "array/fill"
-  "array/insert" "array/new" "array/new-filled" "array/peek"
-  "array/pop" "array/push" "array/remove" "array/slice" "array/trim"
-  "array?"
-  "asm"
-  "bad-compile" "bad-parse"
-  "band" "blshift" "bnot"
-  "boolean?"
-  "bor" "brshift" "brushift"
-  "buffer"
-  "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
-  "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill"
-  "buffer/format" "buffer/new" "buffer/new-filled" "buffer/popn"
-  "buffer/push" "buffer/push-at" "buffer/push-byte"
-  "buffer/push-string" "buffer/push-word" "buffer/slice"
-  "buffer/trim"
-  "buffer?"
-  "bxor"
-  "bytes?"
-  "cancel"
-  "cfunction?"
-  "cli-main"
-  "cmp" "comp" "compare" "compare<" "compare<=" "compare="
-  "compare>" "compare>="
-  "compile" "complement" "count" "curenv"
-  "debug"
-  "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage"
-  "debug/stack" "debug/stacktrace" "debug/step" "debug/unbreak"
-  "debug/unfbreak"
-  "debugger" "debugger-on-status"
-  "dec" "deep-not=" "deep=" "defglobal" "describe"
-  "dictionary?"
-  "disasm" "distinct" "div" "doc*" "doc-format" "doc-of" "dofile"
-  "drop" "drop-until" "drop-while" "dyn"
-  "eflush" "empty?" "env-lookup"
-  "eprin" "eprinf" "eprint" "eprintf" "error" "errorf"
-  "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
-  "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan"
-  "ev/chan-close" "ev/chunk" "ev/close" "ev/count" "ev/deadline"
-  "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
-  "ev/read" "ev/release-lock" "ev/release-rlock"
-  "ev/release-wlock" "ev/rselect" "ev/rwlock" "ev/select"
-  "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write"
-  "eval" "eval-string" "even?" "every?" "extreme"
-  "false?"
-  "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
-  "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc"
-  "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction"
-  "ffi/read" "ffi/signature" "ffi/size" "ffi/struct"
-  "ffi/trampoline" "ffi/write"
-  "fiber/can-resume?" "fiber/current" "fiber/getenv"
-  "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
-  "fiber/setenv" "fiber/setmaxstack" "fiber/status"
-  "fiber?"
-  "file/close" "file/flush" "file/lines" "file/open" "file/read"
-  "file/seek" "file/tell" "file/temp" "file/write"
-  "filter" "find" "find-index" "first" "flatten" "flatten-into"
-  "flush" "flycheck" "freeze" "frequencies" "from-pairs"
-  "function?"
-  "gccollect" "gcinterval" "gcsetinterval"
-  "gensym" "get" "get-in" "getline" "getproto" "group-by"
-  "has-key?" "has-value?" "hash"
-  "idempotent?" "identity" "import*" "in" "inc" "index-of"
-  "indexed?"
-  "int/s64" "int/to-bytes" "int/to-number" "int/u64"
-  "int?"
-  "interleave" "interpose" "invert"
-  "juxt*"
-  "keep" "keep-syntax" "keep-syntax!" "keys"
-  "keyword"
-  "keyword/slice"
-  "keyword?"
-  "kvs"
-  "last" "length" "load-image"
-  "macex" "macex1" "maclintf"
-  "make-env" "make-image" "map" "mapcat" "marshal"
-  "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh"
-  "math/atan" "math/atan2" "math/atanh" "math/cbrt" "math/ceil"
-  "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
-  "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd"
-  "math/hypot" "math/lcm" "math/log" "math/log-gamma"
-  "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
-  "math/random" "math/rng" "math/rng-buffer" "math/rng-int"
-  "math/rng-uniform" "math/round" "math/seedrandom" "math/sin"
-  "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc"
-  "max" "max-of" "mean" "memcmp" "merge" "merge-into"
-  "merge-module" "min" "min-of" "mod"
-  "module/add-paths" "module/expand-path" "module/find"
-  "module/value"
-  "nan?" "nat?" "native" "neg?"
-  "net/accept" "net/accept-loop" "net/address"
-  "net/address-unpack" "net/chunk" "net/close" "net/connect"
-  "net/flush" "net/listen" "net/localname" "net/peername"
-  "net/read" "net/recv-from" "net/send-to" "net/server"
-  "net/setsockopt" "net/shutdown" "net/write"
-  "next"
-  "nil?"
-  "not" "not="
-  "number?"
-  "odd?" "one?"
-  "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
-  "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir"
-  "os/environ" "os/execute" "os/exit" "os/getenv" "os/link"
-  "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
-  "os/perm-string" "os/pipe" "os/proc-close" "os/proc-kill"
-  "os/proc-wait" "os/readlink" "os/realpath" "os/rename"
-  "os/rm" "os/rmdir" "os/setenv" "os/shell" "os/sleep"
-  "os/spawn" "os/stat" "os/symlink" "os/time" "os/touch"
-  "os/umask" "os/which"
-  "pairs"
-  "parse" "parse-all"
-  "parser/byte" "parser/clone" "parser/consume" "parser/eof"
-  "parser/error" "parser/flush" "parser/has-more"
-  "parser/insert" "parser/new" "parser/produce" "parser/state"
-  "parser/status" "parser/where"
-  "partial" "partition" "partition-by"
-  "peg/compile" "peg/find" "peg/find-all" "peg/match"
-  "peg/replace" "peg/replace-all"
-  "pos?" "postwalk" "pp" "prewalk"
-  "prin" "prinf" "print" "printf"
-  "product" "propagate" "put" "put-in"
-  "quit"
-  "range" "reduce" "reduce2" "repl" "require" "resume"
-  "return" "reverse" "reverse!" "run-context"
-  "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
-  "some" "sort" "sort-by" "sorted" "sorted-by" "spit"
-  "string"
-  "string/ascii-lower" "string/ascii-upper" "string/bytes"
-  "string/check-set" "string/find" "string/find-all"
-  "string/format" "string/from-bytes" "string/has-prefix?"
-  "string/has-suffix?" "string/join" "string/repeat"
-  "string/replace" "string/replace-all" "string/reverse"
-  "string/slice" "string/split" "string/trim" "string/triml"
-  "string/trimr"
-  "string?"
-  "struct"
-  "struct/getproto" "struct/proto-flatten" "struct/to-table"
-  "struct/with-proto"
-  "struct?"
-  "sum"
-  "symbol"
-  "symbol/slice"
-  "symbol?"
-  "table"
-  "table/clear" "table/clone" "table/getproto" "table/new"
-  "table/proto-flatten" "table/rawget" "table/setproto"
-  "table/to-struct"
-  "table?"
-  "take" "take-until" "take-while"
-  ;; XXX: obsolete
-  "tarray/buffer" "tarray/copy-bytes" "tarray/length"
-  "tarray/new" "tarray/properties" "tarray/slice"
-  "tarray/swap-bytes"
-  ;; XXX: obsolete
-  "thread/close" "thread/current" "thread/exit" "thread/new"
-  "thread/receive" "thread/send"
-  ;; end of obsolete
-  "trace" "true?" "truthy?"
-  "tuple"
-  "tuple/brackets" "tuple/setmap" "tuple/slice"
-  "tuple/sourcemap" "tuple/type"
-  "tuple?"
-  "type"
-  "unmarshal" "untrace" "update" "update-in"
-  "values" "varglobal"
-  "walk" "warn-compile"
-  "xprin" "xprinf" "xprint" "xprintf"
-  "yield"
-  "zero?" "zipcoll"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    "%" "*" "+" "-" "/"
+    "<" "<=" "=" ">" ">="
+    ; debugging -- start janet with -d and use (debug) to see these
+    ".break" ".breakall" ".bytecode"
+    ".clear" ".clearall"
+    ".disasm"
+    ".fiber" ".fn" ".frame"
+    ".locals"
+    ".next" ".nextc"
+    ".ppasm"
+    ".signal" ".slot" ".slots" ".source" ".stack" ".step"
+    ; back to regularly scheduled program
+    "abstract?" "accumulate" "accumulate2" "all" "all-bindings"
+    "all-dynamics" "any?" "apply"
+    "array"
+    "array/clear" "array/concat" "array/ensure" "array/fill"
+    "array/insert" "array/new" "array/new-filled" "array/peek"
+    "array/pop" "array/push" "array/remove" "array/slice" "array/trim"
+    "array?"
+    "asm"
+    "bad-compile" "bad-parse"
+    "band" "blshift" "bnot"
+    "boolean?"
+    "bor" "brshift" "brushift"
+    "buffer"
+    "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
+    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill"
+    "buffer/format" "buffer/new" "buffer/new-filled" "buffer/popn"
+    "buffer/push" "buffer/push-at" "buffer/push-byte"
+    "buffer/push-string" "buffer/push-word" "buffer/slice"
+    "buffer/trim"
+    "buffer?"
+    "bxor"
+    "bytes?"
+    "cancel"
+    "cfunction?"
+    "cli-main"
+    "cmp" "comp" "compare" "compare<" "compare<=" "compare="
+    "compare>" "compare>="
+    "compile" "complement" "count" "curenv"
+    "debug"
+    "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage"
+    "debug/stack" "debug/stacktrace" "debug/step" "debug/unbreak"
+    "debug/unfbreak"
+    "debugger" "debugger-on-status"
+    "dec" "deep-not=" "deep=" "defglobal" "describe"
+    "dictionary?"
+    "disasm" "distinct" "div" "doc*" "doc-format" "doc-of" "dofile"
+    "drop" "drop-until" "drop-while" "dyn"
+    "eflush" "empty?" "env-lookup"
+    "eprin" "eprinf" "eprint" "eprintf" "error" "errorf"
+    "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
+    "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan"
+    "ev/chan-close" "ev/chunk" "ev/close" "ev/count" "ev/deadline"
+    "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
+    "ev/read" "ev/release-lock" "ev/release-rlock"
+    "ev/release-wlock" "ev/rselect" "ev/rwlock" "ev/select"
+    "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write"
+    "eval" "eval-string" "even?" "every?" "extreme"
+    "false?"
+    "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
+    "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc"
+    "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction"
+    "ffi/read" "ffi/signature" "ffi/size" "ffi/struct"
+    "ffi/trampoline" "ffi/write"
+    "fiber/can-resume?" "fiber/current" "fiber/getenv"
+    "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
+    "fiber/setenv" "fiber/setmaxstack" "fiber/status"
+    "fiber?"
+    "file/close" "file/flush" "file/lines" "file/open" "file/read"
+    "file/seek" "file/tell" "file/temp" "file/write"
+    "filter" "find" "find-index" "first" "flatten" "flatten-into"
+    "flush" "flycheck" "freeze" "frequencies" "from-pairs"
+    "function?"
+    "gccollect" "gcinterval" "gcsetinterval"
+    "gensym" "get" "get-in" "getline" "getproto" "group-by"
+    "has-key?" "has-value?" "hash"
+    "idempotent?" "identity" "import*" "in" "inc" "index-of"
+    "indexed?"
+    "int/s64" "int/to-bytes" "int/to-number" "int/u64"
+    "int?"
+    "interleave" "interpose" "invert"
+    "juxt*"
+    "keep" "keep-syntax" "keep-syntax!" "keys"
+    "keyword"
+    "keyword/slice"
+    "keyword?"
+    "kvs"
+    "last" "length" "load-image"
+    "macex" "macex1" "maclintf"
+    "make-env" "make-image" "map" "mapcat" "marshal"
+    "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh"
+    "math/atan" "math/atan2" "math/atanh" "math/cbrt" "math/ceil"
+    "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
+    "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd"
+    "math/hypot" "math/lcm" "math/log" "math/log-gamma"
+    "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
+    "math/random" "math/rng" "math/rng-buffer" "math/rng-int"
+    "math/rng-uniform" "math/round" "math/seedrandom" "math/sin"
+    "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc"
+    "max" "max-of" "mean" "memcmp" "merge" "merge-into"
+    "merge-module" "min" "min-of" "mod"
+    "module/add-paths" "module/expand-path" "module/find"
+    "module/value"
+    "nan?" "nat?" "native" "neg?"
+    "net/accept" "net/accept-loop" "net/address"
+    "net/address-unpack" "net/chunk" "net/close" "net/connect"
+    "net/flush" "net/listen" "net/localname" "net/peername"
+    "net/read" "net/recv-from" "net/send-to" "net/server"
+    "net/setsockopt" "net/shutdown" "net/write"
+    "next"
+    "nil?"
+    "not" "not="
+    "number?"
+    "odd?" "one?"
+    "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
+    "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir"
+    "os/environ" "os/execute" "os/exit" "os/getenv" "os/link"
+    "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
+    "os/perm-string" "os/pipe" "os/proc-close" "os/proc-kill"
+    "os/proc-wait" "os/readlink" "os/realpath" "os/rename"
+    "os/rm" "os/rmdir" "os/setenv" "os/shell" "os/sleep"
+    "os/spawn" "os/stat" "os/symlink" "os/time" "os/touch"
+    "os/umask" "os/which"
+    "pairs"
+    "parse" "parse-all"
+    "parser/byte" "parser/clone" "parser/consume" "parser/eof"
+    "parser/error" "parser/flush" "parser/has-more"
+    "parser/insert" "parser/new" "parser/produce" "parser/state"
+    "parser/status" "parser/where"
+    "partial" "partition" "partition-by"
+    "peg/compile" "peg/find" "peg/find-all" "peg/match"
+    "peg/replace" "peg/replace-all"
+    "pos?" "postwalk" "pp" "prewalk"
+    "prin" "prinf" "print" "printf"
+    "product" "propagate" "put" "put-in"
+    "quit"
+    "range" "reduce" "reduce2" "repl" "require" "resume"
+    "return" "reverse" "reverse!" "run-context"
+    "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
+    "some" "sort" "sort-by" "sorted" "sorted-by" "spit"
+    "string"
+    "string/ascii-lower" "string/ascii-upper" "string/bytes"
+    "string/check-set" "string/find" "string/find-all"
+    "string/format" "string/from-bytes" "string/has-prefix?"
+    "string/has-suffix?" "string/join" "string/repeat"
+    "string/replace" "string/replace-all" "string/reverse"
+    "string/slice" "string/split" "string/trim" "string/triml"
+    "string/trimr"
+    "string?"
+    "struct"
+    "struct/getproto" "struct/proto-flatten" "struct/to-table"
+    "struct/with-proto"
+    "struct?"
+    "sum"
+    "symbol"
+    "symbol/slice"
+    "symbol?"
+    "table"
+    "table/clear" "table/clone" "table/getproto" "table/new"
+    "table/proto-flatten" "table/rawget" "table/setproto"
+    "table/to-struct"
+    "table?"
+    "take" "take-until" "take-while"
+    ; XXX: obsolete
+    "tarray/buffer" "tarray/copy-bytes" "tarray/length"
+    "tarray/new" "tarray/properties" "tarray/slice"
+    "tarray/swap-bytes"
+    ; XXX: obsolete
+    "thread/close" "thread/current" "thread/exit" "thread/new"
+    "thread/receive" "thread/send"
+    ; end of obsolete
+    "trace" "true?" "truthy?"
+    "tuple"
+    "tuple/brackets" "tuple/setmap" "tuple/slice"
+    "tuple/sourcemap" "tuple/type"
+    "tuple?"
+    "type"
+    "unmarshal" "untrace" "update" "update-in"
+    "values" "varglobal"
+    "walk" "warn-compile"
+    "xprin" "xprinf" "xprint" "xprintf"
+    "yield"
+    "zero?" "zipcoll"))
 
diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index 73fb386e3..8ce928eb8 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -1,3 +1,4 @@
+; format-ignore
 [
   ; ... refers to the portion that this indent query will have effects on
   (class_body)                        ; { ... } of `class X`
diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index 0e8758b6d..5de5f5ff5 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -70,6 +70,7 @@
   name: (identifier) @local.definition.parameter)
 (catch_formal_parameter
   name: (identifier) @local.definition.parameter)
+
 (inferred_parameters (identifier) @local.definition.parameter) ; (x,y) -> ...
 (lambda_expression
     parameters: (identifier) @local.definition.parameter) ; x -> ...
diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index e9967e95e..968ba87a0 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -59,197 +59,198 @@
 
 ; jq -n 'builtins | map(split("/")[0]) | unique | .[]'
 ((funcname) @function.builtin
- (#any-of? @function.builtin
-   "IN"
-   "INDEX"
-   "JOIN"
-   "acos"
-   "acosh"
-   "add"
-   "all"
-   "any"
-   "arrays"
-   "ascii_downcase"
-   "ascii_upcase"
-   "asin"
-   "asinh"
-   "atan"
-   "atan2"
-   "atanh"
-   "booleans"
-   "bsearch"
-   "builtins"
-   "capture"
-   "cbrt"
-   "ceil"
-   "combinations"
-   "contains"
-   "copysign"
-   "cos"
-   "cosh"
-   "debug"
-   "del"
-   "delpaths"
-   "drem"
-   "empty"
-   "endswith"
-   "env"
-   "erf"
-   "erfc"
-   "error"
-   "exp"
-   "exp10"
-   "exp2"
-   "explode"
-   "expm1"
-   "fabs"
-   "fdim"
-   "finites"
-   "first"
-   "flatten"
-   "floor"
-   "fma"
-   "fmax"
-   "fmin"
-   "fmod"
-   "format"
-   "frexp"
-   "from_entries"
-   "fromdate"
-   "fromdateiso8601"
-   "fromjson"
-   "fromstream"
-   "gamma"
-   "get_jq_origin"
-   "get_prog_origin"
-   "get_search_list"
-   "getpath"
-   "gmtime"
-   "group_by"
-   "gsub"
-   "halt"
-   "halt_error"
-   "has"
-   "hypot"
-   "implode"
-   "in"
-   "index"
-   "indices"
-   "infinite"
-   "input"
-   "input_filename"
-   "input_line_number"
-   "inputs"
-   "inside"
-   "isempty"
-   "isfinite"
-   "isinfinite"
-   "isnan"
-   "isnormal"
-   "iterables"
-   "j0"
-   "j1"
-   "jn"
-   "join"
-   "keys"
-   "keys_unsorted"
-   "last"
-   "ldexp"
-   "leaf_paths"
-   "length"
-   "lgamma"
-   "lgamma_r"
-   "limit"
-   "localtime"
-   "log"
-   "log10"
-   "log1p"
-   "log2"
-   "logb"
-   "ltrimstr"
-   "map"
-   "map_values"
-   "match"
-   "max"
-   "max_by"
-   "min"
-   "min_by"
-   "mktime"
-   "modf"
-   "modulemeta"
-   "nan"
-   "nearbyint"
-   "nextafter"
-   "nexttoward"
-   "normals"
-   "not"
-   "now"
-   "nth"
-   "nulls"
-   "numbers"
-   "objects"
-   "path"
-   "paths"
-   "pow"
-   "pow10"
-   "range"
-   "recurse"
-   "recurse_down"
-   "remainder"
-   "repeat"
-   "reverse"
-   "rindex"
-   "rint"
-   "round"
-   "rtrimstr"
-   "scalars"
-   "scalars_or_empty"
-   "scalb"
-   "scalbln"
-   "scan"
-   "select"
-   "setpath"
-   "significand"
-   "sin"
-   "sinh"
-   "sort"
-   "sort_by"
-   "split"
-   "splits"
-   "sqrt"
-   "startswith"
-   "stderr"
-   "strflocaltime"
-   "strftime"
-   "strings"
-   "strptime"
-   "sub"
-   "tan"
-   "tanh"
-   "test"
-   "tgamma"
-   "to_entries"
-   "todate"
-   "todateiso8601"
-   "tojson"
-   "tonumber"
-   "tostream"
-   "tostring"
-   "transpose"
-   "trunc"
-   "truncate_stream"
-   "type"
-   "unique"
-   "unique_by"
-   "until"
-   "utf8bytelength"
-   "values"
-   "walk"
-   "while"
-   "with_entries"
-   "y0"
-   "y1"
-   "yn"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    "IN"
+    "INDEX"
+    "JOIN"
+    "acos"
+    "acosh"
+    "add"
+    "all"
+    "any"
+    "arrays"
+    "ascii_downcase"
+    "ascii_upcase"
+    "asin"
+    "asinh"
+    "atan"
+    "atan2"
+    "atanh"
+    "booleans"
+    "bsearch"
+    "builtins"
+    "capture"
+    "cbrt"
+    "ceil"
+    "combinations"
+    "contains"
+    "copysign"
+    "cos"
+    "cosh"
+    "debug"
+    "del"
+    "delpaths"
+    "drem"
+    "empty"
+    "endswith"
+    "env"
+    "erf"
+    "erfc"
+    "error"
+    "exp"
+    "exp10"
+    "exp2"
+    "explode"
+    "expm1"
+    "fabs"
+    "fdim"
+    "finites"
+    "first"
+    "flatten"
+    "floor"
+    "fma"
+    "fmax"
+    "fmin"
+    "fmod"
+    "format"
+    "frexp"
+    "from_entries"
+    "fromdate"
+    "fromdateiso8601"
+    "fromjson"
+    "fromstream"
+    "gamma"
+    "get_jq_origin"
+    "get_prog_origin"
+    "get_search_list"
+    "getpath"
+    "gmtime"
+    "group_by"
+    "gsub"
+    "halt"
+    "halt_error"
+    "has"
+    "hypot"
+    "implode"
+    "in"
+    "index"
+    "indices"
+    "infinite"
+    "input"
+    "input_filename"
+    "input_line_number"
+    "inputs"
+    "inside"
+    "isempty"
+    "isfinite"
+    "isinfinite"
+    "isnan"
+    "isnormal"
+    "iterables"
+    "j0"
+    "j1"
+    "jn"
+    "join"
+    "keys"
+    "keys_unsorted"
+    "last"
+    "ldexp"
+    "leaf_paths"
+    "length"
+    "lgamma"
+    "lgamma_r"
+    "limit"
+    "localtime"
+    "log"
+    "log10"
+    "log1p"
+    "log2"
+    "logb"
+    "ltrimstr"
+    "map"
+    "map_values"
+    "match"
+    "max"
+    "max_by"
+    "min"
+    "min_by"
+    "mktime"
+    "modf"
+    "modulemeta"
+    "nan"
+    "nearbyint"
+    "nextafter"
+    "nexttoward"
+    "normals"
+    "not"
+    "now"
+    "nth"
+    "nulls"
+    "numbers"
+    "objects"
+    "path"
+    "paths"
+    "pow"
+    "pow10"
+    "range"
+    "recurse"
+    "recurse_down"
+    "remainder"
+    "repeat"
+    "reverse"
+    "rindex"
+    "rint"
+    "round"
+    "rtrimstr"
+    "scalars"
+    "scalars_or_empty"
+    "scalb"
+    "scalbln"
+    "scan"
+    "select"
+    "setpath"
+    "significand"
+    "sin"
+    "sinh"
+    "sort"
+    "sort_by"
+    "split"
+    "splits"
+    "sqrt"
+    "startswith"
+    "stderr"
+    "strflocaltime"
+    "strftime"
+    "strings"
+    "strptime"
+    "sub"
+    "tan"
+    "tanh"
+    "test"
+    "tgamma"
+    "to_entries"
+    "todate"
+    "todateiso8601"
+    "tojson"
+    "tonumber"
+    "tostream"
+    "tostring"
+    "transpose"
+    "trunc"
+    "truncate_stream"
+    "type"
+    "unique"
+    "unique_by"
+    "until"
+    "utf8bytelength"
+    "values"
+    "walk"
+    "while"
+    "with_entries"
+    "y0"
+    "y1"
+    "yn"))
 
 ; Keywords
 
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 20a154618..21ae1adb0 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -127,216 +127,217 @@
 ;;  type_names = sort(union(get_types(Core), get_types(Base)))
 ;;
 ((identifier) @type.builtin
- (#any-of? @type.builtin
-  "AbstractArray"
-  "AbstractChannel"
-  "AbstractChar"
-  "AbstractDict"
-  "AbstractDisplay"
-  "AbstractFloat"
-  "AbstractIrrational"
-  "AbstractLock"
-  "AbstractMatch"
-  "AbstractMatrix"
-  "AbstractPattern"
-  "AbstractRange"
-  "AbstractSet"
-  "AbstractSlices"
-  "AbstractString"
-  "AbstractUnitRange"
-  "AbstractVecOrMat"
-  "AbstractVector"
-  "Any"
-  "ArgumentError"
-  "Array"
-  "AssertionError"
-  "Atomic"
-  "BigFloat"
-  "BigInt"
-  "BitArray"
-  "BitMatrix"
-  "BitSet"
-  "BitVector"
-  "Bool"
-  "BoundsError"
-  "By"
-  "CanonicalIndexError"
-  "CapturedException"
-  "CartesianIndex"
-  "CartesianIndices"
-  "Cchar"
-  "Cdouble"
-  "Cfloat"
-  "Channel"
-  "Char"
-  "Cint"
-  "Cintmax_t"
-  "Clong"
-  "Clonglong"
-  "Cmd"
-  "Colon"
-  "ColumnSlices"
-  "Complex"
-  "ComplexF16"
-  "ComplexF32"
-  "ComplexF64"
-  "ComposedFunction"
-  "CompositeException"
-  "ConcurrencyViolationError"
-  "Condition"
-  "Cptrdiff_t"
-  "Cshort"
-  "Csize_t"
-  "Cssize_t"
-  "Cstring"
-  "Cuchar"
-  "Cuint"
-  "Cuintmax_t"
-  "Culong"
-  "Culonglong"
-  "Cushort"
-  "Cvoid"
-  "Cwchar_t"
-  "Cwstring"
-  "DataType"
-  "DenseArray"
-  "DenseMatrix"
-  "DenseVecOrMat"
-  "DenseVector"
-  "Dict"
-  "DimensionMismatch"
-  "Dims"
-  "DivideError"
-  "DomainError"
-  "EOFError"
-  "Enum"
-  "ErrorException"
-  "Exception"
-  "ExponentialBackOff"
-  "Expr"
-  "Float16"
-  "Float32"
-  "Float64"
-  "Function"
-  "GlobalRef"
-  "HTML"
-  "IO"
-  "IOBuffer"
-  "IOContext"
-  "IOStream"
-  "IdDict"
-  "IndexCartesian"
-  "IndexLinear"
-  "IndexStyle"
-  "InexactError"
-  "InitError"
-  "Int"
-  "Int128"
-  "Int16"
-  "Int32"
-  "Int64"
-  "Int8"
-  "Integer"
-  "InterruptException"
-  "InvalidStateException"
-  "Irrational"
-  "KeyError"
-  "LazyString"
-  "LinRange"
-  "LineNumberNode"
-  "LinearIndices"
-  "LoadError"
-  "Lt"
-  "MIME"
-  "Matrix"
-  "Method"
-  "MethodError"
-  "Missing"
-  "MissingException"
-  "Module"
-  "NTuple"
-  "NamedTuple"
-  "Nothing"
-  "Number"
-  "Ordering"
-  "OrdinalRange"
-  "OutOfMemoryError"
-  "OverflowError"
-  "Pair"
-  "ParseError"
-  "PartialQuickSort"
-  "Perm"
-  "PermutedDimsArray"
-  "Pipe"
-  "ProcessFailedException"
-  "Ptr"
-  "QuoteNode"
-  "Rational"
-  "RawFD"
-  "ReadOnlyMemoryError"
-  "Real"
-  "ReentrantLock"
-  "Ref"
-  "Regex"
-  "RegexMatch"
-  "Returns"
-  "ReverseOrdering"
-  "RoundingMode"
-  "RowSlices"
-  "SegmentationFault"
-  "Set"
-  "Signed"
-  "Slices"
-  "Some"
-  "SpinLock"
-  "StackFrame"
-  "StackOverflowError"
-  "StackTrace"
-  "Stateful"
-  "StepRange"
-  "StepRangeLen"
-  "StridedArray"
-  "StridedMatrix"
-  "StridedVecOrMat"
-  "StridedVector"
-  "String"
-  "StringIndexError"
-  "SubArray"
-  "SubString"
-  "SubstitutionString"
-  "Symbol"
-  "SystemError"
-  "Task"
-  "TaskFailedException"
-  "Text"
-  "TextDisplay"
-  "Timer"
-  "Tmstruct"
-  "Tuple"
-  "Type"
-  "TypeError"
-  "TypeVar"
-  "UInt"
-  "UInt128"
-  "UInt16"
-  "UInt32"
-  "UInt64"
-  "UInt8"
-  "UndefInitializer"
-  "UndefKeywordError"
-  "UndefRefError"
-  "UndefVarError"
-  "Union"
-  "UnionAll"
-  "UnitRange"
-  "Unsigned"
-  "Val"
-  "VecElement"
-  "VecOrMat"
-  "Vector"
-  "VersionNumber"
-  "WeakKeyDict"
-  "WeakRef"))
+  ; format-ignore
+  (#any-of? @type.builtin
+    "AbstractArray"
+    "AbstractChannel"
+    "AbstractChar"
+    "AbstractDict"
+    "AbstractDisplay"
+    "AbstractFloat"
+    "AbstractIrrational"
+    "AbstractLock"
+    "AbstractMatch"
+    "AbstractMatrix"
+    "AbstractPattern"
+    "AbstractRange"
+    "AbstractSet"
+    "AbstractSlices"
+    "AbstractString"
+    "AbstractUnitRange"
+    "AbstractVecOrMat"
+    "AbstractVector"
+    "Any"
+    "ArgumentError"
+    "Array"
+    "AssertionError"
+    "Atomic"
+    "BigFloat"
+    "BigInt"
+    "BitArray"
+    "BitMatrix"
+    "BitSet"
+    "BitVector"
+    "Bool"
+    "BoundsError"
+    "By"
+    "CanonicalIndexError"
+    "CapturedException"
+    "CartesianIndex"
+    "CartesianIndices"
+    "Cchar"
+    "Cdouble"
+    "Cfloat"
+    "Channel"
+    "Char"
+    "Cint"
+    "Cintmax_t"
+    "Clong"
+    "Clonglong"
+    "Cmd"
+    "Colon"
+    "ColumnSlices"
+    "Complex"
+    "ComplexF16"
+    "ComplexF32"
+    "ComplexF64"
+    "ComposedFunction"
+    "CompositeException"
+    "ConcurrencyViolationError"
+    "Condition"
+    "Cptrdiff_t"
+    "Cshort"
+    "Csize_t"
+    "Cssize_t"
+    "Cstring"
+    "Cuchar"
+    "Cuint"
+    "Cuintmax_t"
+    "Culong"
+    "Culonglong"
+    "Cushort"
+    "Cvoid"
+    "Cwchar_t"
+    "Cwstring"
+    "DataType"
+    "DenseArray"
+    "DenseMatrix"
+    "DenseVecOrMat"
+    "DenseVector"
+    "Dict"
+    "DimensionMismatch"
+    "Dims"
+    "DivideError"
+    "DomainError"
+    "EOFError"
+    "Enum"
+    "ErrorException"
+    "Exception"
+    "ExponentialBackOff"
+    "Expr"
+    "Float16"
+    "Float32"
+    "Float64"
+    "Function"
+    "GlobalRef"
+    "HTML"
+    "IO"
+    "IOBuffer"
+    "IOContext"
+    "IOStream"
+    "IdDict"
+    "IndexCartesian"
+    "IndexLinear"
+    "IndexStyle"
+    "InexactError"
+    "InitError"
+    "Int"
+    "Int128"
+    "Int16"
+    "Int32"
+    "Int64"
+    "Int8"
+    "Integer"
+    "InterruptException"
+    "InvalidStateException"
+    "Irrational"
+    "KeyError"
+    "LazyString"
+    "LinRange"
+    "LineNumberNode"
+    "LinearIndices"
+    "LoadError"
+    "Lt"
+    "MIME"
+    "Matrix"
+    "Method"
+    "MethodError"
+    "Missing"
+    "MissingException"
+    "Module"
+    "NTuple"
+    "NamedTuple"
+    "Nothing"
+    "Number"
+    "Ordering"
+    "OrdinalRange"
+    "OutOfMemoryError"
+    "OverflowError"
+    "Pair"
+    "ParseError"
+    "PartialQuickSort"
+    "Perm"
+    "PermutedDimsArray"
+    "Pipe"
+    "ProcessFailedException"
+    "Ptr"
+    "QuoteNode"
+    "Rational"
+    "RawFD"
+    "ReadOnlyMemoryError"
+    "Real"
+    "ReentrantLock"
+    "Ref"
+    "Regex"
+    "RegexMatch"
+    "Returns"
+    "ReverseOrdering"
+    "RoundingMode"
+    "RowSlices"
+    "SegmentationFault"
+    "Set"
+    "Signed"
+    "Slices"
+    "Some"
+    "SpinLock"
+    "StackFrame"
+    "StackOverflowError"
+    "StackTrace"
+    "Stateful"
+    "StepRange"
+    "StepRangeLen"
+    "StridedArray"
+    "StridedMatrix"
+    "StridedVecOrMat"
+    "StridedVector"
+    "String"
+    "StringIndexError"
+    "SubArray"
+    "SubString"
+    "SubstitutionString"
+    "Symbol"
+    "SystemError"
+    "Task"
+    "TaskFailedException"
+    "Text"
+    "TextDisplay"
+    "Timer"
+    "Tmstruct"
+    "Tuple"
+    "Type"
+    "TypeError"
+    "TypeVar"
+    "UInt"
+    "UInt128"
+    "UInt16"
+    "UInt32"
+    "UInt64"
+    "UInt8"
+    "UndefInitializer"
+    "UndefKeywordError"
+    "UndefRefError"
+    "UndefVarError"
+    "Union"
+    "UnionAll"
+    "UnitRange"
+    "Unsigned"
+    "Val"
+    "VecElement"
+    "VecOrMat"
+    "Vector"
+    "VersionNumber"
+    "WeakKeyDict"
+    "WeakRef"))
 
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "begin" "end")
diff --git a/queries/julia/locals.scm b/queries/julia/locals.scm
index dd00f8a9b..9e607cfd1 100644
--- a/queries/julia/locals.scm
+++ b/queries/julia/locals.scm
@@ -52,8 +52,9 @@
   parameter: (identifier) @local.definition.parameter
   (_))
 
+;; Single parameter arrow function
 (function_expression
- . (identifier) @local.definition.parameter) ;; Single parameter arrow function
+ . (identifier) @local.definition.parameter) 
 
 
 ;;; Function/macro definitions
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 0cb861596..ea87c0da0 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -220,8 +220,9 @@
 
 (function_call
   (identifier) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
-    ;; built-in functions in Lua 5.1
+    ; built-in functions in Lua 5.1
     "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
     "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
     "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 03e057dfe..2ce156574 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -67,14 +67,15 @@
       . 
       (string
         content: (_) @injection.content)
-      . (_) .) ; Limiting predicate handling to only functions with 4 arguments
+      . (_) 
+      .) ; Limiting predicate handling to only functions with 4 arguments
   (#eq? @_user_cmd "vim.api.nvim_buf_create_user_command")
   (#set! injection.language "vim"))
 
 ;; rhs highlighting for vim.keymap.set/vim.api.nvim_set_keymap/vim.api.nvim_buf_set_keymap
 ; (function_call
 ;   name: (_) @_map
-;   arguments: 
+;   arguments:
 ;     (arguments
 ;       . (_)
 ;       . (_)
@@ -86,7 +87,7 @@
 ;
 ; (function_call
 ;   name: (_) @_map
-;   arguments: 
+;   arguments:
 ;     (arguments
 ;       . (_)
 ;       . (_)
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 5fdfb5006..328401f26 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -184,8 +184,9 @@
 
 (function_call
   (identifier) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
-    ;; built-in functions in Lua 5.1
+    ; built-in functions in Lua 5.1
     "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
     "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
     "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index ff768a19d..6d7f4c2d7 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -23,6 +23,7 @@
   (arith_cmp_predicate)
 ] @keyword
 
+; format-ignore
 [
   "module"
   "unrealized_conversion_cast"
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 0f6caf4e2..bcabbbc65 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -98,18 +98,20 @@
 )
 
 ; builtin functions (without builtins prefix)
-(variable_expression name: (identifier) @function.builtin (#any-of? @function.builtin
-  ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "derivation" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
-  "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf" "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap" "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit" "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile" "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr" "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath" "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs" "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength" "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose" "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext" "unsafeGetAttrPos" "zipAttrsWith"
-  ; primops, `__<tab>` in `nix repl`
- "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt" "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath" "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames" "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring" "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs" "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match" "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath" "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr" "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf" "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime" "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir" "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem" "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort"
-))
+(variable_expression name: (identifier) @function.builtin 
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "derivation" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
+    "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf" "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap" "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit" "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile" "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr" "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath" "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs" "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength" "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose" "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext" "unsafeGetAttrPos" "zipAttrsWith"
+    ; primops, `__<tab>` in `nix repl`
+   "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt" "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath" "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames" "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring" "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs" "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match" "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath" "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr" "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf" "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime" "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir" "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem" "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort"))
 
 ; constants
-(variable_expression name: (identifier) @constant.builtin (#any-of? @constant.builtin
-  ; nix eval --impure --expr 'with builtins; filter (x: !(isFunction builtins.${x} || isBool builtins.${x})) (attrNames builtins)'
-  "builtins" "currentSystem" "currentTime" "langVersion" "nixPath" "nixVersion" "null" "storeDir"
-))
+(variable_expression name: (identifier) @constant.builtin 
+  ; format-ignore
+  (#any-of? @constant.builtin
+    ; nix eval --impure --expr 'with builtins; filter (x: !(isFunction builtins.${x} || isBool builtins.${x})) (attrNames builtins)'
+    "builtins" "currentSystem" "currentTime" "langVersion" "nixPath" "nixVersion" "null" "storeDir"))
 
 ; string interpolation (this was very annoying to get working properly)
 (interpolation "${" @punctuation.special (_) "}" @punctuation.special) @none
diff --git a/queries/ocaml/indents.scm b/queries/ocaml/indents.scm
index 48049dd0d..d821abbd7 100644
--- a/queries/ocaml/indents.scm
+++ b/queries/ocaml/indents.scm
@@ -1,3 +1,4 @@
+; format-ignore
 [ 
   (let_binding)                 ; let = ...
   (type_binding)
diff --git a/queries/pug/highlights.scm b/queries/pug/highlights.scm
index cdd9d1d83..7ac2c7c63 100644
--- a/queries/pug/highlights.scm
+++ b/queries/pug/highlights.scm
@@ -2,18 +2,19 @@
 
 (tag_name) @tag
 ((tag_name) @constant.builtin
- ; https://www.script-example.com/html-tag-liste
- (#any-of? @constant.builtin
-  "head" "title" "base" "link" "meta" "style"
-  "body" "article" "section" "nav" "aside" "h1" "h2" "h3" "h4" "h5" "h6" "hgroup" "header" "footer" "address"
-  "p" "hr" "pre" "blockquote" "ol" "ul" "menu" "li" "dl" "dt" "dd" "figure" "figcaption" "main" "div"
-  "a" "em" "strong" "small" "s" "cite" "q" "dfn" "abbr" "ruby" "rt" "rp" "data" "time" "code" "var" "samp" "kbd" "sub" "sup" "i" "b" "u" "mark" "bdi" "bdo" "span" "br" "wbr"
-  "ins" "del"
-  "picture" "source" "img" "iframe" "embed" "object" "param" "video" "audio" "track" "map" "area"
-  "table" "caption" "colgroup" "col" "tbody" "thead" "tfoot" "tr" "td" "th "
-  "form" "label" "input" "button" "select" "datalist" "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend"
-  "details" "summary" "dialog"
-  "script" "noscript" "template" "slot" "canvas"))
+  ; https://www.script-example.com/html-tag-liste
+  ; format-ignore
+  (#any-of? @constant.builtin
+    "head" "title" "base" "link" "meta" "style"
+    "body" "article" "section" "nav" "aside" "h1" "h2" "h3" "h4" "h5" "h6" "hgroup" "header" "footer" "address"
+    "p" "hr" "pre" "blockquote" "ol" "ul" "menu" "li" "dl" "dt" "dd" "figure" "figcaption" "main" "div"
+    "a" "em" "strong" "small" "s" "cite" "q" "dfn" "abbr" "ruby" "rt" "rp" "data" "time" "code" "var" "samp" "kbd" "sub" "sup" "i" "b" "u" "mark" "bdi" "bdo" "span" "br" "wbr"
+    "ins" "del"
+    "picture" "source" "img" "iframe" "embed" "object" "param" "video" "audio" "track" "map" "area"
+    "table" "caption" "colgroup" "col" "tbody" "thead" "tfoot" "tr" "td" "th "
+    "form" "label" "input" "button" "select" "datalist" "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend"
+    "details" "summary" "dialog"
+    "script" "noscript" "template" "slot" "canvas"))
 
 (id) @constant
 (class) @property
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 9ba1fcf14..8d272185c 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -17,15 +17,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin
-           ;; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
-           "Ellipsis"
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
+  ; format-ignore
+  (#any-of? @constant.builtin 
+    ; https://docs.python.org/3/library/constants.html
+    "NotImplemented" "Ellipsis" 
+    "quit" "exit" "copyright" "credits" "license"))
 
 "_" @constant.builtin ; match wildcard
 
@@ -336,22 +332,23 @@
  (#any-of? @constructor "__new__" "__init__"))
 
 ((identifier) @type.builtin
- (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
-              "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-              "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
-              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-              "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
-              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+  ; format-ignore
+  (#any-of? @type.builtin
+    ; https://docs.python.org/3/library/exceptions.html
+    "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+    "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
+    "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+    "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+    "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+    "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+    "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+    "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+    "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+    "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+    "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+    ; https://docs.python.org/3/library/stdtypes.html
+    "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+    "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 
 ;; Regex from the `re` module
 
diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index b3b2b0a88..d83a21427 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -32,18 +32,18 @@
 
 ((directive
    name: (type) @function.builtin)
- (#any-of?
-  @function.builtin
-  ; https://docutils.sourceforge.io/docs/ref/rst/directives.html
-  "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
-  "image" "figure"
-  "topic" "sidebar" "line-block" "parsed-literal" "code" "math" "rubric" "epigraph" "highlights" "pull-quote" "compound" "container"
-  "table" "csv-table" "list-table"
-  "contents" "sectnum" "section-numbering" "header" "footer"
-  "target-notes"
-  "meta"
-  "replace" "unicode" "date"
-  "raw" "class" "role" "default-role" "title" "restructuredtext-test-directive"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; https://docutils.sourceforge.io/docs/ref/rst/directives.html
+    "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
+    "image" "figure"
+    "topic" "sidebar" "line-block" "parsed-literal" "code" "math" "rubric" "epigraph" "highlights" "pull-quote" "compound" "container"
+    "table" "csv-table" "list-table"
+    "contents" "sectnum" "section-numbering" "header" "footer"
+    "target-notes"
+    "meta"
+    "replace" "unicode" "date"
+    "raw" "class" "role" "default-role" "title" "restructuredtext-test-directive"))
 
 ;; Blocks
 
@@ -89,26 +89,26 @@
 (role) @function
 
 ((role) @function.builtin
- (#any-of?
-  @function.builtin
-  ; https://docutils.sourceforge.io/docs/ref/rst/roles.html
-  ":emphasis:"
-  ":literal:"
-  ":code:"
-  ":math:"
-  ":pep-reference:"
-  ":PEP:"
-  ":rfc-reference:"
-  ":RFC:"
-  ":strong:"
-  ":subscript:"
-  ":sub:"
-  ":superscript:"
-  ":sup:"
-  ":title-reference:"
-  ":title:"
-  ":t:"
-  ":raw:"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; https://docutils.sourceforge.io/docs/ref/rst/roles.html
+    ":emphasis:"
+    ":literal:"
+    ":code:"
+    ":math:"
+    ":pep-reference:"
+    ":PEP:"
+    ":rfc-reference:"
+    ":RFC:"
+    ":strong:"
+    ":subscript:"
+    ":sub:"
+    ":superscript:"
+    ":sup:"
+    ":title-reference:"
+    ":title:"
+    ":t:"
+    ":raw:"))
 
 [
  "interpreted_text"
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
index f555920ba..fdd494d8b 100644
--- a/queries/scheme/highlights.scm
+++ b/queries/scheme/highlights.scm
@@ -104,79 +104,80 @@
 ;; procedures in R5RS and R6RS but not in R6RS-lib
 
 ((symbol) @function.builtin
- (#any-of? @function.builtin
-  ;; eq
-  "eqv?" "eq?" "equal?"
-  ;; number
-  "number?" "complex?" "real?" "rational?" "integer?"
-  "exact?" "inexact?"
-  "zero?" "positive?" "negative?" "odd?" "even?" "finite?" "infinite?" "nan?"
-  "max" "min"
-  "abs" "quotient" "remainder" "modulo"
-  "div" "div0" "mod" "mod0" "div-and-mod" "div0-and-mod0"
-  "gcd" "lcm" "numerator" "denominator"
-  "floor" "ceiling" "truncate" "round"
-  "rationalize"
-  "exp" "log" "sin" "cos" "tan" "asin" "acos" "atan"
-  "sqrt" "expt"
-  "exact-integer-sqrt"
-  "make-rectangular" "make-polar" "real-part" "imag-part" "magnitude" "angle"
-  "real-valued" "rational-valued?" "integer-valued?"
-  "exact" "inexact" "exact->inexact" "inexact->exact"
-  "number->string" "string->number"
-  ;; boolean
-  "boolean?" "not" "boolean=?"
-  ;; pair
-  "pair?" "cons" 
-  "car" "cdr" 
-  "caar" "cadr" "cdar" "cddr" 
-  "caaar" "caadr" "cadar" "caddr" "cdaar" "cdadr" "cddar" "cdddr"
-  "caaaar" "caaadr" "caadar" "caaddr" "cadaar" "cadadr" "caddar" "cadddr"
-  "cdaaar" "cdaadr" "cdadar" "cdaddr" "cddaar" "cddadr" "cdddar" "cddddr"
-  "set-car!" "set-cdr!"
-  ;; list
-  "null?" "list?"
-  "list" "length" "append" "reverse" "list-tail" "list-ref"
-  "map" "for-each"
-  "memq" "memv" "member" "assq" "assv" "assoc"
-  ;; symbol
-  "symbol?" "symbol->string" "string->symbol" "symbol=?"
-  ;; char
-  "char?" "char=?" "char<?" "char>?" "char<=?" "char>=?"
-  "char-ci=?" "char-ci<?" "char-ci>?" "char-ci<=?" "char-ci>=?"
-  "char-alphabetic?" "char-numeric?" "char-whitespace?" "char-upper-case?" "char-lower-case?"
-  "char->integer" "integer->char"
-  "char-upcase" "char-downcase"
-  ;; string
-  "string?" "make-string" "string" "string-length" "string-ref" "string-set!"
-  "string=?" "string-ci=?" "string<?" "string>?" "string<=?" "string>=?"
-  "string-ci<?" "string-ci>?" "string-ci<=?" "string-ci>=?"
-  "substring" "string-append" "string->list" "list->string"
-  "string-for-each"
-  "string-copy" "string-fill!"
-  "string-upcase" "string-downcase"
-  ;; vector
-  "vector?" "make-vector" "vector" "vector-length" "vector-ref" "vector-set!"
-  "vector->list" "list->vector" "vector-fill!" "vector-map" "vector-for-each"
-  ;; bytevector
-  "bytevector?" "native-endianness"
-  "make-bytevector" "bytevector-length" "bytevector=?" "bytevector-fill!"
-  "bytevector-copy!" "bytevector-copy"
-  ;; error
-  "error" "assertion-violation"
-  ;; control
-  "procedure?" "apply" "force"
-  "call-with-current-continuation" "call/cc"
-  "values" "call-with-values" "dynamic-wind"
-  "eval" "scheme-report-environment" "null-environment" "interaction-environment"
-  ;; IO
-  "call-with-input-file" "call-with-output-file" "input-port?" "output-port?"
-  "current-input-port" "current-output-port" "with-input-from-file" "with-output-to-file"
-  "open-input-file" "open-output-file" "close-input-port" "close-output-port"
-  ;; input
-  "read" "read-char" "peek-char" "eof-object?" "char-ready?"
-  ;; output
-  "write" "display" "newline" "write-char"
-  ;; system
-  "load" "transcript-on" "transcript-off"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; eq
+    "eqv?" "eq?" "equal?"
+    ; number
+    "number?" "complex?" "real?" "rational?" "integer?"
+    "exact?" "inexact?"
+    "zero?" "positive?" "negative?" "odd?" "even?" "finite?" "infinite?" "nan?"
+    "max" "min"
+    "abs" "quotient" "remainder" "modulo"
+    "div" "div0" "mod" "mod0" "div-and-mod" "div0-and-mod0"
+    "gcd" "lcm" "numerator" "denominator"
+    "floor" "ceiling" "truncate" "round"
+    "rationalize"
+    "exp" "log" "sin" "cos" "tan" "asin" "acos" "atan"
+    "sqrt" "expt"
+    "exact-integer-sqrt"
+    "make-rectangular" "make-polar" "real-part" "imag-part" "magnitude" "angle"
+    "real-valued" "rational-valued?" "integer-valued?"
+    "exact" "inexact" "exact->inexact" "inexact->exact"
+    "number->string" "string->number"
+    ; boolean
+    "boolean?" "not" "boolean=?"
+    ; pair
+    "pair?" "cons" 
+    "car" "cdr" 
+    "caar" "cadr" "cdar" "cddr" 
+    "caaar" "caadr" "cadar" "caddr" "cdaar" "cdadr" "cddar" "cdddr"
+    "caaaar" "caaadr" "caadar" "caaddr" "cadaar" "cadadr" "caddar" "cadddr"
+    "cdaaar" "cdaadr" "cdadar" "cdaddr" "cddaar" "cddadr" "cdddar" "cddddr"
+    "set-car!" "set-cdr!"
+    ; list
+    "null?" "list?"
+    "list" "length" "append" "reverse" "list-tail" "list-ref"
+    "map" "for-each"
+    "memq" "memv" "member" "assq" "assv" "assoc"
+    ; symbol
+    "symbol?" "symbol->string" "string->symbol" "symbol=?"
+    ; char
+    "char?" "char=?" "char<?" "char>?" "char<=?" "char>=?"
+    "char-ci=?" "char-ci<?" "char-ci>?" "char-ci<=?" "char-ci>=?"
+    "char-alphabetic?" "char-numeric?" "char-whitespace?" "char-upper-case?" "char-lower-case?"
+    "char->integer" "integer->char"
+    "char-upcase" "char-downcase"
+    ; string
+    "string?" "make-string" "string" "string-length" "string-ref" "string-set!"
+    "string=?" "string-ci=?" "string<?" "string>?" "string<=?" "string>=?"
+    "string-ci<?" "string-ci>?" "string-ci<=?" "string-ci>=?"
+    "substring" "string-append" "string->list" "list->string"
+    "string-for-each"
+    "string-copy" "string-fill!"
+    "string-upcase" "string-downcase"
+    ; vector
+    "vector?" "make-vector" "vector" "vector-length" "vector-ref" "vector-set!"
+    "vector->list" "list->vector" "vector-fill!" "vector-map" "vector-for-each"
+    ; bytevector
+    "bytevector?" "native-endianness"
+    "make-bytevector" "bytevector-length" "bytevector=?" "bytevector-fill!"
+    "bytevector-copy!" "bytevector-copy"
+    ; error
+    "error" "assertion-violation"
+    ; control
+    "procedure?" "apply" "force"
+    "call-with-current-continuation" "call/cc"
+    "values" "call-with-values" "dynamic-wind"
+    "eval" "scheme-report-environment" "null-environment" "interaction-environment"
+    ; IO
+    "call-with-input-file" "call-with-output-file" "input-port?" "output-port?"
+    "current-input-port" "current-output-port" "with-input-from-file" "with-output-to-file"
+    "open-input-file" "open-output-file" "close-input-port" "close-output-port"
+    ; input
+    "read" "read-char" "peek-char" "eof-object?" "char-ready?"
+    ; output
+    "write" "display" "newline" "write-char"
+    ; system
+    "load" "transcript-on" "transcript-off"))
 
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index 5fa20881c..e7ac9150e 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -158,6 +158,7 @@
    function: (global_variable "::" (_) @function.builtin)
    function: (deref_expression "." (_) @function.builtin)
   ]
+  ; format-ignore
   (#any-of? @function.builtin
    ; General Methods
    "assert" "array" "callee" "collectgarbage" "compilestring"
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 8d99963d5..9707632a5 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -17,15 +17,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin
-           ;; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
-           "Ellipsis"
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
+  ; format-ignore
+  (#any-of? @constant.builtin 
+    ; https://docs.python.org/3/library/constants.html
+    "NotImplemented" "Ellipsis" 
+    "quit" "exit" "copyright" "credits" "license"))
 
 ((attribute
     attribute: (identifier) @variable.member)
@@ -64,13 +60,14 @@
 ;; Builtin functions
 ((call
   function: (identifier) @function.builtin)
- (#any-of? @function.builtin
-          "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
-          "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "fail" "filter" "float" "format"
-          "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
-          "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
-          "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
-          "struct" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
+    "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "fail" "filter" "float" "format"
+    "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
+    "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
+    "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
+    "struct" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
 
 ;; Function definitions
 (function_definition
@@ -89,22 +86,23 @@
  (#eq? @_isinstance "isinstance"))
 
 ((identifier) @type.builtin
- (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
-              "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-              "EOFError" "FloatingPointError" "ModuleNotFoundError" "IndexError" "KeyError"
-              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-              "FutureWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
-              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
+  ; format-ignore
+  (#any-of? @type.builtin
+    ; https://docs.python.org/3/library/exceptions.html
+    "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+    "EOFError" "FloatingPointError" "ModuleNotFoundError" "IndexError" "KeyError"
+    "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+    "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+    "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+    "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+    "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+    "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+    "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+    "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+    "FutureWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+    ; https://docs.python.org/3/library/stdtypes.html
+    "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+    "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
 
 ;; Normal parameters
 (parameters
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 81a0d931b..336497839 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -73,7 +73,7 @@
 (call_expression (simple_identifier) @function.call) ; foo()
 (call_expression ; foo.bar.baz(): highlight the baz()
   (navigation_expression
-    (navigation_suffix (simple_identifier) @function.call)))
+    (navigation_suffix (simple_identifier) @function.call))) 
 (call_expression
   (prefix_expression (simple_identifier) @function.call)) ; .foo()
 ((navigation_expression
diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
index 39ad59405..63d1c9011 100644
--- a/queries/swift/indents.scm
+++ b/queries/swift/indents.scm
@@ -1,3 +1,4 @@
+; format-ignore
 [
   ; ... refers to the section that will get affected by this indent.begin capture
   (protocol_body)               ; protocol Foo { ... }
diff --git a/queries/usd/highlights.scm b/queries/usd/highlights.scm
index 6ba4ec98f..180b6d219 100644
--- a/queries/usd/highlights.scm
+++ b/queries/usd/highlights.scm
@@ -39,128 +39,125 @@
 
 (attribute_type) @type
 (
- ;; Reference: https://openusd.org/release/api/sdf_page_front.html
  (attribute_type) @type.builtin
- (#any-of? @type.builtin
-  ;; Scalar types
-  "asset" "asset[]"
-  "bool" "bool[]"
-  "double" "double[]"
-  "float" "float[]"
-  "half" "half[]"
-  "int" "int[]"
-  "int64" "int64[]"
-  "string" "string[]"
-  "timecode" "timecode[]"
-  "token" "token[]"
-  "uchar" "uchar[]"
-  "uint" "uint[]"
-  "uint64" "uint64[]"
+  ;format-ignore
+  (#any-of? @type.builtin
+    ;; Reference: https://openusd.org/release/api/sdf_page_front.html
+    ;; Scalar types
+    "asset" "asset[]"
+    "bool" "bool[]"
+    "double" "double[]"
+    "float" "float[]"
+    "half" "half[]"
+    "int" "int[]"
+    "int64" "int64[]"
+    "string" "string[]"
+    "timecode" "timecode[]"
+    "token" "token[]"
+    "uchar" "uchar[]"
+    "uint" "uint[]"
+    "uint64" "uint64[]"
 
-  ;; Dimensioned Types
-  "double2" "double2[]"
-  "double3" "double3[]"
-  "double4" "double4[]"
-  "float2" "float2[]"
-  "float3" "float3[]"
-  "float4" "float4[]"
-  "half2" "half2[]"
-  "half3" "half3[]"
-  "half4" "half4[]"
-  "int2" "int2[]"
-  "int3" "int3[]"
-  "int4" "int4[]"
-  "matrix2d" "matrix2d[]"
-  "matrix3d" "matrix3d[]"
-  "matrix4d" "matrix4d[]"
-  "quatd" "quatd[]"
-  "quatf" "quatf[]"
-  "quath" "quath[]"
+    ;; Dimensioned Types
+    "double2" "double2[]"
+    "double3" "double3[]"
+    "double4" "double4[]"
+    "float2" "float2[]"
+    "float3" "float3[]"
+    "float4" "float4[]"
+    "half2" "half2[]"
+    "half3" "half3[]"
+    "half4" "half4[]"
+    "int2" "int2[]"
+    "int3" "int3[]"
+    "int4" "int4[]"
+    "matrix2d" "matrix2d[]"
+    "matrix3d" "matrix3d[]"
+    "matrix4d" "matrix4d[]"
+    "quatd" "quatd[]"
+    "quatf" "quatf[]"
+    "quath" "quath[]"
 
-  ;; Extra Types
-  "color3f" "color3f[]"
-  "normal3f" "normal3f[]"
-  "point3f" "point3f[]"
-  "texCoord2f" "texCoord2f[]"
-  "vector3d" "vector3d[]"
-  "vector3f" "vector3f[]"
-  "vector3h" "vector3h[]"
+    ;; Extra Types
+    "color3f" "color3f[]"
+    "normal3f" "normal3f[]"
+    "point3f" "point3f[]"
+    "texCoord2f" "texCoord2f[]"
+    "vector3d" "vector3d[]"
+    "vector3f" "vector3f[]"
+    "vector3h" "vector3h[]"
 
-  "dictionary"
+    "dictionary"
 
-  ;; Deprecated Types
-  "EdgeIndex" "EdgeIndex[]"
-  "FaceIndex" "FaceIndex[]"
-  "Matrix4d" "Matrix4d[]"
-  "PointIndex" "PointIndex[]"
-  "PointFloat" "PointFloat[]"
-  "Transform" "Transform[]"
-  "Vec3f" "Vec3f[]"
- )
-)
+    ;; Deprecated Types
+    "EdgeIndex" "EdgeIndex[]"
+    "FaceIndex" "FaceIndex[]"
+    "Matrix4d" "Matrix4d[]"
+    "PointIndex" "PointIndex[]"
+    "PointFloat" "PointFloat[]"
+    "Transform" "Transform[]"
+    "Vec3f" "Vec3f[]"))
 
 (
  (identifier) @keyword
- (#any-of? @keyword
-
-  ;; Reference: https://openusd.org/release/api/sdf_page_front.html
-  ;; LIVRPS names
-  "inherits"
-  "payload"
-  "references"
-  "specializes"
-  "variantSets"
-  "variants"
+  ; format-ignore
+  (#any-of? @keyword
+    ; Reference: https://openusd.org/release/api/sdf_page_front.html
+    ; LIVRPS names
+    "inherits"
+    "payload"
+    "references"
+    "specializes"
+    "variantSets"
+    "variants"
 
-  ; assetInfo names
-  "assetInfo"
-  "identifier"
-  "name"
-  "payloadAssetDependencies"
-  "version"
+    ; assetInfo names
+    "assetInfo"
+    "identifier"
+    "name"
+    "payloadAssetDependencies"
+    "version"
 
-  ;; clips names
-  "clips"
+    ; clips names
+    "clips"
 
-  "active"
-  "assetPaths"
-  "manifestAssetPath"
-  "primPath"
-  "templateAssetPath"
-  "templateEndTime"
-  "templateStartTime"
-  "templateStride"
-  "times"
+    "active"
+    "assetPaths"
+    "manifestAssetPath"
+    "primPath"
+    "templateAssetPath"
+    "templateEndTime"
+    "templateStartTime"
+    "templateStride"
+    "times"
 
-  ;; customData names
-  "customData"
+    ; customData names
+    "customData"
 
-  "apiSchemaAutoApplyTo"
-  "apiSchemaOverridePropertyNames"
-  "className"
-  "extraPlugInfo"
-  "isUsdShadeContainer"
-  "libraryName"
-  "providesUsdShadeConnectableAPIBehavior"
-  "requiresUsdShadeEncapsulation"
-  "skipCodeGeneration"
+    "apiSchemaAutoApplyTo"
+    "apiSchemaOverridePropertyNames"
+    "className"
+    "extraPlugInfo"
+    "isUsdShadeContainer"
+    "libraryName"
+    "providesUsdShadeConnectableAPIBehavior"
+    "requiresUsdShadeEncapsulation"
+    "skipCodeGeneration"
 
-  ;; Layer metadata names
-  "colorConfiguration"
-  "colorManagementSystem"
-  "customLayerData"
-  "defaultPrim"
-  "doc"
-  "endTimeCode"
-  "framesPerSecond"
-  "owner"
-  "startTimeCode"
-  "subLayers"
+    ; Layer metadata names
+    "colorConfiguration"
+    "colorManagementSystem"
+    "customLayerData"
+    "defaultPrim"
+    "doc"
+    "endTimeCode"
+    "framesPerSecond"
+    "owner"
+    "startTimeCode"
+    "subLayers"
 
-  ;; Prim metadata
-  "instanceable"
- )
-)
+    ; Prim metadata
+    "instanceable"))
 
 ;; Common attribute metadata
 (
diff --git a/queries/usd/indents.scm b/queries/usd/indents.scm
index 4af153034..78146d188 100644
--- a/queries/usd/indents.scm
+++ b/queries/usd/indents.scm
@@ -1,3 +1,4 @@
+; format-ignore
 [
   (block)  ; The {}s in `def "foo" { ... Attributes / Prims here ... }`
   (dictionary)  ; The {}s in `dictionary foo = { string "foo" = "bar" }`