mhoward/dotfiles: comparison .vim/colors/jellybeans.vim

-:279abee5d0e8
+:c1b4166611ed
 "
 " File:         jellybeans.vim
 " URL:          github.com/nanotech/jellybeans.vim
 " Scripts URL:  vim.org/scripts/script.php?script_id=2555
 " Maintainer:   NanoTech (nanotech.nanotechcorp.net)
-" Version:      1.6~git
+" Version:      1.7
-" Last Change:  January 15th, 2012
+" Last Change:  June 21st, 2019
 " License:      MIT
-" Contributors: Daniel Herbert (pocketninja)
+" Contributors: Andrew Wong (w0ng)
+"               Benjamin R. Haskell (benizi)
+"               Brian Marshall (bmars)
+"               Daniel Herbert (pocketninja)
+"               David Liang <bmdavll at gmail dot com>
+"               Filipe Silva (ninrod)
 "               Henry So, Jr. <henryso@panix.com>
-"               David Liang <bmdavll at gmail dot com>
+"               Ihor Kalnytskyi (ikalnytskyi)
+"               Joe Doherty (docapotamus)
+"               Karl Litterfeldt (Litterfeldt)
+"               Keith Pitt (keithpitt)
+"               Mike Schreifels (schreifels)
+"               Philipp Rustemeier (12foo)
+"               Rafael Bicalho (rbika)
 "               Rich Healey (richo)
-"               Andrew Wong (w0ng)
+"               Siwen Yu (yusiwen)
-"
+"               Tim Willis (willist)
-" Copyright (c) 2009-2012 NanoTech
+"               Tom McLaughlin (tmcoma)
+"
+" Copyright (c) 2009-2019 NanoTech
 "
 " Permission is hereby granted, free of charge, to any per‐
 " son obtaining a copy of this software and associated doc‐
 " umentation  files  (the “Software”), to deal in the Soft‐
 " ware without restriction,  including  without  limitation
 syntax reset
 endif
 let colors_name = "jellybeans"
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
+if has("gui_running") || (has('termguicolors') && &termguicolors)
+let s:true_color = 1
+else
+let s:true_color = 0
+endif
+if s:true_color || &t_Co >= 88
 let s:low_color = 0
 else
 let s:low_color = 1
 endif
+" Configuration Variables:
+" - g:jellybeans_overrides          (default = {})
+" - g:jellybeans_use_lowcolor_black (default = 0)
+" - g:jellybeans_use_gui_italics    (default = 1)
+" - g:jellybeans_use_term_italics   (default = 0)
+let s:background_color = "151515"
+if exists("g:jellybeans_overrides")
+let s:overrides = g:jellybeans_overrides
+else
+let s:overrides = {}
+endif
+" Backwards compatibility
+if exists("g:jellybeans_background_color")
+\ || exists("g:jellybeans_background_color_256")
+\ || exists("g:jellybeans_use_term_background_color")
+let s:overrides = deepcopy(s:overrides)
+if !has_key(s:overrides, "background")
+let s:overrides["background"] = {}
+endif
+if exists("g:jellybeans_background_color")
+let s:overrides["background"]["guibg"] = g:jellybeans_background_color
+endif
+if exists("g:jellybeans_background_color_256")
+let s:overrides["background"]["256ctermbg"] = g:jellybeans_background_color_256
+endif
+if exists("g:jellybeans_use_term_background_color")
+\ && g:jellybeans_use_term_background_color
+let s:overrides["background"]["ctermbg"] = "NONE"
+let s:overrides["background"]["256ctermbg"] = "NONE"
+endif
+endif
+if exists("g:jellybeans_use_lowcolor_black") && g:jellybeans_use_lowcolor_black
+let s:termBlack = "Black"
+else
+let s:termBlack = "Grey"
+endif
+" When `termguicolors` is set, Vim[^1] ignores `hi Normal guibg=NONE`
+" after Normal's `guibg` is already set to a color. See:
+"
+" - https://github.com/vim/vim/issues/981
+" - https://github.com/nanotech/jellybeans.vim/issues/64
+"
+" To work around this, ensure we don't set the default background
+" color before an override changes it to `NONE` by ensuring that the
+" background color isn't set to a value different from its override.
+"
+" [^1]: Tested on 8.0.567. Does not apply to Neovim.
+"
+if has_key(s:overrides, "background") && has_key(s:overrides["background"], "guibg")
+let s:background_color = s:overrides["background"]["guibg"]
+endif
 " Color approximation functions by Henry So, Jr. and David Liang {{{
 " Added to jellybeans.vim by Daniel Herbert
