m-vim_plugins/onedark.vim
1
0
Fork 0
mirror of https://github.com/joshdick/onedark.vim.git synced 2025-11-13 13:33:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'kristijanhusak-feature/extend-highlight-group'

Browse Source
This commit is contained in:
Josh Dick
2017-11-28 18:51:24 -05:00
parent d759413977 88b7d34306
commit 62f84d27c2
2 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
README.md
View File

@@ -152,9 +152,27 @@ If all comments look like the one in the screenshot above, you have enabled ital
### Customizing onedark.vim's look without forking the repository ### Customizing onedark.vim's look without forking the repository
onedark.vim exposes a function called `onedark#set_highlight` that you can call from within your `~/.vimrc` in order to customize the look of onedark.vim by overriding its defaults. onedark.vim exposes `onedark#extend_highlight` and `onedark#set_highlight` functions that you can call from within your `~/.vimrc` in order to customize the look of onedark.vim.
The function's first argument should be the name of a highlight group, and its second argument should be style data. #### `onedark#extend_highlight`
`onedark#extend_highlight` allows you to customize individual aspects of onedark.vim's existing highlight groups, overriding only the keys you provide. (To completely redefine/override an existing highlight group, see `onedark#set_highlight` below.)
`onedark#extend_highlight`'s first argunment should be the name of a highlight group, and its second argument should be style data.
For example, if you want functions to be bold only in GUI mode, place the following lines **before** the `colorscheme onedark` line in your `~/.vimrc`:
```vim
if (has("autocmd") && has("gui_running"))
autocmd ColorScheme * call onedark#extend_highlight("Function", { "gui": "bold" })
end
```
#### `onedark#set_highlight`
`onedark#set_highlight` allows you to completely redefine/override highlight groups of your choosing.
`onedark#set_highlight`'s first argument should be the name of a highlight group, and its second argument should be style data.
For example, to remove the background color only when running in terminals (outside GUI mode and for use in transparent terminals,) place the following lines **before** the `colorscheme onedark` line in your `~/.vimrc`: For example, to remove the background color only when running in terminals (outside GUI mode and for use in transparent terminals,) place the following lines **before** the `colorscheme onedark` line in your `~/.vimrc`:
@@ -170,7 +188,7 @@ if (has("autocmd") && !has("gui_running"))
end end
``` ```
You can also override a color across all highlights by adding the color definitions to the `g:onedark_color_overrides` dictionary in your `~/.vimrc` like so: Finally, you can also override a color across all highlights by adding color definitions to the `g:onedark_color_overrides` dictionary in your `~/.vimrc` like so:
```vim ```vim
let g:onedark_color_overrides = { let g:onedark_color_overrides = {

39
colors/onedark.vim
View File

@@ -69,30 +69,37 @@ endif
" This function is based on one from FlatColor: https://github.com/MaxSt/FlatColor/ " 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/ " Which in turn was based on one found in hemisu: https://github.com/noahfrederick/vim-hemisu/
function! s:h(group, style) let s:group_colors = {} " Cache of default highlight group settings, for later reference via `onedark#extend_highlight`
function! s:h(group, style, ...)
let a:highlight = a:0 > 0 ? extend(s:group_colors[a:group], a:style) : a:style
if g:onedark_terminal_italics == 0 if g:onedark_terminal_italics == 0
if has_key(a:style, "cterm") && a:style["cterm"] == "italic" if has_key(a:highlight, "cterm") && a:highlight["cterm"] == "italic"
unlet a:style.cterm unlet a:highlight.cterm
endif endif
if has_key(a:style, "gui") && a:style["gui"] == "italic" if has_key(a:highlight, "gui") && a:highlight["gui"] == "italic"
unlet a:style.gui unlet a:highlight.gui
endif endif
endif endif
if g:onedark_termcolors == 16 if g:onedark_termcolors == 16
let l:ctermfg = (has_key(a:style, "fg") ? a:style.fg.cterm16 : "NONE") let l:ctermfg = (has_key(a:highlight, "fg") ? a:highlight.fg.cterm16 : "NONE")
let l:ctermbg = (has_key(a:style, "bg") ? a:style.bg.cterm16 : "NONE") let l:ctermbg = (has_key(a:highlight, "bg") ? a:highlight.bg.cterm16 : "NONE")
else else
let l:ctermfg = (has_key(a:style, "fg") ? a:style.fg.cterm : "NONE") let l:ctermfg = (has_key(a:highlight, "fg") ? a:highlight.fg.cterm : "NONE")
let l:ctermbg = (has_key(a:style, "bg") ? a:style.bg.cterm : "NONE") let l:ctermbg = (has_key(a:highlight, "bg") ? a:highlight.bg.cterm : "NONE")
endif endif
execute "highlight" a:group execute "highlight" a:group
\ "guifg=" (has_key(a:style, "fg") ? a:style.fg.gui : "NONE") \ "guifg=" (has_key(a:highlight, "fg") ? a:highlight.fg.gui : "NONE")
\ "guibg=" (has_key(a:style, "bg") ? a:style.bg.gui : "NONE") \ "guibg=" (has_key(a:highlight, "bg") ? a:highlight.bg.gui : "NONE")
\ "guisp=" (has_key(a:style, "sp") ? a:style.sp.gui : "NONE") \ "guisp=" (has_key(a:highlight, "sp") ? a:highlight.sp.gui : "NONE")
\ "gui=" (has_key(a:style, "gui") ? a:style.gui : "NONE") \ "gui=" (has_key(a:highlight, "gui") ? a:highlight.gui : "NONE")
\ "ctermfg=" . l:ctermfg \ "ctermfg=" . l:ctermfg
\ "ctermbg=" . l:ctermbg \ "ctermbg=" . l:ctermbg
\ "cterm=" (has_key(a:style, "cterm") ? a:style.cterm : "NONE") \ "cterm=" (has_key(a:highlight, "cterm") ? a:highlight.cterm : "NONE")
let s:group_colors[a:group] = a:highlight
endfunction endfunction
" public {{{ " public {{{
@@ -101,6 +108,10 @@ function! onedark#set_highlight(group, style)
call s:h(a:group, a:style) call s:h(a:group, a:style)
endfunction endfunction
function! onedark#extend_highlight(group, style)
call s:h(a:group, a:style, 1)
endfunction
" }}} " }}}
" }}} " }}}