diff options
| author | Maxime Coste <mawww@kakoune.org> | 2018-09-20 21:14:01 +1000 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2018-09-20 21:14:01 +1000 |
| commit | 8618b286c51e437a2b866eeea57586ebdd0ad992 (patch) | |
| tree | 62b72b8ad8909b7b03a7bff4e7cfab9ee5328f3e | |
| parent | 7956e893be014aaa3ebe54f6531ceb61fc202b07 (diff) | |
| parent | 4bb87ef430800d9fa6ceed8575184ec6b99b14b2 (diff) | |
Merge remote-tracking branch 'laelath/highlighter-fixes'
| -rw-r--r-- | rc/core/c-family.kak | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak index 19d9750b..734e6643 100644 --- a/rc/core/c-family.kak +++ b/rc/core/c-family.kak @@ -143,12 +143,13 @@ evaluate-commands %sh{ add-highlighter shared/FT/string region %{MAYBEAT(?<!QUOTE)(?<!QUOTE\\)"} %{(?<!\\)(?:\\\\)*"} fill string add-highlighter shared/FT/raw_string region %{R"([^(]*)\(} %{\)([^")]*)"} fill string add-highlighter shared/FT/comment region /\* \*/ fill comment - add-highlighter shared/FT/line_comment region // $ fill comment + add-highlighter shared/FT/line_comment region // (?<!\\)(?=\n) fill comment add-highlighter shared/FT/disabled region -recurse "#\h*if(?:def)?" ^\h*?#\h*if\h+(?:0|FALSE)\b "#\h*(?:else|elif|endif)" fill rgb:666666 - add-highlighter shared/FT/macro region %{^\h*?\K#} %{(?<!\\)\n} group + add-highlighter shared/FT/macro region %{^\h*?\K#} %{(?<!\\)(?=\n)|(?=//)} group add-highlighter shared/FT/macro/ fill meta add-highlighter shared/FT/macro/ regex ^\h*#include\h+(\S*) 1:module + add-highlighter shared/FT/macro/ regex /\*.*?\*/ 0:comment ' | sed -e "s/FT/${ft}/g; s/QUOTE/'/g; s/MAYBEAT/${maybe_at}/;" done } |