-" returns an approximate grey index for the given grey level
+if &t_Co == 88
-fun! s:grey_number(x)
-if &t_Co == 88
+" returns an approximate grey index for the given grey level
+fun! s:grey_number(x)
 if a:x < 23
 return 0
 elseif a:x < 69
 return 1
 elseif a:x < 103
 elseif a:x < 243
 return 8
 else
 return 9
 endif
-else
+endfun
-if a:x < 14
-return 0
+" returns the actual grey level represented by the grey index
-else
+fun! s:grey_level(n)
-let l:n = (a:x - 8) / 10
-let l:m = (a:x - 8) % 10
-if l:m < 5
-return l:n
-else
-return l:n + 1
-endif
-endif
-endif
-endfun
-" returns the actual grey level represented by the grey index
-fun! s:grey_level(n)
-if &t_Co == 88
 if a:n == 0
 return 0
 elseif a:n == 1
 return 46
 elseif a:n == 2
 elseif a:n == 8
 return 231
 else
 return 255
 endif
-else
+endfun
-if a:n == 0
-return 0
+" returns the palette index for the given grey index
-else
+fun! s:grey_color(n)
-return 8 + (a:n * 10)
-endif
-endif
-endfun
-" returns the palette index for the given grey index
-fun! s:grey_color(n)
-if &t_Co == 88
 if a:n == 0
 return 16
 elseif a:n == 9
 return 79
 else
 return 79 + a:n
 endif
-else
+endfun
-if a:n == 0
-return 16
+" returns an approximate color index for the given color level
-elseif a:n == 25
+fun! s:rgb_number(x)
-return 231
-else
-return 231 + a:n
-endif
-endif
-endfun
-" returns an approximate color index for the given color level
-fun! s:rgb_number(x)
-if &t_Co == 88
 if a:x < 69
 return 0
 elseif a:x < 172
 return 1
 elseif a:x < 230
 return 2
 else
 return 3
 endif
-else
+endfun
+" returns the actual color level for the given color index
+fun! s:rgb_level(n)
+if a:n == 0
+return 0
+elseif a:n == 1
+return 139
+elseif a:n == 2
+return 205
+else
+return 255
+endif
+endfun
+" returns the palette index for the given R/G/B color indices
+fun! s:rgb_color(x, y, z)
+return 16 + (a:x * 16) + (a:y * 4) + a:z
+endfun
+else " assuming &t_Co == 256
+" returns an approximate grey index for the given grey level
+fun! s:grey_number(x)
+if a:x < 14
+return 0
+else
+let l:n = (a:x - 8) / 10
+let l:m = (a:x - 8) % 10
+if l:m < 5
+return l:n
+else
+return l:n + 1
+endif
+endif
+endfun
+" returns the actual grey level represented by the grey index
+fun! s:grey_level(n)
+if a:n == 0
+return 0
+else
+return 8 + (a:n * 10)
+endif
+endfun
+" returns the palette index for the given grey index
+fun! s:grey_color(n)
+if a:n == 0
+return 16
+elseif a:n == 25
+return 231
+else
+return 231 + a:n
+endif
+endfun
+" returns an approximate color index for the given color level
+fun! s:rgb_number(x)
 if a:x < 75
 return 0
 else
 let l:n = (a:x - 55) / 40
 let l:m = (a:x - 55) % 40
 return l:n
 else
 return l:n + 1
 endif
 endif
-endif
+endfun
-endfun
+" returns the actual color level for the given color index
-" returns the actual color level for the given color index
+fun! s:rgb_level(n)
-fun! s:rgb_level(n)
-if &t_Co == 88
 if a:n == 0
 return 0
-elseif a:n == 1
-return 139
-elseif a:n == 2
-return 205
-else
-return 255
-endif
-else
-if a:n == 0
-return 0
 else
 return 55 + (a:n * 40)
 endif
-endif
+endfun
-endfun
+" returns the palette index for the given R/G/B color indices
-" returns the palette index for the given R/G/B color indices
+fun! s:rgb_color(x, y, z)
-fun! s:rgb_color(x, y, z)
-if &t_Co == 88
-return 16 + (a:x * 16) + (a:y * 4) + a:z
-else
 return 16 + (a:x * 36) + (a:y * 6) + a:z
-endif
+endfun
-endfun
+endif
 " returns the palette index to approximate the given R/G/B color levels
 fun! s:color(r, g, b)
