Add gruvbox truecolor colorscheme (#530)

* Add gruvbox truecolor colorscheme * Fixed typo in gruvbox-tv, added operator type in colorschemes * Added operator type to all default themes * Changed operator to symbol * changed operator to symbol due to name conflict * Removed unused 'operator' field. Fixed gutter-error color * Restored the statement group and removed operator
2017-01-20 16:02:34 -03:30 · 2017-01-20 16:02:34 -03:30 · f7560c3311
commit f7560c3311
parent ea57d8b883
14 changed files with 73 additions and 21 deletions
--- a/cmd/micro/runtime.go
+++ b/cmd/micro/runtime.go
--- a/runtime/colorschemes/atom-dark-tc.micro
+++ b/runtime/colorschemes/atom-dark-tc.micro
@ -4,6 +4,7 @@ color-link identifier "#F9EE98,#1D1F21"
 color-link constant "#FF73FD,#1D1F21"
 color-link constant.string "#A8FF60,#1D1F21"
 color-link statement "#96CBFE,#1D1F21"
+color-link symbol "#96CBFE,#1DF121"
 color-link preproc "#62B1FE,#1D1F21"
 color-link type "#C6C5FE,#1D1F21"
 color-link special "#A6E22E,#1D1F21"
--- a/runtime/colorschemes/bubblegum.micro
+++ b/runtime/colorschemes/bubblegum.micro
@ -5,6 +5,7 @@ color-link constant.string "136,231"
 color-link constant.number "131,231"
 color-link identifier "133,231"
 color-link statement "32,231"
+color-link symbol "32,231"
 color-link preproc "28,231"
 color-link type "61,231"
 color-link special "167,231"
--- a/runtime/colorschemes/default.micro
+++ b/runtime/colorschemes/default.micro
@ -6,6 +6,7 @@ color-link constant "#AE81FF,#282828"
 color-link constant.string "#E6DB74,#282828"
 color-link constant.string.char "#BDE6AD,#282828"
 color-link statement "#F92672,#282828"
+color-link symbol "#F92672,#282828"
 color-link preproc "#CB4B16,#282828"
 color-link type "#66D9EF,#282828"
 color-link special "#A6E22E,#282828"
--- a/runtime/colorschemes/gruvbox-tc.micro
+++ b/runtime/colorschemes/gruvbox-tc.micro
@ -0,0 +1,19 @@
+color-link default "#ebdbb2,#282828"
+color-link comment "#928374,#282828"
+color-link symbol "#d79921,#282828"
+color-link constant "#d3869b,#282828"
+color-link constant.string "#b8bb26,#282828"
+color-link constant.string.char "#b8bb26,#282828"
+color-link identifier "#8ec07c,#282828"
+color-link statement "#fb4934,#282828"
+color-link preproc "#fb4934,235"
+color-link type "#fb4934,#282828"
+color-link special "#d79921,#282828"
+color-link underlined "underline #282828"
+color-link error "#9d0006,#282828"
+color-link gutter-error "#fb4934,#282828"
+color-link gutter-warning "#d79921,#282828"
+color-link line-number "#665c54,#282828"
+color-link current-line-number "#665c54,#3c3836"
+color-link cursor-line "#3c3836"
+color-link color-column "#79740e"
--- a/runtime/colorschemes/gruvbox.micro
+++ b/runtime/colorschemes/gruvbox.micro
@ -4,6 +4,7 @@ color-link constant "175,235"
 color-link constant.string "142,235"
 color-link identifier "109,235"
 color-link statement "124,235"
+color-link symbol "124,235"
 color-link preproc "72,235"
 color-link type "214,235"
 color-link special "172,235"
--- a/runtime/colorschemes/monokai.micro
+++ b/runtime/colorschemes/monokai.micro
@ -5,6 +5,7 @@ color-link constant "#AE81FF,#282828"
 color-link constant.string "#E6DB74,#282828"
 color-link constant.string.char "#BDE6AD,#282828"
 color-link statement "#F92672,#282828"
+color-link symbol "#F92672,#282828"
 color-link preproc "#CB4B16,#282828"
 color-link type "#66D9EF,#282828"
 color-link special "#A6E22E,#282828"
--- a/runtime/colorschemes/simple.micro
+++ b/runtime/colorschemes/simple.micro
@ -2,6 +2,7 @@ color-link comment "blue"
 color-link constant "red"
 color-link identifier "cyan"
 color-link statement "yellow"
+color-link symbol "yellow"
 color-link preproc "magenta"
 color-link type "green"
 color-link special "magenta"
--- a/runtime/colorschemes/solarized-tc.micro
+++ b/runtime/colorschemes/solarized-tc.micro
@ -3,6 +3,7 @@ color-link comment "#586E75,#002833"
 color-link identifier "#268BD2,#002833"
 color-link constant "#2AA198,#002833"
 color-link statement "#859900,#002833"
+color-link symbol "#859900,#002833"
 color-link preproc "#CB4B16,#002833"
 color-link type "#B58900,#002833"
 color-link special "#DC322F,#002833"
--- a/runtime/colorschemes/solarized.micro
+++ b/runtime/colorschemes/solarized.micro
@ -2,6 +2,7 @@ color-link comment "brightgreen"
 color-link constant "cyan"
 color-link identifier "blue"
 color-link statement "green"
+color-link symbol "green"
 color-link preproc "brightred"
 color-link type "yellow"
 color-link special "red"
--- a/runtime/colorschemes/zenburn.micro
+++ b/runtime/colorschemes/zenburn.micro
@ -5,6 +5,7 @@ color-link constant.number "116,237"
 color-link constant "181,237"
 color-link identifier "223,237"
 color-link statement "223,237"
+color-link symbol "223,237"
 color-link preproc "223,237"
 color-link type "187,237"
 color-link special "181,237"
--- a/runtime/help/colors.md
+++ b/runtime/help/colors.md
@ -19,11 +19,11 @@ Micro comes with a number of colorschemes by default. Here is the list:

 * zenburn: The 'zenburn' colorscheme and works well with 256 color terminals

-* solarized: this is the solarized colorscheme. 
+* solarized: this is the solarized colorscheme.
  You should have the solarized color palette in your terminal to use it.

-* solarized-tc: this is the solarized colorscheme for true color; just 
-  make sure your terminal supports true color before using it and that the 
+* solarized-tc: this is the solarized colorscheme for true color; just
+  make sure your terminal supports true color before using it and that the
  MICRO_TRUECOLOR environment variable is set to 1 before starting micro.

 * atom-dark-tc: this colorscheme is based off of Atom's "dark" colorscheme.
@ -95,6 +95,7 @@ Here is a list of the colorscheme groups that you can use:
 * identifier
 * constant
 * statement
+* symbol
 * preproc
 * type
 * special
--- a/runtime/syntax/lua.micro
+++ b/runtime/syntax/lua.micro
@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Lua syntax highlighting for Nano.
+# Lua syntax highlighting for Micro.
 #
 # Author:  Matthew Wild <mwild1 (at) gmail.com>
 # License: GPL 2  or later
@ -14,12 +14,12 @@
 # Automatically use for '.lua' files
 syntax "lua" ".*\.lua$"

-# Operators
-color statement ":|\*\*|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.|\b(not|and|or)\b"
-
 # Statements
 color statement "\b(do|end|while|repeat|until|if|elseif|then|else|for|in|function|local|return)\b"

+# Logic
+color statement "\b(not|and|or)\b"
+
 # Keywords
 color statement "\b(debug|string|math|table|io|coroutine|os|utf8|bit32)\b\."
 color statement "\b(_ENV|_G|_VERSION|assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|module|next|pairs|pcall|print|rawequal|rawget|rawlen|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\s*\("
@ -49,7 +49,7 @@ color statement "(\b(dofile|require|include)|%q|%!|%Q|%r|%x)\b"
 color constant.number "\b([0-9]+)\b"

 # Symbols
-color statement "(\(|\)|\[|\]|\{|\})"
+color symbol "(\(|\)|\[|\]|\{|\}|\*\*|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.)"

 # Strings
 color constant.string "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
--- a/runtime/syntax/micro.micro
+++ b/runtime/syntax/micro.micro
@ -3,7 +3,7 @@ syntax "micro" "\.(micro)$"

 color statement "\b(syntax|color(-link)?)\b"
 color statement "\b(start=|end=)\b"
-color identifier "\b(default|comment|identifier|constant(.string(.char)?|.number)?|statement|preproc|type|special|underlined|error|todo|statusline|indent-char|(current-)?line-number|gutter-error|gutter-warning|cursor-line|color-column)\b"
+color identifier "\b(default|comment|symbol|identifier|constant(.string(.char)?|.number)?|statement|preproc|type|special|underlined|error|todo|statusline|indent-char|(current-)?line-number|gutter-error|gutter-warning|cursor-line|color-column)\b"
 color constant.number "\b(|h|A|0x)+[0-9]+(|h|A)+\b"
 color constant.number "\b0x[0-9 a-f A-F]+\b"