summaryrefslogtreecommitdiff
path: root/rc/base/javascript.kak
diff options
context:
space:
mode:
authorAlex Leferry 2 <alexherbo2@gmail.com>2017-02-09 13:58:20 +0100
committerAlex Leferry 2 <alexherbo2@gmail.com>2017-02-09 23:00:36 +0100
commitd029af86af491ffcf496609873e0da831289db59 (patch)
treeaa0aca0bf0bf60449738e360fbe65d11d42f836a /rc/base/javascript.kak
parent033ded15ae0d0296f046b6c5feb53ef4e162f2ea (diff)
fix regex highlighting
Diffstat (limited to 'rc/base/javascript.kak')
-rw-r--r--rc/base/javascript.kak18
1 files changed, 10 insertions, 8 deletions
diff --git a/rc/base/javascript.kak b/rc/base/javascript.kak
index 94636460..a59f245a 100644
--- a/rc/base/javascript.kak
+++ b/rc/base/javascript.kak
@@ -9,17 +9,20 @@ hook global BufCreate .*[.](js) %{
# ‾‾‾‾‾‾‾‾‾‾‾‾
add-highlighter -group / regions -default code javascript \
- double_string '"' (?<!\\)(\\\\)*" '' \
- single_string "'" (?<!\\)(\\\\)*' '' \
- literal "`" (?<!\\)(\\\\)*` '' \
- comment // '$' '' \
- comment /\* \*/ ''
-
-# Regular expression flags are: g → global match, i → ignore case, m → multi-lines, y → sticky
+ double_string '"' (?<!\\)(\\\\)*" '' \
+ single_string "'" (?<!\\)(\\\\)*' '' \
+ literal "`" (?<!\\)(\\\\)*` '' \
+ comment // '$' '' \
+ comment /\* \*/ '' \
+ regex / (?<!\\)(\\\\)*/[gimuy]* '' \
+ division '[\w\)\]](/|(\h+/\h+))' '\w' '' # Help Kakoune to better detect /…/ literals
+
+# Regular expression flags are: g → global match, i → ignore case, m → multi-lines, u → unicode, y → sticky
# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp
add-highlighter -group /javascript/double_string fill string
add-highlighter -group /javascript/single_string fill string
+add-highlighter -group /javascript/regex fill meta
add-highlighter -group /javascript/comment fill comment
add-highlighter -group /javascript/literal fill string
add-highlighter -group /javascript/literal regex \${.*?} 0:value
@@ -28,7 +31,6 @@ add-highlighter -group /javascript/code regex \$\w* 0:identifier
add-highlighter -group /javascript/code regex \b(document|false|null|parent|self|this|true|undefined|window)\b 0:value
add-highlighter -group /javascript/code regex "-?[0-9]*\.?[0-9]+" 0:value
add-highlighter -group /javascript/code regex \b(Array|Boolean|Date|Function|Number|Object|RegExp|String)\b 0:type
-add-highlighter -group /javascript/code regex (?<=\W)/[^\n/]+/[gimy]* 0:meta
# Keywords are collected at
# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#Keywords