+" map greys directly (see xterm's 256colres.pl)
+if &t_Co == 256 && a:r == a:g && a:g == a:b && a:r > 3 && a:r < 243
+return (a:r - 8) / 10 + 232
+endif
 " get the closest grey
 let l:gx = s:grey_number(a:r)
 let l:gy = s:grey_number(a:g)
 let l:gz = s:grey_number(a:b)
 " only one possibility
 return s:rgb_color(l:x, l:y, l:z)
 endif
 endfun
+fun! s:is_empty_or_none(str)
+return empty(a:str) || a:str ==? "NONE"
+endfun
 " returns the palette index to approximate the 'rrggbb' hex string
 fun! s:rgb(rgb)
+if s:is_empty_or_none(a:rgb)
+return "NONE"
+endif
 let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
 let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
 let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
 return s:color(l:r, l:g, l:b)
 endfun
+fun! s:prefix_highlight_value_with(prefix, color)
+if s:is_empty_or_none(a:color)
+return "NONE"
+else
+return a:prefix . a:color
+endif
+endfun
+fun! s:remove_italic_attr(attr)
+let l:attr = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",")
+if empty(l:attr)
+let l:attr = "NONE"
+endif
+return l:attr
+endfun
 " sets the highlighting for the given group
 fun! s:X(group, fg, bg, attr, lcfg, lcbg)
 if s:low_color
-let l:fge = empty(a:lcfg)
+let l:cmd = "hi ".a:group.
-let l:bge = empty(a:lcbg)
+\ " ctermfg=".s:prefix_highlight_value_with("", a:lcfg).
+\ " ctermbg=".s:prefix_highlight_value_with("", a:lcbg)
-if !l:fge && !l:bge
-exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg
-elseif !l:fge && l:bge
-exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE"
-elseif l:fge && !l:bge
-exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg
-endif
 else
-let l:fge = empty(a:fg)
+let l:cmd = "hi ".a:group.
-let l:bge = empty(a:bg)
+\ " guifg=".s:prefix_highlight_value_with("#", a:fg).
+\ " guibg=".s:prefix_highlight_value_with("#", a:bg)
-if !l:fge && !l:bge
+if !s:true_color
-exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg)
+let l:cmd = l:cmd.
-elseif !l:fge && l:bge
+\ " ctermfg=".s:rgb(a:fg).
-exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)." ctermbg=NONE"
+\ " ctermbg=".s:rgb(a:bg)
-elseif l:fge && !l:bge
+endif
-exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermfg=NONE ctermbg=".s:rgb(a:bg)
+endif
-endif
-endif
+let l:attr = s:prefix_highlight_value_with("", a:attr)
-if a:attr == ""
+if exists("g:jellybeans_use_term_italics") && g:jellybeans_use_term_italics
-exec "hi ".a:group." gui=none cterm=none"
+let l:cterm_attr = l:attr
 else
-let l:noitalic = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",")
+let l:cterm_attr = s:remove_italic_attr(l:attr)
-if empty(l:noitalic)
+endif
-let l:noitalic = "none"
-endif
+if !exists("g:jellybeans_use_gui_italics") || g:jellybeans_use_gui_italics
-exec "hi ".a:group." gui=".a:attr." cterm=".l:noitalic
+let l:gui_attr = l:attr
-endif
+else
+let l:gui_attr = s:remove_italic_attr(l:attr)
+endif
+let l:cmd = l:cmd." gui=".l:gui_attr." cterm=".l:cterm_attr
+exec l:cmd
 endfun
 " }}}
-if !exists("g:jellybeans_background_color")
+call s:X("Normal","e8e8d3",s:background_color,"","White","")
-let g:jellybeans_background_color = "151515"
-end
-call s:X("Normal","e8e8d3",g:jellybeans_background_color,"","White","")
 set background=dark
-if !exists("g:jellybeans_use_lowcolor_black") || g:jellybeans_use_lowcolor_black
+call s:X("CursorLine","","1c1c1c","","",s:termBlack)
-let s:termBlack = "Black"
+call s:X("CursorColumn","","1c1c1c","","",s:termBlack)
+" Some of Terminal.app's default themes have a cursor color
+" too close to Jellybeans' preferred MatchParen background
+" color to be easily distinguishable. Other terminals tend
+" to use a brighter cursor color.
+"
+" Use a more distinct color in Terminal.app, and also in
+" low-color terminals if the preferred background color is
+" not available.
+if !has('gui_running') && $TERM_PROGRAM == "Apple_Terminal"
+let s:matchParenGuiFg = "dd0093"
+let s:matchParenGuiBg = "000000"
 else
