xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite clojure highlighting to use awk

Browse Source 
First, avoids the shell escaping issue mentioned in #2604.  Second,
speeds up Kakoune boot time.
This commit is contained in:
Jason Felice 2019-01-18 11:19:46 -05:00
parent 0600724a8b
commit 52c0b7d6b4
1 changed files with 127 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

245
rc/base/clojure.kak
View File

@ -28,131 +28,140 @@ hook global WinSetOption filetype=clojure %{
} }
evaluate-commands %sh{ evaluate-commands %sh{
symbol_char='[^\s()\[\]{}"\;@^`~\\%/]' exec awk '
in_core='(clojure\.core/|(?<!/))' BEGIN{
keywords=" symbol_char="[^\\s()\\[\\]{}\"\\;@^`~\\\\%/]";
case cond condp cond-> cond->> def definline definterface defmacro defmethod in_core="(clojure\.core/|(?<!/))";
defmulti defn defn- defonce defprotocol defrecord defstruct deftype fn if split( \
if-let if-not if-some let letfn new ns when when-first when-let when-not "case cond condp cond-> cond->> def definline definterface defmacro defmethod "\
when-some . .." "defmulti defn defn- defonce defprotocol defrecord defstruct deftype fn if "\
"if-let if-not if-some let letfn new ns when when-first when-let when-not "\
"when-some . ..", keywords);
core_fns=" split( \
* *' + +' - -' -> ->> ->ArrayChunk ->Eduction ->Vec ->VecNode ->VecSeq / < "* *'\'' + +'\'' - -'\'' -> ->> ->ArrayChunk ->Eduction ->Vec ->VecNode ->VecSeq / < "\
<= = == > >= StackTraceElement->vec Throwable->map accessor aclone "<= = == > >= StackTraceElement->vec Throwable->map accessor aclone "\
add-classpath add-watch agent agent-error agent-errors aget alength alias "add-classpath add-watch agent agent-error agent-errors aget alength alias "\
all-ns alter alter-meta! alter-var-root amap ancestors and any? apply "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 "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 "aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in "\
associative? atom await await-for bases bean bigdec bigint biginteger "associative? atom await await-for bases bean bigdec bigint biginteger "\
binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set "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 "bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array "\
boolean? booleans bound-fn bound-fn* bound? bounded-count butlast byte "boolean? booleans bound-fn bound-fn* bound? bounded-count butlast byte "\
byte-array bytes bytes? cast cat catch char char-array char-escape-string "byte-array bytes bytes? cast cat catch char char-array char-escape-string "\
char-name-string char? chars class class? clear-agent-errors "char-name-string char? chars class class? clear-agent-errors "\
clojure-version coll? comment commute comp comparator compare "clojure-version coll? comment commute comp comparator compare "\
compare-and-set! compile complement completing concat conj conj! cons "compare-and-set! compile complement completing concat conj conj! cons "\
constantly construct-proxy contains? count counted? create-ns "constantly construct-proxy contains? count counted? create-ns "\
create-struct cycle dec dec' decimal? declare dedupe default-data-readers "create-struct cycle dec dec'\'' decimal? declare dedupe default-data-readers "\
delay delay? deliver denominator deref derive descendants disj disj! "delay delay? deliver denominator deref derive descendants disj disj! "\
dissoc dissoc! distinct distinct? do doall dorun doseq dosync dotimes doto "dissoc dissoc! distinct distinct? do doall dorun doseq dosync dotimes doto "\
double double-array double? doubles drop drop-last drop-while eduction "double double-array double? doubles drop drop-last drop-while eduction "\
empty empty? ensure ensure-reduced enumeration-seq error-handler "empty empty? ensure ensure-reduced enumeration-seq error-handler "\
error-mode eval even? every-pred every? ex-data ex-info extend "error-mode eval even? every-pred every? ex-data ex-info extend "\
extend-protocol extend-type extenders extends? false? ffirst file-seq "extend-protocol extend-type extenders extends? false? ffirst file-seq "\
filter filterv finally find find-keyword find-ns find-var first flatten "filter filterv finally find find-keyword find-ns find-var first flatten "\
float float-array float? floats flush fn? fnext fnil for force format "float float-array float? floats flush fn? fnext fnil for force format "\
frequencies future future-call future-cancel future-cancelled? "frequencies future future-call future-cancel future-cancelled? "\
future-done? future? gen-class gen-interface gensym get get-in get-method "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 "get-proxy-class get-thread-bindings get-validator group-by halt-when hash "\
hash-map hash-ordered-coll hash-set hash-unordered-coll ident? identical? "hash-map hash-ordered-coll hash-set hash-unordered-coll ident? identical? "\
identity ifn? import in-ns inc inc' indexed? init-proxy inst-ms inst? "identity ifn? import in-ns inc inc'\'' indexed? init-proxy inst-ms inst? "\
instance? int int-array int? integer? interleave intern interpose into "instance? int int-array int? integer? interleave intern interpose into "\
into-array ints io! isa? iterate iterator-seq juxt keep keep-indexed key "into-array ints io! isa? iterate iterator-seq juxt keep keep-indexed key "\
keys keyword keyword? last lazy-cat lazy-seq line-seq list list* list? "keys keyword keyword? last lazy-cat lazy-seq line-seq list list* list? "\
load load-file load-reader load-string loaded-libs locking long long-array "load load-file load-reader load-string loaded-libs locking long long-array "\
longs loop macroexpand macroexpand-1 make-array make-hierarchy map "longs loop macroexpand macroexpand-1 make-array make-hierarchy map "\
map-entry? map-indexed map? mapcat mapv max max-key memfn memoize merge "map-entry? map-indexed map? mapcat mapv max max-key memfn memoize merge "\
merge-with meta methods min min-key mix-collection-hash mod monitor-enter "merge-with meta methods min min-key mix-collection-hash mod monitor-enter "\
monitor-exit name namespace namespace-munge nat-int? neg-int? neg? newline "monitor-exit name namespace namespace-munge nat-int? neg-int? neg? newline "\
next nfirst nil? nnext not not-any? not-empty not-every? not= ns-aliases "next nfirst nil? nnext not not-any? not-empty not-every? not= ns-aliases "\
ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve "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 "ns-unalias ns-unmap nth nthnext nthrest num number? numerator object-array "\
odd? or parents partial partition partition-all partition-by pcalls peek "odd? or parents partial partition partition-all partition-by pcalls peek "\
persistent! pmap pop pop! pop-thread-bindings pos-int? pos? pr pr-str "persistent! pmap pop pop! pop-thread-bindings pos-int? pos? pr pr-str "\
prefer-method prefers print print-str printf println println-str prn "prefer-method prefers print print-str printf println println-str prn "\
prn-str promise proxy proxy-mappings proxy-super push-thread-bindings "prn-str promise proxy proxy-mappings proxy-super push-thread-bindings "\
pvalues qualified-ident? qualified-keyword? qualified-symbol? quot quote "pvalues qualified-ident? qualified-keyword? qualified-symbol? quot quote "\
rand rand-int rand-nth random-sample range ratio? rational? rationalize "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-line "re-find re-groups re-matcher re-matches re-pattern re-seq read read-line "\
read-string reader-conditional reader-conditional? realized? record? recur "read-string reader-conditional reader-conditional? realized? record? recur "\
reduce reduce-kv reduced reduced? reductions ref ref-history-count "reduce reduce-kv reduced reduced? reductions ref ref-history-count "\
ref-max-history ref-min-history ref-set refer refer-clojure reify "ref-max-history ref-min-history ref-set refer refer-clojure reify "\
release-pending-sends rem remove remove-all-methods remove-method "release-pending-sends rem remove remove-all-methods remove-method "\
remove-ns remove-watch repeat repeatedly replace replicate require reset! "remove-ns remove-watch repeat repeatedly replace replicate require reset! "\
reset-meta! reset-vals! resolve rest restart-agent resultset-seq reverse "reset-meta! reset-vals! resolve rest restart-agent resultset-seq reverse "\
reversible? rseq rsubseq run! satisfies? second select-keys send send-off "reversible? rseq rsubseq run! satisfies? second select-keys send send-off "\
send-via seq seq? seqable? seque sequence sequential? set set! "send-via seq seq? seqable? seque sequence sequential? set set! "\
set-agent-send-executor! set-agent-send-off-executor! set-error-handler! "set-agent-send-executor! set-agent-send-off-executor! set-error-handler! "\
set-error-mode! set-validator! set? short short-array shorts shuffle "set-error-mode! set-validator! set? short short-array shorts shuffle "\
shutdown-agents simple-ident? simple-keyword? simple-symbol? slurp some "shutdown-agents simple-ident? simple-keyword? simple-symbol? slurp some "\
some-> some->> some-fn some? sort sort-by sorted-map sorted-map-by "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 "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! "str string? struct struct-map subs subseq subvec supers swap! swap-vals! "\
symbol symbol? sync tagged-literal tagged-literal? take take-last take-nth "symbol symbol? sync tagged-literal tagged-literal? take take-last take-nth "\
take-while test the-ns thread-bound? throw time to-array to-array-2d "take-while test the-ns thread-bound? throw time to-array to-array-2d "\
trampoline transduce transient tree-seq true? try type unchecked-add "trampoline transduce transient tree-seq true? try type unchecked-add "\
unchecked-add-int unchecked-byte unchecked-char unchecked-dec "unchecked-add-int unchecked-byte unchecked-char unchecked-dec "\
unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float "unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float "\
unchecked-inc unchecked-inc-int unchecked-int unchecked-long "unchecked-inc unchecked-inc-int unchecked-int unchecked-long "\
unchecked-multiply unchecked-multiply-int unchecked-negate "unchecked-multiply unchecked-multiply-int unchecked-negate "\
unchecked-negate-int unchecked-remainder-int unchecked-short "unchecked-negate-int unchecked-remainder-int unchecked-short "\
unchecked-subtract unchecked-subtract-int underive unreduced "unchecked-subtract unchecked-subtract-int underive unreduced "\
unsigned-bit-shift-right update update-in update-proxy uri? use uuid? val "unsigned-bit-shift-right update update-in update-proxy uri? use uuid? val "\
vals var var-get var-set var? vary-meta vec vector vector-of vector? "vals var var-get var-set var? vary-meta vec vector vector-of vector? "\
volatile! volatile? vreset! vswap! while with-bindings with-bindings* "volatile! volatile? vreset! vswap! while with-bindings with-bindings* "\
with-in-str with-local-vars with-meta with-open with-out-str "with-in-str with-local-vars with-meta with-open with-out-str "\
with-precision with-redefs with-redefs-fn xml-seq zero? zipmap" "with-precision with-redefs with-redefs-fn xml-seq zero? zipmap", core_fns);
core_vars=" split( \
*1 *2 *3 *agent* *clojure-version* *command-line-args* *compile-files* "*1 *2 *3 *agent* *clojure-version* *command-line-args* *compile-files* "\
*compile-path* *compiler-options* *data-readers* *default-data-reader-fn* "*compile-path* *compiler-options* *data-readers* *default-data-reader-fn* "\
*e *err* *file* *flush-on-newline* *in* *ns* *out* *print-dup* "*e *err* *file* *flush-on-newline* *in* *ns* *out* *print-dup* "\
*print-length* *print-level* *print-meta* *print-namespace-maps* "*print-length* *print-level* *print-meta* *print-namespace-maps* "\
*print-readably* *read-eval* *unchecked-math* *warn-on-reflection*" "*print-readably* *read-eval* *unchecked-math* *warn-on-reflection*", core_vars);
join() { sep=$2; set -- $1; IFS="$sep"; echo "$*"; }
keywords() {
words="$1"
type="$2"
words="$(echo "$words" |sed -e 's/[+?*\.]/\\&/g')"
printf 'add-highlighter shared/clojure/code/ regex (?<!%s)%s(%s)(?!%s) 0:%s\n' \
"${symbol_char}" \
"${in_core}" \
"$(join "${words}" '|')" \
"${symbol_char}" \
"${type}"
} }
function print_word_highlighter(words, face) {
static_words="$keywords $core_fns $core_vars" printf("add-highlighter shared/clojure/code/ regex (?<!%s)%s(", \
static_words="$static_words $(for word in $static_words; do printf 'clojure.core/%s ' "$word"; done)" symbol_char, in_core);
static_words="$(join "$static_words" ' ')" first = 1;
for (i in words) {
printf %s " if (!first) {
printf("|");
}
first = 0;
word = words[i];
gsub(/[+?#*\.]/, "\\\\&", word);
printf("%s", word);
}
printf(")(?!%s) 0:%s\n", symbol_char, face);
}
function print_static_words(words) {
for (i in words) {
printf("%s clojure.core/%s ", words[i], words[i]);
}
}
BEGIN{
# Keywords # Keywords
add-highlighter shared/clojure/code/ regex ::?(${symbol_char}+/)?${symbol_char}+ 0:value printf("add-highlighter shared/clojure/code/ regex ::?(%s+/)?%s+ 0:value\n", symbol_char, symbol_char);
# Numbers # Numbers
add-highlighter shared/clojure/code/ regex (?<!${symbol_char})[-+]?(?:0(?:[xX][0-9a-fA-F]+|[0-7]*)|[1-9]\d*)N? 0:value printf("add-highlighter shared/clojure/code/ regex (?<!%s)[-+]?(?:0(?:[xX][0-9a-fA-F]+|[0-7]*)|[1-9]\d*)N? 0:value\n", symbol_char);
add-highlighter shared/clojure/code/ regex (?<!${symbol_char})[-+]?(?:0|[1-9]\d*)(?:\.\d*)(?:M|[eE][-+]?\d+)? 0:value printf("add-highlighter shared/clojure/code/ regex (?<!%s)[-+]?(?:0|[1-9]\d*)(?:\.\d*)(?:M|[eE][-+]?\d+)? 0:value\n", symbol_char);
add-highlighter shared/clojure/code/ regex (?<!${symbol_char})[-+]?(?:0|[1-9]\d*)/(?:0|[1-9]\d*) 0:value printf("add-highlighter shared/clojure/code/ regex (?<!%s)[-+]?(?:0|[1-9]\d*)/(?:0|[1-9]\d*) 0:value\n", symbol_char);
$(keywords "${keywords}" keyword) print_word_highlighter(keywords, "keyword");
$(keywords "${core_fns}" function) print_word_highlighter(core_fns, "function");
$(keywords "${core_vars}" variable) print_word_highlighter(core_vars, "variable");
hook global WinSetOption filetype=clojure %{
set-option window static_words $static_words printf(" hook global WinSetOption filetype=clojure %%{\n"\
} " set-option window static_words ");
" print_static_words(keywords);
print_static_words(core_fns);
print_static_words(core_vars);
printf("\n }\n");
}'
} }
# Commands # Commands