refactor: manual pre-cleanup

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

1 files changed, 149 insertions, 146 deletions

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"))