-let s:termBlack = "Grey"
+let s:matchParenGuiFg = "ffffff"
-endif
+let s:matchParenGuiBg = "556779"
+endif
-if version >= 700
+if s:termBlack != "Black"
-call s:X("CursorLine","","1c1c1c","","",s:termBlack)
+let s:matchParenTermFg = "Magenta"
-call s:X("CursorColumn","","1c1c1c","","",s:termBlack)
+let s:matchParenTermBg = ""
-call s:X("MatchParen","ffffff","556779","bold","","DarkCyan")
+else
+let s:matchParenTermFg = ""
-call s:X("TabLine","000000","b0b8c0","italic","",s:termBlack)
+let s:matchParenTermBg = s:termBlack
-call s:X("TabLineFill","9098a0","","","",s:termBlack)
+endif
-call s:X("TabLineSel","000000","f0f0f0","italic,bold",s:termBlack,"White")
+call s:X("MatchParen",s:matchParenGuiFg,s:matchParenGuiBg,"bold",
+\                     s:matchParenTermFg,s:matchParenTermBg)
-" Auto-completion
-call s:X("Pmenu","ffffff","606060","","White",s:termBlack)
+call s:X("TabLine","000000","b0b8c0","italic","",s:termBlack)
-call s:X("PmenuSel","101010","eeeeee","",s:termBlack,"White")
+call s:X("TabLineFill","9098a0","","","",s:termBlack)
-endif
+call s:X("TabLineSel","000000","f0f0f0","italic,bold",s:termBlack,"White")
+" Auto-completion
+call s:X("Pmenu","ffffff","606060","","White",s:termBlack)
+call s:X("PmenuSel","101010","eeeeee","",s:termBlack,"White")
 call s:X("Visual","","404040","","",s:termBlack)
-call s:X("Cursor",g:jellybeans_background_color,"b0d0f0","","","")
+call s:X("Cursor",s:background_color,"b0d0f0","","","")
-call s:X("LineNr","605958",g:jellybeans_background_color,"none",s:termBlack,"")
+call s:X("LineNr","605958",s:background_color,"NONE",s:termBlack,"")
-call s:X("CursorLineNr","ccc5c4","","none","White","")
+call s:X("CursorLineNr","ccc5c4","","NONE","White","")
 call s:X("Comment","888888","","italic","Grey","")
 call s:X("Todo","c7c7c7","","bold","White",s:termBlack)
 call s:X("StatusLine","000000","dddddd","italic","","White")
 call s:X("StatusLineNC","ffffff","403c41","italic","White","Black")
 call s:X("Function","fad07a","","","Yellow","")
 call s:X("Statement","8197bf","","","DarkBlue","")
 call s:X("PreProc","8fbfdc","","","LightBlue","")
 hi! link Operator Structure
+hi! link Conceal Operator
 call s:X("Type","ffb964","","","Yellow","")
-call s:X("NonText","606060",g:jellybeans_background_color,"",s:termBlack,"")
+call s:X("NonText","606060",s:background_color,"",s:termBlack,"")
 call s:X("SpecialKey","444444","1c1c1c","",s:termBlack,"")
 call s:X("Search","f0a0c0","302028","underline","Magenta","")
 hi! link erlangBIF rubyPredefinedIdentifier
 hi! link erlangFunction rubyPredefinedIdentifier
 hi! link erlangDirective Statement
 hi! link erlangNode Identifier
+" Elixir
+hi! link elixirAtom rubySymbol
 " JavaScript
 hi! link javaScriptValue Constant
 hi! link javaScriptRegexpString rubyRegexp
+hi! link javaScriptTemplateVar StringDelim
+hi! link javaScriptTemplateDelim Identifier
+hi! link javaScriptTemplateString String
 " CoffeeScript
 hi! link coffeeRegExp javaScriptRegexpString
 " Vimscript
 hi! link vimOper Normal
+" HTML
+hi! link htmlTag Statement
+hi! link htmlEndTag htmlTag
+hi! link htmlTagName htmlTag
+" XML
+hi! link xmlTag Statement
+hi! link xmlEndTag xmlTag
+hi! link xmlTagName xmlTag
+hi! link xmlEqual xmlTag
+hi! link xmlEntity Special
+hi! link xmlEntityPunct xmlEntity
+hi! link xmlDocTypeDecl PreProc
+hi! link xmlDocTypeKeyword PreProc
+hi! link xmlProcessingDelim xmlAttrib
 " Debugger.vim
 call s:X("DbgCurrent","DEEBFE","345FA8","","White","DarkBlue")
 call s:X("DbgBreakPt","","4F0037","","","DarkMagenta")
 " Plugins, etc.
 hi! link TagListFileName Directory
 call s:X("PreciseJumpTarget","B9ED67","405026","","White","Green")
