refactor: manual pre-cleanup

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

queries/apex/highlights.scm

@@ -136,7 +136,7 @@
 [
   (boolean_type)
   (void_type)
-] @type.builtin;;
+] @type.builtin
 
 ; Fields
 

queries/arduino/highlights.scm

@@ -1,6 +1,7 @@
 ; inherits: cpp
 
 ((identifier) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
      ; Digital I/O
      "digitalRead"
@@ -68,8 +69,7 @@
      "detachInterrupt"
      ; Interrupts
      "interrupts"
-           "noInterrupts"
+     "noInterrupts"))
-           ))
 
 ((identifier) @type.builtin
  (#any-of? @type.builtin

queries/bash/highlights.scm

@@ -127,6 +127,7 @@
 (command_name (word) @function.call)
 
 ((command_name (word) @function.builtin)
+  ; format-ignore
   (#any-of? @function.builtin
     "alias" "bg" "bind" "break" "builtin" "caller" "cd"
     "command" "compgen" "complete" "compopt" "continue"

queries/bitbake/highlights.scm

@@ -109,15 +109,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((python_identifier) @constant.builtin
+  ; format-ignore
   (#any-of? @constant.builtin 
-           ;; https://docs.python.org/3/library/constants.html
+    ; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
+    "NotImplemented" "Ellipsis" 
-           "Ellipsis"
+    "quit" "exit" "copyright" "credits" "license"))
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
 
 ((assignment
   left: (python_identifier) @type.definition
@@ -338,8 +334,9 @@
 (type_conversion) @function.macro
 
 ([(identifier) (python_identifier)] @type.builtin
+  ; format-ignore
   (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
+      ; 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"
@@ -351,7 +348,7 @@
       "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
       "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
       "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
+      ; https://docs.python.org/3/library/stdtypes.html
       "bool" "int" "float" "complex" "list" "tuple" "range" "str"
       "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 

queries/c/highlights.scm

@@ -124,12 +124,12 @@
 ((preproc_arg) @function.macro (#set! "priority" 90))
 (preproc_defined) @function.macro
 
-(((field_expression
+((field_expression
-     (field_identifier) @property)) @_parent
+     (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__"

queries/c/injections.scm

@@ -16,7 +16,9 @@
   function: (identifier) @_function
   arguments: (argument_list
                . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "printf" "printf_s"
+  ; format-ignore
+  (#any-of? @_function 
+    "printf" "printf_s"
     "vprintf" "vprintf_s"
     "scanf" "scanf_s"
     "vscanf" "vscanf_s"
@@ -33,7 +35,9 @@
   function: (identifier) @_function
   arguments: (argument_list
                (_) . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "fprintf" "fprintf_s"
+  ; format-ignore
+  (#any-of? @_function 
+    "fprintf" "fprintf_s"
     "sprintf"
     "dprintf"
     "fscanf" "fscanf_s"
@@ -59,7 +63,9 @@
   function: (identifier) @_function
   arguments: (argument_list
                (_) . (_) . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "sprintf_s"
+  ; format-ignore
+  (#any-of? @_function 
+    "sprintf_s"
     "snprintf" "snprintf_s"
     "vsprintf_s"
     "vsnprintf" "vsnprintf_s"

queries/clojure/highlights.scm

@@ -67,6 +67,7 @@
 
 ; Builtin dynamic variables
 ((sym_lit) @variable.builtin
+  ; format-ignore
   (#any-of? @variable.builtin
     "*agent*" "*allow-unresolved-vars*" "*assert*"
     "*clojure-version*" "*command-line-args*"
@@ -172,6 +173,7 @@
 ; Builtin macros
 ;; TODO: Do all these items belong here?
 ((sym_lit) @function.macro
+  ; format-ignore
   (#any-of? @function.macro
     "." ".." "->" "->>" "amap" "areduce" "as->" "assert"
     "binding" "bound-fn" "delay" "do" "dosync"
@@ -191,6 +193,7 @@
 ;      clojure.pprint/pprint))
 ;; ...and then lots of manual filtering...
 ((sym_lit) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
     "->ArrayChunk" "->Eduction" "->Vec" "->VecNode" "->VecSeq"
     "-cache-protocol-fn" "-reset-methods" "PrintWriter-on"

queries/cmake/highlights.scm

@@ -91,7 +91,9 @@
   (argument_list
     (argument) @keyword.operator
   )
-  (#any-of? @keyword.operator "NOT" "AND" "OR"
+  ; 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"
@@ -105,7 +107,9 @@
   (argument_list
     (argument) @keyword.operator
   )
-  (#any-of? @keyword.operator "NOT" "AND" "OR"
+  ; 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"

queries/elixir/locals.scm

@@ -1,14 +1,21 @@
 ; References
 (identifier) @local.reference
+
 (alias) @local.reference
 
 ; Module Definitions
 (call
-  target: ((identifier) @_identifier (#eq? @_identifier "defmodule"))
+  target: 
-  (arguments (alias) @local.definition.type))
+    ((identifier) @_identifier
+      (#eq? @_identifier "defmodule"))
+  (arguments
+    (alias) @local.definition.type))
 
 ; Pattern Match Definitions
-(binary_operator left: [
+(binary_operator
+  ; format-ignore
+  left: 
+    [
       (identifier) @local.definition.var
       (_ (identifier) @local.definition.var)
       (_ (_ (identifier) @local.definition.var))
@@ -30,12 +37,15 @@
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
-] operator: "=")
+    ]
-
+  operator: "=")
 ; Stab Clause Definitions
+; format-ignore
 (stab_clause
-  left: [
+  left:
-    (arguments [
+    [
+     (arguments
+      [
         (identifier) @local.definition.var
         (_ (identifier) @local.definition.var)
         (_ (_ (identifier) @local.definition.var))
@@ -58,8 +68,12 @@
         (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
         (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
       ])
+
     (binary_operator
-      left: (arguments [
+      left:
+        (arguments
+          ; format-ignore
+          [
             (identifier) @local.definition.var
             (_ (identifier) @local.definition.var)
             (_ (_ (identifier) @local.definition.var))
@@ -81,29 +95,42 @@
             (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
             (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
             (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
-  ]) operator: "when")
+          ])
-])
+      operator: "when")
-
+    ])
 ; Aliases
+; format-ignore
 (call
-  target: ((identifier) @_identifier (#any-of? @_identifier "require" "alias" "use" "import"))
+  target:
-  (arguments [
+    ((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"))
+  target:
-  (arguments [
+    ((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
-    (binary_operator (identifier) @local.definition.parameter)
+        left: (identifier) @local.definition.function
-    (call target: (identifier) @local.definition.function (arguments [
+        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))
@@ -126,16 +153,22 @@
             (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
             (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
           ]))
-  ]?) (#set! definition.function.scope parent)
+    ]?)
-  (do_block)?
+  (#set! definition.function.scope parent)(do_block)?) @local.scope
-) @local.scope
-
 ; ExUnit Test Definitions & Scopes
+; format-ignore
 (call
-  target: ((identifier) @_identifier (#eq? @_identifier "test"))
+  target:
-  (arguments [
+    ((identifier) @_identifier
+      (#eq? @_identifier "test"))
+  (arguments
+    [
       (string)
-    ((string) . "," . [
+      ((string)
+        .
+        ","
+        .
+        [
           (identifier) @local.definition.parameter
           (_ (identifier) @local.definition.parameter)
           (_ (_ (identifier) @local.definition.parameter))
@@ -158,7 +191,7 @@
           (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
           (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
         ])
-]) (do_block)?) @local.scope
+    ])
-
+  (do_block)?) @local.scope
 ; Stab Clause Scopes
 (stab_clause) @local.scope

queries/gdscript/highlights.scm

@@ -179,6 +179,7 @@
 ;; Built-in Annotations
 
 ((annotation "@" @attribute (identifier) @attribute)
+  ; format-ignore
   (#any-of? @attribute
     ; @GDScript
     "export" "export_category" "export_color_no_alpha" "export_dir"
@@ -188,12 +189,12 @@
     "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"
+    "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,6 +223,7 @@
 ;; Builtin Funcs
 
 (call (identifier) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
     ; @GlobalScope
     "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative"
@@ -245,12 +247,12 @@
     ; @GDScript
     "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
     "is_instance_of" "len" "print_debug" "print_stack" "range"
-       "type_exists"
+    "type_exists"))
-      ))
 
 ;; Builtin Constants
 
 ((identifier) @constant.builtin
+  ; format-ignore
   (#any-of? @constant.builtin
     ; @GDScript
     "PI" "TAU" "INF" "NAN"
@@ -338,6 +340,5 @@
     "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"
+    "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN" "OP_MAX"))
- ))
 

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 

queries/hcl/highlights.scm

@@ -58,7 +58,7 @@
 
 [
   (quoted_template_start) ; "
-  (quoted_template_end); "
+  (quoted_template_end) ; "
   (template_literal) ; non-interpolation/directive content
 ] @string
 

queries/ispc/highlights.scm

@@ -92,6 +92,7 @@
 ((type_identifier) @type.builtin
   (#lua-match? @type.builtin "^RNGState"))
 
+; format-ignore
 (call_expression
   function: (identifier) @function.builtin
   (#any-of? @function.builtin
@@ -221,5 +222,4 @@
     "streaming_load_uniform"
     "streaming_store"
     "tan"
-   "trunc"
+    "trunc"))
-   ))

queries/janet_simple/highlights.scm

@@ -57,8 +57,9 @@
 ;;       (print name))))
 
 ((sym_lit) @function.macro
+  ; format-ignore
   (#any-of? @function.macro
-  ;; special forms
+    ; special forms
     "break"
     "def" "do"
     "fn"
@@ -68,7 +69,7 @@
     "unquote" "upscope"
     "var"
     "while"
-  ;; macros
+    ; macros
     "%=" "*="
     "++" "+="
     "--" "-="
@@ -81,7 +82,8 @@
     "defn" "defn-"
     "delay" "doc"
     "each" "eachk" "eachp"
-  "eachy" ;; XXX: obsolete
+    "eachy" 
+    ; XXX: obsolete
     "edefer"
     "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
     "ev/with-deadline"
@@ -113,10 +115,11 @@
 ;;       (print name))))
 
 ((sym_lit) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
     "%" "*" "+" "-" "/"
     "<" "<=" "=" ">" ">="
-  ;; debugging -- start janet with -d and use (debug) to see these
+    ; debugging -- start janet with -d and use (debug) to see these
     ".break" ".breakall" ".bytecode"
     ".clear" ".clearall"
     ".disasm"
@@ -125,7 +128,7 @@
     ".next" ".nextc"
     ".ppasm"
     ".signal" ".slot" ".slots" ".source" ".stack" ".step"
-  ;; back to regularly scheduled program
+    ; back to regularly scheduled program
     "abstract?" "accumulate" "accumulate2" "all" "all-bindings"
     "all-dynamics" "any?" "apply"
     "array"
@@ -278,14 +281,14 @@
     "table/to-struct"
     "table?"
     "take" "take-until" "take-while"
-  ;; XXX: obsolete
+    ; XXX: obsolete
     "tarray/buffer" "tarray/copy-bytes" "tarray/length"
     "tarray/new" "tarray/properties" "tarray/slice"
     "tarray/swap-bytes"
-  ;; XXX: obsolete
+    ; XXX: obsolete
     "thread/close" "thread/current" "thread/exit" "thread/new"
     "thread/receive" "thread/send"
-  ;; end of obsolete
+    ; end of obsolete
     "trace" "true?" "truthy?"
     "tuple"
     "tuple/brackets" "tuple/setmap" "tuple/slice"

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`

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 -> ...

queries/jq/highlights.scm

@@ -59,6 +59,7 @@
 
 ; jq -n 'builtins | map(split("/")[0]) | unique | .[]'
 ((funcname) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
     "IN"
     "INDEX"

queries/julia/highlights.scm

@@ -127,6 +127,7 @@
 ;;  type_names = sort(union(get_types(Core), get_types(Base)))
 ;;
 ((identifier) @type.builtin
+  ; format-ignore
   (#any-of? @type.builtin
     "AbstractArray"
     "AbstractChannel"

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

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"

queries/lua/injections.scm

@@ -67,7 +67,8 @@
       . 
       (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"))
 

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"

queries/mlir/highlights.scm

@@ -23,6 +23,7 @@
   (arith_cmp_predicate)
 ] @keyword
 
+; format-ignore
 [
   "module"
   "unrealized_conversion_cast"

queries/nix/highlights.scm

@@ -98,18 +98,20 @@
 )
 
 ; builtin functions (without builtins prefix)
-(variable_expression name: (identifier) @function.builtin (#any-of? @function.builtin
+(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"
+   "__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
+(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"
+    "builtins" "currentSystem" "currentTime" "langVersion" "nixPath" "nixVersion" "null" "storeDir"))
-))
 
 ; string interpolation (this was very annoying to get working properly)
 (interpolation "${" @punctuation.special (_) "}" @punctuation.special) @none

queries/ocaml/indents.scm

@@ -1,3 +1,4 @@
+; format-ignore
 [ 
   (let_binding)                 ; let = ...
   (type_binding)

queries/pug/highlights.scm

@@ -3,6 +3,7 @@
 (tag_name) @tag
 ((tag_name) @constant.builtin
   ; 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"

queries/python/highlights.scm

@@ -17,15 +17,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
+  ; format-ignore
   (#any-of? @constant.builtin 
-           ;; https://docs.python.org/3/library/constants.html
+    ; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
+    "NotImplemented" "Ellipsis" 
-           "Ellipsis"
+    "quit" "exit" "copyright" "credits" "license"))
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
 
 "_" @constant.builtin ; match wildcard
 
@@ -336,8 +332,9 @@
  (#any-of? @constructor "__new__" "__init__"))
 
 ((identifier) @type.builtin
+  ; format-ignore
   (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
+    ; 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"
@@ -349,7 +346,7 @@
     "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
     "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
     "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
+    ; https://docs.python.org/3/library/stdtypes.html
     "bool" "int" "float" "complex" "list" "tuple" "range" "str"
     "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 

queries/rst/highlights.scm

@@ -32,8 +32,8 @@
 
 ((directive
    name: (type) @function.builtin)
- (#any-of?
+  ; format-ignore
-  @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"
@@ -89,8 +89,8 @@
 (role) @function
 
 ((role) @function.builtin
- (#any-of?
+  ; format-ignore
-  @function.builtin
+  (#any-of? @function.builtin
     ; https://docutils.sourceforge.io/docs/ref/rst/roles.html
     ":emphasis:"
     ":literal:"

queries/scheme/highlights.scm

@@ -104,10 +104,11 @@
 ;; procedures in R5RS and R6RS but not in R6RS-lib
 
 ((symbol) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
-  ;; eq
+    ; eq
     "eqv?" "eq?" "equal?"
-  ;; number
+    ; number
     "number?" "complex?" "real?" "rational?" "integer?"
     "exact?" "inexact?"
     "zero?" "positive?" "negative?" "odd?" "even?" "finite?" "infinite?" "nan?"
@@ -124,9 +125,9 @@
     "real-valued" "rational-valued?" "integer-valued?"
     "exact" "inexact" "exact->inexact" "inexact->exact"
     "number->string" "string->number"
-  ;; boolean
+    ; boolean
     "boolean?" "not" "boolean=?"
-  ;; pair
+    ; pair
     "pair?" "cons" 
     "car" "cdr" 
     "caar" "cadr" "cdar" "cddr" 
@@ -134,20 +135,20 @@
     "caaaar" "caaadr" "caadar" "caaddr" "cadaar" "cadadr" "caddar" "cadddr"
     "cdaaar" "cdaadr" "cdadar" "cdaddr" "cddaar" "cddadr" "cdddar" "cddddr"
     "set-car!" "set-cdr!"
-  ;; list
+    ; list
     "null?" "list?"
     "list" "length" "append" "reverse" "list-tail" "list-ref"
     "map" "for-each"
     "memq" "memv" "member" "assq" "assv" "assoc"
-  ;; symbol
+    ; symbol
     "symbol?" "symbol->string" "string->symbol" "symbol=?"
-  ;; char
+    ; 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
     "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>=?"
@@ -155,28 +156,28 @@
     "string-for-each"
     "string-copy" "string-fill!"
     "string-upcase" "string-downcase"
-  ;; vector
+    ; vector
     "vector?" "make-vector" "vector" "vector-length" "vector-ref" "vector-set!"
     "vector->list" "list->vector" "vector-fill!" "vector-map" "vector-for-each"
-  ;; bytevector
+    ; bytevector
     "bytevector?" "native-endianness"
     "make-bytevector" "bytevector-length" "bytevector=?" "bytevector-fill!"
     "bytevector-copy!" "bytevector-copy"
-  ;; error
+    ; error
     "error" "assertion-violation"
-  ;; control
+    ; 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
+    ; 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
+    ; input
     "read" "read-char" "peek-char" "eof-object?" "char-ready?"
-  ;; output
+    ; output
     "write" "display" "newline" "write-char"
-  ;; system
+    ; system
     "load" "transcript-on" "transcript-off"))
 

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"

queries/starlark/highlights.scm

@@ -17,15 +17,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
+  ; format-ignore
   (#any-of? @constant.builtin 
-           ;; https://docs.python.org/3/library/constants.html
+    ; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
+    "NotImplemented" "Ellipsis" 
-           "Ellipsis"
+    "quit" "exit" "copyright" "credits" "license"))
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
 
 ((attribute
     attribute: (identifier) @variable.member)
@@ -64,6 +60,7 @@
 ;; Builtin functions
 ((call
   function: (identifier) @function.builtin)
+  ; 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"
@@ -89,8 +86,9 @@
  (#eq? @_isinstance "isinstance"))
 
 ((identifier) @type.builtin
+  ; format-ignore
   (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
+    ; 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"
@@ -102,7 +100,7 @@
     "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
     "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
     "FutureWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
+    ; https://docs.python.org/3/library/stdtypes.html
     "bool" "int" "float" "complex" "list" "tuple" "range" "str"
     "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
 

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 { ... }

queries/usd/highlights.scm

@@ -39,9 +39,10 @@
 
 (attribute_type) @type
 (
- ;; Reference: https://openusd.org/release/api/sdf_page_front.html
  (attribute_type) @type.builtin
+  ;format-ignore
   (#any-of? @type.builtin
+    ;; Reference: https://openusd.org/release/api/sdf_page_front.html
     ;; Scalar types
     "asset" "asset[]"
     "bool" "bool[]"
@@ -95,16 +96,14 @@
     "PointIndex" "PointIndex[]"
     "PointFloat" "PointFloat[]"
     "Transform" "Transform[]"
-  "Vec3f" "Vec3f[]"
+    "Vec3f" "Vec3f[]"))
- )
-)
 
 (
  (identifier) @keyword
+  ; format-ignore
   (#any-of? @keyword
-
+    ; Reference: https://openusd.org/release/api/sdf_page_front.html
-  ;; Reference: https://openusd.org/release/api/sdf_page_front.html
+    ; LIVRPS names
-  ;; LIVRPS names
     "inherits"
     "payload"
     "references"
@@ -119,7 +118,7 @@
     "payloadAssetDependencies"
     "version"
 
-  ;; clips names
+    ; clips names
     "clips"
 
     "active"
@@ -132,7 +131,7 @@
     "templateStride"
     "times"
 
-  ;; customData names
+    ; customData names
     "customData"
 
     "apiSchemaAutoApplyTo"
@@ -145,7 +144,7 @@
     "requiresUsdShadeEncapsulation"
     "skipCodeGeneration"
 
-  ;; Layer metadata names
+    ; Layer metadata names
     "colorConfiguration"
     "colorManagementSystem"
     "customLayerData"
@@ -157,10 +156,8 @@
     "startTimeCode"
     "subLayers"
 
-  ;; Prim metadata
+    ; Prim metadata
-  "instanceable"
+    "instanceable"))
- )
-)
 
 ;; Common attribute metadata
 (

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" }`