diff options
| -rw-r--r-- | colors/solarized-dark.kak | 4 | ||||
| -rw-r--r-- | colors/solarized-light-termcolors.kak | 4 | ||||
| -rw-r--r-- | colors/solarized-light.kak | 4 | ||||
| -rw-r--r-- | rc/base/scala.kak | 14 |
4 files changed, 14 insertions, 12 deletions
diff --git a/colors/solarized-dark.kak b/colors/solarized-dark.kak index 67598329..25134f7c 100644 --- a/colors/solarized-dark.kak +++ b/colors/solarized-dark.kak @@ -21,13 +21,13 @@ echo " # code face global value ${cyan} - face global type ${yellow} + face global type ${red} face global variable ${blue} face global module ${cyan} face global function ${blue} face global string ${cyan} face global keyword ${green} - face global operator ${green} + face global operator ${yellow} face global attribute ${violet} face global comment ${base01} face global meta ${orange} diff --git a/colors/solarized-light-termcolors.kak b/colors/solarized-light-termcolors.kak index 93ee878d..fbb30091 100644 --- a/colors/solarized-light-termcolors.kak +++ b/colors/solarized-light-termcolors.kak @@ -3,13 +3,13 @@ # code face global value cyan -face global type yellow +face global type red face global variable blue face global module cyan face global function blue face global string cyan face global keyword green -face global operator green +face global operator yellow face global attribute bright-magenta face global comment bright-cyan face global meta bright-red diff --git a/colors/solarized-light.kak b/colors/solarized-light.kak index 9f357794..1ffefeb1 100644 --- a/colors/solarized-light.kak +++ b/colors/solarized-light.kak @@ -21,13 +21,13 @@ echo " # code face global value ${cyan} - face global type ${yellow} + face global type ${red} face global variable ${blue} face global module ${cyan} face global function ${blue} face global string ${cyan} face global keyword ${green} - face global operator ${green} + face global operator ${yellow} face global attribute ${violet} face global comment ${base1} face global meta ${orange} diff --git a/rc/base/scala.kak b/rc/base/scala.kak index 1e51e993..be28e31f 100644 --- a/rc/base/scala.kak +++ b/rc/base/scala.kak @@ -24,12 +24,14 @@ add-highlighter shared/scala/comment fill comment # Keywords are collected at # http://tutorialspoint.com/scala/scala_basic_syntax.htm -add-highlighter shared/scala/code regex \b(import|package)\b 0:meta -add-highlighter shared/scala/code regex \b(this|true|false|null)\b 0:value -add-highlighter shared/scala/code regex \b(become|case|catch|class|def|do|else|extends|final|finally|for|forSome|goto|if|initialize|macro|match|new|object|onTransition|return|startWith|stay|throw|trait|try|unbecome|using|val|var|when|while|with|yield)\b 0:keyword -add-highlighter shared/scala/code regex \b(abstract|final|implicit|implicitly|lazy|override|private|protected|require|sealed|super)\b 0:attribute -add-highlighter shared/scala/code regex \b(⇒|=>|<:|:>|=:=|::|&&|\|\|)\b 0:operator -add-highlighter shared/scala/code regex "'[_A-Za-z0-9$]+" 0:variable +add-highlighter shared/scala/code regex (?:\b|\W)(@\w+|import|package)\b 0:meta +add-highlighter shared/scala/code regex \b(true|false|null)\b 0:value +add-highlighter shared/scala/code regex \b(?:class|extends|with)\s+(\w+) 0:type +add-highlighter shared/scala/code regex \b([A-Z]\w*)\b 0:type +add-highlighter shared/scala/code regex (?:def|var|val)\s+(\w+) 0:variable +add-highlighter shared/scala/code regex \b(become|case|catch|class|def|do|else|extends|final|finally|for|forSome|goto|if|initialize|macro|match|new|object|onTransition|return|startWith|stay|this|super|throw|trait|try|unbecome|using|val|var|when|while|with|yield)\b 0:keyword +add-highlighter shared/scala/code regex \b(abstract|final|implicit|implicitly|lazy|override|private|protected|require|sealed)\b 0:attribute +add-highlighter shared/scala/code regex (\[|\]|=>|<:|:>|=:=|::|&&|\|\|) 0:operator # Commands # ‾‾‾‾‾‾‾‾ |