-if !exists("g:jellybeans_background_color_256")
-let g:jellybeans_background_color_256=233
-end
 " Manual overrides for 256-color terminals. Dark colors auto-map badly.
 if !s:low_color
 hi StatusLineNC ctermbg=235
 hi Folded ctermbg=236
-hi FoldColumn ctermbg=234
-hi SignColumn ctermbg=236
-hi CursorColumn ctermbg=234
-hi CursorLine ctermbg=234
-hi SpecialKey ctermbg=234
-exec "hi NonText ctermbg=".g:jellybeans_background_color_256
-exec "hi LineNr ctermbg=".g:jellybeans_background_color_256
 hi DiffText ctermfg=81
-exec "hi Normal ctermbg=".g:jellybeans_background_color_256
 hi DbgBreakPt ctermbg=53
 hi IndentGuidesOdd ctermbg=235
 hi IndentGuidesEven ctermbg=234
 endif
-if exists("g:jellybeans_overrides")
+if !empty("s:overrides")
+fun! s:current_attr(group)
+let l:synid = synIDtrans(hlID(a:group))
+let l:attrs = []
+for l:attr in ["bold", "italic", "reverse", "standout", "underline", "undercurl"]
+if synIDattr(l:synid, l:attr, "gui") == 1
+call add(l:attrs, l:attr)
+endif
+endfor
+return join(l:attrs, ",")
+endfun
+fun! s:current_color(group, what, mode)
+let l:color = synIDattr(synIDtrans(hlID(a:group)), a:what, a:mode)
+if l:color == -1
+return ""
+else
+return substitute(l:color, "^#", "", "")
+endif
+endfun
+fun! s:load_color_def(group, def)
+call s:X(a:group, get(a:def, "guifg", s:current_color(a:group, "fg", "gui")),
+\                 get(a:def, "guibg", s:current_color(a:group, "bg", "gui")),
+\                 get(a:def, "attr", s:current_attr(a:group)),
+\                 get(a:def, "ctermfg", s:current_color(a:group, "fg", "cterm")),
+\                 get(a:def, "ctermbg", s:current_color(a:group, "bg", "cterm")))
+if !s:low_color
+for l:prop in ["ctermfg", "ctermbg"]
+let l:override_key = "256".l:prop
+if has_key(a:def, l:override_key)
+exec "hi ".a:group." ".l:prop."=".a:def[l:override_key]
+endif
+endfor
+endif
+endfun
 fun! s:load_colors(defs)
-for [l:group, l:v] in items(a:defs)
+for [l:group, l:def] in items(a:defs)
-call s:X(l:group, get(l:v, 'guifg', ''), get(l:v, 'guibg', ''),
+if l:group == "background"
-\                 get(l:v, 'attr', ''),
+call s:load_color_def("LineNr", l:def)
-\                 get(l:v, 'ctermfg', ''), get(l:v, 'ctermbg', ''))
+call s:load_color_def("NonText", l:def)
-if !s:low_color
+call s:load_color_def("Normal", l:def)
-for l:prop in ['ctermfg', 'ctermbg']
+else
-let l:override_key = '256'.l:prop
+call s:load_color_def(l:group, l:def)
-if has_key(l:v, l:override_key)
-exec "hi ".l:group." ".l:prop."=".l:v[l:override_key]
-endif
-endfor
 endif
 unlet l:group
-unlet l:v
+unlet l:def
 endfor
 endfun
-call s:load_colors(g:jellybeans_overrides)
+call s:load_colors(s:overrides)
 delf s:load_colors
+delf s:load_color_def
+delf s:current_color
+delf s:current_attr
 endif
 " delete functions {{{
 delf s:X
+delf s:remove_italic_attr
+delf s:prefix_highlight_value_with
 delf s:rgb
+delf s:is_empty_or_none
 delf s:color
 delf s:rgb_color
 delf s:rgb_level
 delf s:rgb_number
 delf s:grey_color

Mercurial > hg > mhoward > dotfiles / file comparison

comparison: .vim/colors/jellybeans.vim

.vim/colors/jellybeans.vim