diff options
| author | Maxime Coste <mawww@kakoune.org> | 2017-10-21 17:36:08 +0800 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2017-10-21 17:36:08 +0800 |
| commit | e6009f7f9be2db00db46a8c94cba2a1ebc42c751 (patch) | |
| tree | 6a20288ed1d502fff39cea5512f8a8a1786b8fef | |
| parent | e3add510298870e653e993ea4db695cd9125f92e (diff) | |
| parent | 5b0f0703002a2d5d4eda1d403f02a17496855cfd (diff) | |
Merge remote-tracking branch 'danr/Improve-kakrc-highlighter'
| -rw-r--r-- | rc/core/kakrc.kak | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rc/core/kakrc.kak b/rc/core/kakrc.kak index 48503993..17608125 100644 --- a/rc/core/kakrc.kak +++ b/rc/core/kakrc.kak @@ -31,8 +31,8 @@ add-highlighter -group / regions -default code kakrc \ keywords="${keywords}|try|catch|rename-client|rename-buffer|rename-session|change-directory|colorscheme" attributes="global|buffer|window|current" attributes="${attributes}|normal|insert|menu|prompt|goto|view|user|object" - attributes="${attributes}|number_lines|show_matching|show_whitespaces|fill|regex|dynregex|group|flag_lines|ranges|line|column|wrap|ref|regions" - types="int|bool|str|regex|int-list|str-list|line-flags|completions|range-faces" + attributes="${attributes}|number_lines|show_matching|show_whitespaces|fill|regex|dynregex|group|flag_lines|ranges|line|column|wrap|ref|regions|replace-ranges" + types="int|bool|str|regex|int-list|str-list|completions|line-specs|range-specs" values="default|black|red|green|yellow|blue|magenta|cyan|white|" # Add the language's grammar to the static completion list @@ -41,12 +41,12 @@ add-highlighter -group / regions -default code kakrc \ set -- window extra_word_chars '-' }" | sed 's,|,:,g' - # Highlight keywords. Teach \b that - does not create a word boundary + # Highlight keywords (which are always surrounded by whitespace) printf %s " - add-highlighter -group /kakrc/code regex \b(?<!-)(${keywords})(?!-)\b 0:keyword - add-highlighter -group /kakrc/code regex \b(?<!-)(${attributes})(?!-)\b 0:attribute - add-highlighter -group /kakrc/code regex \b(?<!-)(${types})(?!-)\b 0:type - add-highlighter -group /kakrc/code regex \b(?<!-)(${values})(?!-)\b 0:value + add-highlighter -group /kakrc/code regex [\s\A]\K(${keywords})(?=[\s\z])\b 0:keyword + add-highlighter -group /kakrc/code regex [\s\A]\K(${attributes})(?=[\s\z])\b 0:attribute + add-highlighter -group /kakrc/code regex [\s\A]\K(${types})(?=[\s\z])\b 0:type + add-highlighter -group /kakrc/code regex [\s\A]\K(${values})(?=[\s\z])\b 0:value " } |