update
This commit is contained in:
chxuan
parent
0f711c1677
commit
e11953b5a8
@ -1,3 +1,4 @@
|
||||
" vim:fdm=marker
|
||||
" Vim Color File
|
||||
" Name: onedark.vim
|
||||
" Maintainer: https://github.com/joshdick/onedark.vim/
|
||||
@ -6,9 +7,7 @@
|
||||
|
||||
" A companion [vim-airline](https://github.com/bling/vim-airline) theme is available at: https://github.com/joshdick/airline-onedark.vim
|
||||
|
||||
" +-----------------+
|
||||
" | Color Reference |
|
||||
" +-----------------+
|
||||
" Color Reference {{{
|
||||
|
||||
" The following colors were measured inside Atom using its built-in inspector.
|
||||
|
||||
@ -35,16 +34,14 @@
|
||||
" |--------------+--------------------+---------|
|
||||
" | Cyan | rgb(86, 182, 194) | #56b6c2 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Gutter Grey | rgb(99, 109, 131) | #636d83 |
|
||||
" | Gutter Grey | rgb(76, 82, 99) | #4b5263 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Comment Grey | rgb(92, 99, 112) | #5c6370 |
|
||||
" +---------------------------------------------+
|
||||
|
||||
" +----------------+
|
||||
" | Initialization |
|
||||
" +----------------+
|
||||
" }}}
|
||||
|
||||
set background=dark
|
||||
" Initialization {{{
|
||||
|
||||
highlight clear
|
||||
|
||||
@ -72,66 +69,91 @@ endif
|
||||
|
||||
" This function is based on one from FlatColor: https://github.com/MaxSt/FlatColor/
|
||||
" Which in turn was based on one found in hemisu: https://github.com/noahfrederick/vim-hemisu/
|
||||
function! s:h(group, style)
|
||||
if g:onedark_terminal_italics == 0
|
||||
if has_key(a:style, "cterm") && a:style["cterm"] == "italic"
|
||||
unlet a:style.cterm
|
||||
let s:group_colors = {} " Cache of default highlight group settings, for later reference via `onedark#extend_highlight`
|
||||
function! s:h(group, style, ...)
|
||||
if (a:0 > 0) " Will be true if we got here from onedark#extend_highlight
|
||||
let a:highlight = s:group_colors[a:group]
|
||||
for style_type in ["fg", "bg", "sp"]
|
||||
if (has_key(a:style, style_type))
|
||||
let l:default_style = (has_key(a:highlight, style_type) ? a:highlight[style_type] : { "cterm16": "NONE", "cterm": "NONE", "gui": "NONE" })
|
||||
let a:highlight[style_type] = extend(l:default_style, a:style[style_type])
|
||||
endif
|
||||
endfor
|
||||
if (has_key(a:style, "gui"))
|
||||
let a:highlight.gui = a:style.gui
|
||||
endif
|
||||
if has_key(a:style, "gui") && a:style["gui"] == "italic"
|
||||
unlet a:style.gui
|
||||
endif
|
||||
endif
|
||||
if g:onedark_termcolors == 16
|
||||
let l:ctermfg = (has_key(a:style, "fg") ? a:style.fg.cterm16 : "NONE")
|
||||
let l:ctermbg = (has_key(a:style, "bg") ? a:style.bg.cterm16 : "NONE")
|
||||
else
|
||||
let l:ctermfg = (has_key(a:style, "fg") ? a:style.fg.cterm : "NONE")
|
||||
let l:ctermbg = (has_key(a:style, "bg") ? a:style.bg.cterm : "NONE")
|
||||
let a:highlight = a:style
|
||||
let s:group_colors[a:group] = a:highlight " Cache default highlight group settings
|
||||
endif
|
||||
|
||||
if g:onedark_terminal_italics == 0
|
||||
if has_key(a:highlight, "cterm") && a:highlight["cterm"] == "italic"
|
||||
unlet a:highlight.cterm
|
||||
endif
|
||||
if has_key(a:highlight, "gui") && a:highlight["gui"] == "italic"
|
||||
unlet a:highlight.gui
|
||||
endif
|
||||
endif
|
||||
|
||||
if g:onedark_termcolors == 16
|
||||
let l:ctermfg = (has_key(a:highlight, "fg") ? a:highlight.fg.cterm16 : "NONE")
|
||||
let l:ctermbg = (has_key(a:highlight, "bg") ? a:highlight.bg.cterm16 : "NONE")
|
||||
else
|
||||
let l:ctermfg = (has_key(a:highlight, "fg") ? a:highlight.fg.cterm : "NONE")
|
||||
let l:ctermbg = (has_key(a:highlight, "bg") ? a:highlight.bg.cterm : "NONE")
|
||||
endif
|
||||
|
||||
execute "highlight" a:group
|
||||
\ "guifg=" (has_key(a:style, "fg") ? a:style.fg.gui : "NONE")
|
||||
\ "guibg=" (has_key(a:style, "bg") ? a:style.bg.gui : "NONE")
|
||||
\ "guisp=" (has_key(a:style, "sp") ? a:style.sp.gui : "NONE")
|
||||
\ "gui=" (has_key(a:style, "gui") ? a:style.gui : "NONE")
|
||||
\ "guifg=" (has_key(a:highlight, "fg") ? a:highlight.fg.gui : "NONE")
|
||||
\ "guibg=" (has_key(a:highlight, "bg") ? a:highlight.bg.gui : "NONE")
|
||||
\ "guisp=" (has_key(a:highlight, "sp") ? a:highlight.sp.gui : "NONE")
|
||||
\ "gui=" (has_key(a:highlight, "gui") ? a:highlight.gui : "NONE")
|
||||
\ "ctermfg=" . l:ctermfg
|
||||
\ "ctermbg=" . l:ctermbg
|
||||
\ "cterm=" (has_key(a:style, "cterm") ? a:style.cterm : "NONE")
|
||||
\ "cterm=" (has_key(a:highlight, "cterm") ? a:highlight.cterm : "NONE")
|
||||
endfunction
|
||||
|
||||
" +-----------------+
|
||||
" | Color Variables |
|
||||
" +-----------------+
|
||||
" public {{{
|
||||
|
||||
let s:red = { "gui": "#E06C75", "cterm": "204", "cterm16": "1" } " Alternate cterm: 168
|
||||
let s:dark_red = { "gui": "#BE5046", "cterm": "196", "cterm16": "9" }
|
||||
function! onedark#set_highlight(group, style)
|
||||
call s:h(a:group, a:style)
|
||||
endfunction
|
||||
|
||||
let s:green = { "gui": "#98C379", "cterm": "114", "cterm16": "2" }
|
||||
function! onedark#extend_highlight(group, style)
|
||||
call s:h(a:group, a:style, 1)
|
||||
endfunction
|
||||
|
||||
let s:yellow = { "gui": "#E5C07b", "cterm": "180", "cterm16": "3" }
|
||||
let s:dark_yellow = { "gui": "#D19A66", "cterm": "173", "cterm16": "11" }
|
||||
" }}}
|
||||
|
||||
let s:blue = { "gui": "#61AFEF", "cterm": "39", "cterm16": "4" } " Alternate cterm: 75
|
||||
" }}}
|
||||
|
||||
let s:purple = { "gui": "#C678DD", "cterm": "170", "cterm16": "5" } " Alternate cterm: 176
|
||||
" Color Variables {{{
|
||||
|
||||
let s:cyan = { "gui": "#56B6C2", "cterm": "38", "cterm16": "6" } " Alternate cterm: 73
|
||||
let s:colors = onedark#GetColors()
|
||||
|
||||
let s:white = { "gui": "#ABB2BF", "cterm": "145", "cterm16" : "7" }
|
||||
let s:red = s:colors.red
|
||||
let s:dark_red = s:colors.dark_red
|
||||
let s:green = s:colors.green
|
||||
let s:yellow = s:colors.yellow
|
||||
let s:dark_yellow = s:colors.dark_yellow
|
||||
let s:blue = s:colors.blue
|
||||
let s:purple = s:colors.purple
|
||||
let s:cyan = s:colors.cyan
|
||||
let s:white = s:colors.white
|
||||
let s:black = s:colors.black
|
||||
let s:visual_black = s:colors.visual_black " Black out selected text in 16-color visual mode
|
||||
let s:comment_grey = s:colors.comment_grey
|
||||
let s:gutter_fg_grey = s:colors.gutter_fg_grey
|
||||
let s:cursor_grey = s:colors.cursor_grey
|
||||
let s:visual_grey = s:colors.visual_grey
|
||||
let s:menu_grey = s:colors.menu_grey
|
||||
let s:special_grey = s:colors.special_grey
|
||||
let s:vertsplit = s:colors.vertsplit
|
||||
|
||||
let s:black = { "gui": "#282C34", "cterm": "235", "cterm16": "0" }
|
||||
let s:visual_black = { "gui": "NONE", "cterm": "NONE", "cterm16": s:black.cterm16 } " Black out selected text in 16-color visual mode
|
||||
" }}}
|
||||
|
||||
let s:comment_grey = { "gui": "#5C6370", "cterm": "59", "cterm16": "15" }
|
||||
let s:gutter_fg_grey = { "gui": "#636D83", "cterm": "238", "cterm16": "15" }
|
||||
let s:cursor_grey = { "gui": "#2C323C", "cterm": "236", "cterm16": "8" }
|
||||
let s:visual_grey = { "gui": "#3E4452", "cterm": "237", "cterm16": "15" }
|
||||
let s:menu_grey = { "gui": s:visual_grey.gui, "cterm": s:visual_grey.cterm, "cterm16": "8" }
|
||||
let s:special_grey = { "gui": "#3B4048", "cterm": "238", "cterm16": "15" }
|
||||
let s:vertsplit = { "gui": "#181A1F", "cterm": "59", "cterm16": "15" }
|
||||
|
||||
" +---------------------------------------------------------+
|
||||
" | Syntax Groups (descriptions and ordering from `:h w18`) |
|
||||
" +---------------------------------------------------------+
|
||||
" Syntax Groups (descriptions and ordering from `:h w18`) {{{
|
||||
|
||||
call s:h("Comment", { "fg": s:comment_grey, "gui": "italic", "cterm": "italic" }) " any comment
|
||||
call s:h("Constant", { "fg": s:cyan }) " any constant
|
||||
@ -162,34 +184,38 @@ call s:h("Special", { "fg": s:blue }) " any special symbol
|
||||
call s:h("SpecialChar", {}) " special character in a constant
|
||||
call s:h("Tag", {}) " you can use CTRL-] on this
|
||||
call s:h("Delimiter", {}) " character that needs attention
|
||||
call s:h("SpecialComment", {}) " special things inside a comment
|
||||
call s:h("SpecialComment", { "fg": s:comment_grey }) " special things inside a comment
|
||||
call s:h("Debug", {}) " debugging statements
|
||||
call s:h("Underlined", {}) " text that stands out, HTML links
|
||||
call s:h("Underlined", { "gui": "underline", "cterm": "underline" }) " text that stands out, HTML links
|
||||
call s:h("Ignore", {}) " left blank, hidden
|
||||
call s:h("Error", { "fg": s:red }) " any erroneous construct
|
||||
call s:h("Todo", { "fg": s:purple }) " anything that needs extra attention; mostly the keywords TODO FIXME and XXX
|
||||
|
||||
" +----------------------------------------------------------------------+
|
||||
" | Highlighting Groups (descriptions and ordering from `:h hitest.vim`) |
|
||||
" +----------------------------------------------------------------------+
|
||||
" }}}
|
||||
|
||||
" Highlighting Groups (descriptions and ordering from `:h highlight-groups`) {{{
|
||||
call s:h("ColorColumn", { "bg": s:cursor_grey }) " used for the columns set with 'colorcolumn'
|
||||
call s:h("Conceal", {}) " placeholder characters substituted for concealed text (see 'conceallevel')
|
||||
call s:h("Cursor", { "fg": s:black, "bg": s:blue }) " the character under the cursor
|
||||
call s:h("CursorIM", {}) " like Cursor, but used when in IME mode
|
||||
call s:h("CursorColumn", { "bg": s:cursor_grey }) " the screen column that the cursor is in when 'cursorcolumn' is set
|
||||
call s:h("CursorLine", { "bg": s:cursor_grey }) " the screen line that the cursor is in when 'cursorline' is set
|
||||
if &diff
|
||||
" Don't change the background color in diff mode
|
||||
call s:h("CursorLine", { "gui": "underline" }) " the screen line that the cursor is in when 'cursorline' is set
|
||||
else
|
||||
call s:h("CursorLine", { "bg": s:cursor_grey }) " the screen line that the cursor is in when 'cursorline' is set
|
||||
endif
|
||||
call s:h("Directory", { "fg": s:blue }) " directory names (and other special names in listings)
|
||||
call s:h("DiffAdd", { "fg": s:green }) " diff mode: Added line
|
||||
call s:h("DiffChange", { "fg": s:dark_yellow }) " diff mode: Changed line
|
||||
call s:h("DiffDelete", { "fg": s:red }) " diff mode: Deleted line
|
||||
call s:h("DiffText", { "fg": s:blue }) " diff mode: Changed text within a changed line
|
||||
call s:h("ErrorMsg", {}) " error messages on the command line
|
||||
call s:h("DiffAdd", { "bg": s:green, "fg": s:black }) " diff mode: Added line
|
||||
call s:h("DiffChange", { "bg": s:yellow, "fg": s:black }) " diff mode: Changed line
|
||||
call s:h("DiffDelete", { "bg": s:red, "fg": s:black }) " diff mode: Deleted line
|
||||
call s:h("DiffText", { "bg": s:black, "fg": s:yellow }) " diff mode: Changed text within a changed line
|
||||
call s:h("ErrorMsg", { "fg": s:red }) " error messages on the command line
|
||||
call s:h("VertSplit", { "fg": s:vertsplit }) " the column separating vertically split windows
|
||||
call s:h("Folded", { "fg": s:comment_grey }) " line used for closed folds
|
||||
call s:h("FoldColumn", {}) " 'foldcolumn'
|
||||
call s:h("SignColumn", {}) " column where signs are displayed
|
||||
call s:h("IncSearch", { "fg": s:black, "bg": s:yellow }) " 'incsearch' highlighting; also used for the text replaced with ":s///c"
|
||||
call s:h("IncSearch", { "fg": s:yellow, "bg": s:comment_grey }) " 'incsearch' highlighting; also used for the text replaced with ":s///c"
|
||||
call s:h("LineNr", { "fg": s:gutter_fg_grey }) " Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
|
||||
call s:h("CursorLineNr", {}) " Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
|
||||
call s:h("MatchParen", { "fg": s:blue, "gui": "underline" }) " The character under the cursor or just before it, if it is a paired bracket, and its match.
|
||||
@ -198,11 +224,12 @@ call s:h("MoreMsg", {}) " more-prompt
|
||||
call s:h("NonText", { "fg": s:special_grey }) " '~' and '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line).
|
||||
call s:h("Normal", { "fg": s:white, "bg": s:black }) " normal text
|
||||
call s:h("Pmenu", { "bg": s:menu_grey }) " Popup menu: normal item.
|
||||
call s:h("PmenuSel", { "bg": s:black }) " Popup menu: selected item.
|
||||
call s:h("PmenuSel", { "fg": s:black, "bg": s:blue }) " Popup menu: selected item.
|
||||
call s:h("PmenuSbar", { "bg": s:special_grey }) " Popup menu: scrollbar.
|
||||
call s:h("PmenuThumb", { "bg": s:white }) " Popup menu: Thumb of the scrollbar.
|
||||
call s:h("Question", { "fg": s:purple }) " hit-enter prompt and yes/no questions
|
||||
call s:h("Search", { "fg": s:black, "bg": s:yellow }) " Last search pattern highlighting (see 'hlsearch'). Also used for highlighting the current line in the quickfix window and similar items that need to stand out.
|
||||
call s:h("Search", { "fg": s:black, "bg": s:yellow }) " Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out.
|
||||
call s:h("QuickFixLine", { "fg": s:black, "bg": s:yellow }) " Current quickfix item in the quickfix window.
|
||||
call s:h("SpecialKey", { "fg": s:special_grey }) " Meta and special keys listed with ":map", also for text used to show unprintable characters in the text, 'listchars'. Generally: text that is displayed differently from what it really is.
|
||||
call s:h("SpellBad", { "fg": s:red, "gui": "underline", "cterm": "underline" }) " Word that is not recognized by the spellchecker. This will be combined with the highlighting used otherwise.
|
||||
call s:h("SpellCap", { "fg": s:dark_yellow }) " Word that should start with a capital. This will be combined with the highlighting used otherwise.
|
||||
@ -216,12 +243,12 @@ call s:h("TabLineSel", { "fg": s:white }) " tab pages line, active tab page labe
|
||||
call s:h("Title", { "fg": s:green }) " titles for output from ":set all", ":autocmd" etc.
|
||||
call s:h("Visual", { "fg": s:visual_black, "bg": s:visual_grey }) " Visual mode selection
|
||||
call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim is "Not Owning the Selection". Only X11 Gui's gui-x11 and xterm-clipboard supports this.
|
||||
call s:h("WarningMsg", { "fg": s:red }) " warning messages
|
||||
call s:h("WildMenu", {}) " current match in 'wildmenu' completion
|
||||
call s:h("WarningMsg", { "fg": s:yellow }) " warning messages
|
||||
call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion
|
||||
|
||||
" +--------------------------------+
|
||||
" | Language-Specific Highlighting |
|
||||
" +--------------------------------+
|
||||
" }}}
|
||||
|
||||
" Language-Specific Highlighting {{{
|
||||
|
||||
" CSS
|
||||
call s:h("cssAttrComma", { "fg": s:purple })
|
||||
@ -244,6 +271,9 @@ call s:h("cssSelectorOp", { "fg": s:purple })
|
||||
call s:h("cssSelectorOp2", { "fg": s:purple })
|
||||
call s:h("cssTagName", { "fg": s:red })
|
||||
|
||||
" Go
|
||||
call s:h("goDeclaration", { "fg": s:purple })
|
||||
|
||||
" HTML
|
||||
call s:h("htmlTitle", { "fg": s:white })
|
||||
call s:h("htmlArg", { "fg": s:dark_yellow })
|
||||
@ -265,17 +295,26 @@ call s:h("javaScriptRequire", { "fg": s:cyan })
|
||||
call s:h("javaScriptReserved", { "fg": s:purple })
|
||||
" https://github.com/pangloss/vim-javascript
|
||||
call s:h("jsArrowFunction", { "fg": s:purple })
|
||||
call s:h("jsClassKeywords", { "fg": s:purple })
|
||||
call s:h("jsClassKeyword", { "fg": s:purple })
|
||||
call s:h("jsClassMethodType", { "fg": s:purple })
|
||||
call s:h("jsDocParam", { "fg": s:blue })
|
||||
call s:h("jsDocTags", { "fg": s:purple })
|
||||
call s:h("jsExport", { "fg": s:purple })
|
||||
call s:h("jsExportDefault", { "fg": s:purple })
|
||||
call s:h("jsExtendsKeyword", { "fg": s:purple })
|
||||
call s:h("jsFrom", { "fg": s:purple })
|
||||
call s:h("jsFuncCall", { "fg": s:blue })
|
||||
call s:h("jsFunction", { "fg": s:purple })
|
||||
call s:h("jsGenerator", { "fg": s:yellow })
|
||||
call s:h("jsGlobalObjects", { "fg": s:yellow })
|
||||
call s:h("jsImport", { "fg": s:purple })
|
||||
call s:h("jsModuleAs", { "fg": s:purple })
|
||||
call s:h("jsModuleWords", { "fg": s:purple })
|
||||
call s:h("jsModules", { "fg": s:purple })
|
||||
call s:h("jsNull", { "fg": s:dark_yellow })
|
||||
call s:h("jsOperator", { "fg": s:purple })
|
||||
call s:h("jsStorageClass", { "fg": s:purple })
|
||||
call s:h("jsSuper", { "fg": s:red })
|
||||
call s:h("jsTemplateBraces", { "fg": s:dark_red })
|
||||
call s:h("jsTemplateVar", { "fg": s:green })
|
||||
call s:h("jsThis", { "fg": s:red })
|
||||
@ -293,6 +332,7 @@ call s:h("javascriptFuncArg", { "fg": s:white })
|
||||
call s:h("javascriptFuncKeyword", { "fg": s:purple })
|
||||
call s:h("javascriptIdentifier", { "fg": s:red })
|
||||
call s:h("javascriptImport", { "fg": s:purple })
|
||||
call s:h("javascriptMethodName", { "fg": s:white })
|
||||
call s:h("javascriptObjectLabel", { "fg": s:white })
|
||||
call s:h("javascriptOpSymbol", { "fg": s:cyan })
|
||||
call s:h("javascriptOpSymbols", { "fg": s:cyan })
|
||||
@ -313,6 +353,11 @@ call s:h("jsonString", { "fg": s:green })
|
||||
call s:h("jsonStringSQError", { "fg": s:red, "gui": "reverse" })
|
||||
call s:h("jsonSemicolonError", { "fg": s:red, "gui": "reverse" })
|
||||
|
||||
" LESS
|
||||
call s:h("lessVariable", { "fg": s:purple })
|
||||
call s:h("lessAmpersandChar", { "fg": s:white })
|
||||
call s:h("lessClass", { "fg": s:dark_yellow })
|
||||
|
||||
" Markdown
|
||||
call s:h("markdownCode", { "fg": s:green })
|
||||
call s:h("markdownCodeBlock", { "fg": s:green })
|
||||
@ -338,6 +383,42 @@ call s:h("markdownLinkText", { "fg": s:blue })
|
||||
call s:h("markdownLinkDelimiter", { "fg": s:white })
|
||||
call s:h("markdownUrl", { "fg": s:purple })
|
||||
|
||||
" Perl
|
||||
call s:h("perlFiledescRead", { "fg": s:green })
|
||||
call s:h("perlFunction", { "fg": s:purple })
|
||||
call s:h("perlMatchStartEnd",{ "fg": s:blue })
|
||||
call s:h("perlMethod", { "fg": s:purple })
|
||||
call s:h("perlPOD", { "fg": s:comment_grey })
|
||||
call s:h("perlSharpBang", { "fg": s:comment_grey })
|
||||
call s:h("perlSpecialString",{ "fg": s:cyan })
|
||||
call s:h("perlStatementFiledesc", { "fg": s:red })
|
||||
call s:h("perlStatementFlow",{ "fg": s:red })
|
||||
call s:h("perlStatementInclude", { "fg": s:purple })
|
||||
call s:h("perlStatementScalar",{ "fg": s:purple })
|
||||
call s:h("perlStatementStorage", { "fg": s:purple })
|
||||
call s:h("perlSubName",{ "fg": s:yellow })
|
||||
call s:h("perlVarPlain",{ "fg": s:blue })
|
||||
|
||||
" PHP
|
||||
call s:h("phpVarSelector", { "fg": s:red })
|
||||
call s:h("phpOperator", { "fg": s:white })
|
||||
call s:h("phpParent", { "fg": s:white })
|
||||
call s:h("phpMemberSelector", { "fg": s:white })
|
||||
call s:h("phpType", { "fg": s:purple })
|
||||
call s:h("phpKeyword", { "fg": s:purple })
|
||||
call s:h("phpClass", { "fg": s:yellow })
|
||||
call s:h("phpUseClass", { "fg": s:white })
|
||||
call s:h("phpUseAlias", { "fg": s:white })
|
||||
call s:h("phpInclude", { "fg": s:purple })
|
||||
call s:h("phpClassExtends", { "fg": s:green })
|
||||
call s:h("phpDocTags", { "fg": s:white })
|
||||
call s:h("phpFunction", { "fg": s:blue })
|
||||
call s:h("phpFunctions", { "fg": s:cyan })
|
||||
call s:h("phpMethodsVar", { "fg": s:dark_yellow })
|
||||
call s:h("phpMagicConstants", { "fg": s:dark_yellow })
|
||||
call s:h("phpSuperglobals", { "fg": s:red })
|
||||
call s:h("phpConstants", { "fg": s:dark_yellow })
|
||||
|
||||
" Ruby
|
||||
call s:h("rubyBlockParameter", { "fg": s:red})
|
||||
call s:h("rubyBlockParameterList", { "fg": s:red })
|
||||
@ -359,6 +440,7 @@ call s:h("rubyStringDelimiter", { "fg": s:green})
|
||||
call s:h("rubySymbol", { "fg": s:cyan})
|
||||
|
||||
" Sass
|
||||
" https://github.com/tpope/vim-haml
|
||||
call s:h("sassAmpersand", { "fg": s:red })
|
||||
call s:h("sassClass", { "fg": s:dark_yellow })
|
||||
call s:h("sassControl", { "fg": s:purple })
|
||||
@ -372,6 +454,14 @@ call s:h("sassMediaOperators", { "fg": s:white })
|
||||
call s:h("sassMixin", { "fg": s:purple })
|
||||
call s:h("sassMixinName", { "fg": s:blue })
|
||||
call s:h("sassMixing", { "fg": s:purple })
|
||||
call s:h("sassVariable", { "fg": s:purple })
|
||||
" https://github.com/cakebaker/scss-syntax.vim
|
||||
call s:h("scssExtend", { "fg": s:purple })
|
||||
call s:h("scssImport", { "fg": s:purple })
|
||||
call s:h("scssInclude", { "fg": s:purple })
|
||||
call s:h("scssMixin", { "fg": s:purple })
|
||||
call s:h("scssSelectorName", { "fg": s:dark_yellow })
|
||||
call s:h("scssVariable", { "fg": s:purple })
|
||||
|
||||
" TypeScript
|
||||
call s:h("typescriptReserved", { "fg": s:purple })
|
||||
@ -384,15 +474,21 @@ call s:h("xmlEndTag", { "fg": s:red })
|
||||
call s:h("xmlTag", { "fg": s:red })
|
||||
call s:h("xmlTagName", { "fg": s:red })
|
||||
|
||||
" +---------------------+
|
||||
" | Plugin Highlighting |
|
||||
" +---------------------+
|
||||
" }}}
|
||||
|
||||
" Plugin Highlighting {{{
|
||||
|
||||
" airblade/vim-gitgutter
|
||||
hi link GitGutterAdd SignifySignAdd
|
||||
hi link GitGutterChange SignifySignChange
|
||||
hi link GitGutterDelete SignifySignDelete
|
||||
|
||||
" easymotion/vim-easymotion
|
||||
call s:h("EasyMotionTarget", { "fg": s:red, "gui": "bold", "cterm": "bold" })
|
||||
call s:h("EasyMotionTarget2First", { "fg": s:yellow, "gui": "bold", "cterm": "bold" })
|
||||
call s:h("EasyMotionTarget2Second", { "fg": s:dark_yellow, "gui": "bold", "cterm": "bold" })
|
||||
call s:h("EasyMotionShade", { "fg": s:comment_grey })
|
||||
|
||||
" mhinz/vim-signify
|
||||
call s:h("SignifySignAdd", { "fg": s:green })
|
||||
call s:h("SignifySignChange", { "fg": s:yellow })
|
||||
@ -407,9 +503,9 @@ call s:h("NeomakeInfoSign", { "fg": s:blue })
|
||||
call s:h("diffAdded", { "fg": s:green })
|
||||
call s:h("diffRemoved", { "fg": s:red })
|
||||
|
||||
" +------------------+
|
||||
" | Git Highlighting |
|
||||
" +------------------+
|
||||
" }}}
|
||||
|
||||
" Git Highlighting {{{
|
||||
|
||||
call s:h("gitcommitComment", { "fg": s:comment_grey })
|
||||
call s:h("gitcommitUnmerged", { "fg": s:green })
|
||||
@ -423,6 +519,8 @@ call s:h("gitcommitDiscardedFile", { "fg": s:red })
|
||||
call s:h("gitcommitSelectedFile", { "fg": s:green })
|
||||
call s:h("gitcommitUnmergedFile", { "fg": s:yellow })
|
||||
call s:h("gitcommitFile", {})
|
||||
call s:h("gitcommitSummary", { "fg": s:white })
|
||||
call s:h("gitcommitOverflow", { "fg": s:red })
|
||||
hi link gitcommitNoBranch gitcommitBranch
|
||||
hi link gitcommitUntracked gitcommitComment
|
||||
hi link gitcommitDiscarded gitcommitComment
|
||||
@ -431,9 +529,9 @@ hi link gitcommitDiscardedArrow gitcommitDiscardedFile
|
||||
hi link gitcommitSelectedArrow gitcommitSelectedFile
|
||||
hi link gitcommitUnmergedArrow gitcommitUnmergedFile
|
||||
|
||||
" +------------------------+
|
||||
" | Neovim terminal colors |
|
||||
" +------------------------+
|
||||
" }}}
|
||||
|
||||
" Neovim terminal colors {{{
|
||||
|
||||
if has("nvim")
|
||||
let g:terminal_color_0 = s:black.gui
|
||||
@ -455,3 +553,9 @@ if has("nvim")
|
||||
let g:terminal_color_background = g:terminal_color_0
|
||||
let g:terminal_color_foreground = g:terminal_color_7
|
||||
endif
|
||||
|
||||
" }}}
|
||||
|
||||
" Must appear at the end of the file to work around this oddity:
|
||||
" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
|
||||
set background=dark
|
||||
|
||||
Loading…
Reference in New Issue
Block a user