From 22ee77aba38980d17beeb948b89c9136952b53a4 Mon Sep 17 00:00:00 2001 From: Vatche Jabagchourian Date: Sat, 27 Sep 2025 13:39:46 -0700 Subject: [PATCH] Fixing function highlighting for Clojure --- third-party-brushes/shBrushClojure.js | 101 ++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 8 deletions(-) diff --git a/third-party-brushes/shBrushClojure.js b/third-party-brushes/shBrushClojure.js index b85d896..bf4a752 100644 --- a/third-party-brushes/shBrushClojure.js +++ b/third-party-brushes/shBrushClojure.js @@ -3,12 +3,97 @@ SyntaxHighlighter.brushes.Clojure = function() { - var funcs = ':arglists :doc :file :line :macro :name :ns :private :tag :test new alias alter ' + - 'and apply assert class cond conj count def defmacro defn defstruct deref do ' + - 'doall dorun doseq dosync eval filter finally find first fn gen-class gensym if ' + - 'import inc keys let list loop map ns or print println quote rand recur reduce ' + - 'ref repeat require rest send seq set sort str struct sync take test throw ' + - 'trampoline try type use var vec when while'; + function getFunctionsClojure(str) { + var functions = str.trim().split(/\s+/); + var pattern = functions.map(function(func) { + var escaped = func.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + return '(?:])' + escaped + '(?![a-zA-Z0-9_\\-*+!?$%&=<>:])'; + }).join('|'); + return '(' + pattern + ')'; + } + + var funcs = '* *\' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* ' + + '*command-line-args* *compile-files* *compile-path* *compiler-options* *data-readers* ' + + '*default-data-reader-fn* *e *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* + +\' - -\' -> ->> ->ArrayChunk ->Eduction ->Vec ->VecNode ' + + '->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE Inst ' + + 'NaN? PrintWriter-on StackTraceElement->vec Throwable->map abs accessor aclone ' + + 'add-classpath add-tap add-watch agent agent-error agent-errors aget alength alias ' + + 'all-ns alter alter-meta! alter-var-root amap ancestors and any? apply areduce ' + + 'array-map as-> aset aset-boolean aset-byte aset-char aset-double aset-float aset-int ' + + 'aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for ' + + 'await1 bases bean bigdec bigint biginteger binding 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-fn* bound? bounded-count ' + + 'butlast byte byte-array bytes bytes? case 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? comment commute comp comparator compare compare-and-set! compile complement ' + + 'completing concat cond cond-> cond->> condp conj conj! cons constantly ' + + 'construct-proxy contains? count counted? create-ns create-struct cycle dec dec\' ' + + 'decimal? declare dedupe default-data-readers definline definterface defmacro ' + + 'defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype delay ' + + 'delay? deliver denominator deref derive descendants destructure disj disj! dissoc ' + + 'dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array ' + + 'double? doubles drop drop-last drop-while eduction empty empty? ensure ensure-reduced ' + + 'enumeration-seq error-handler error-mode eval even? every-pred every? ex-cause ' + + 'ex-data ex-info ex-message extend extend-protocol extend-type 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 ' + + 'fn? fnext fnil for force format frequencies future future-call future-cancel ' + + 'future-cancelled? future-done? future? gen-class gen-interface 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 if-let if-not if-some ifn? import in-ns inc inc\' indexed? ' + + 'infinite? init-proxy inst-ms inst-ms* inst? instance? int int-array int? integer? ' + + 'interleave intern interpose into into-array ints io! isa? iterate iteration ' + + 'iterator-seq juxt keep keep-indexed key keys keyword keyword? last lazy-cat lazy-seq ' + + 'let letfn line-seq list list* list? load load-file load-reader load-string ' + + 'loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array ' + + 'make-hierarchy map map-entry? map-indexed map? mapcat mapv max max-key memfn 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 not-any? not-empty not-every? not= ns 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? or parents parse-boolean parse-double parse-long ' + + 'parse-uuid 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 proxy-call-with-super ' + + 'proxy-mappings proxy-name proxy-super push-thread-bindings pvalues qualified-ident? ' + + 'qualified-keyword? qualified-symbol? quot rand rand-int rand-nth random-sample ' + + 'random-uuid 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 refer-clojure reify release-pending-sends rem remove remove-all-methods ' + + 'remove-method remove-ns remove-tap remove-watch repeat repeatedly replace replicate ' + + 'require 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-to-map-for-destructuring 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-> 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? sync ' + + 'tagged-literal tagged-literal? take take-last take-nth take-while tap> test the-ns ' + + 'thread-bound? time 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-keys ' + + 'update-proxy update-vals uri? use uuid? val vals var-get var-set var? vary-meta vec ' + + 'vector vector-of vector? volatile! volatile? vreset! vswap! when when-first when-let ' + + 'when-not when-some while with-bindings with-bindings* with-in-str ' + + 'with-loading-context with-local-vars with-meta with-open with-out-str with-precision ' + + 'with-redefs with-redefs-fn xml-seq zero? zipmap'; + this.regexList = [ { regex: new RegExp(';[^\]]+$', 'gm'), css: 'comments' }, @@ -16,11 +101,11 @@ SyntaxHighlighter.brushes.Clojure = function() { regex: /\[|\]/g, css: 'keyword' }, { regex: /'[a-z][A-Za-z0-9_]*/g, css: 'color1' }, // symbols { regex: /:[a-z][A-Za-z0-9_\-]*/g, css: 'color2' }, // keywords - { regex: new RegExp(this.getKeywords(funcs), 'gmi'), css: 'functions' } + { regex: new RegExp(getFunctionsClojure(funcs), 'gmi'), css: 'functions' } ]; this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags); } SyntaxHighlighter.brushes.Clojure.prototype = new SyntaxHighlighter.Highlighter(); -SyntaxHighlighter.brushes.Clojure.aliases = ['clojure', 'Clojure', 'clj']; \ No newline at end of file +SyntaxHighlighter.brushes.Clojure.aliases = ['clojure', 'Clojure', 'clj'];