Merge remote-tracking branch 'matthewvilim/master'

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}

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

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}

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|\W)(@\w+|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(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(?:class|extends|with)\s+(\w+) 0:type
-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([A-Z]\w*)\b 0:type
-add-highlighter shared/scala/code regex \b(⇒|=>|<:|:>|=:=|::|&&|\|\|)\b 0:operator
+add-highlighter shared/scala/code regex (?:def|var|val)\s+(\w+) 0:variable
-add-highlighter shared/scala/code regex "'[_A-Za-z0-9$]+" 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
 # ‾‾‾‾‾‾‾‾