From 24fd10b301e406ea2e6fb77c649688a3b34dc8c8 Mon Sep 17 00:00:00 2001 From: cocopon Date: Fri, 19 Apr 2019 10:02:56 +0900 Subject: [PATCH] Add support for git-messenger.vim, close #45 --- README.md | 2 ++ colors/iceberg.vim | 7 ++++++- src/iceberg.vim | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4af9e68..fc10f07 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ information. / [Denite][denite] / [EasyMotion][easymotion] / [Git Gutter][git-gutter] + / [git-messenger.vim][git-messenger.vim] / [Signify][signify] / [Sneak][sneak] / [Startify][startify] @@ -106,6 +107,7 @@ MIT License. See `LICENSE.txt` for more information. [denite]:https://github.com/Shougo/denite.nvim [easymotion]:https://github.com/easymotion/vim-easymotion [git-gutter]:https://github.com/airblade/vim-gitgutter +[git-messenger.vim]:https://github.com/rhysd/git-messenger.vim [lightline]:https://github.com/itchyny/lightline.vim [neovim]:https://neovim.io/ [pgmnt]:https://github.com/cocopon/pgmnt.vim diff --git a/colors/iceberg.vim b/colors/iceberg.vim index 6c872cd..9eb989d 100644 --- a/colors/iceberg.vim +++ b/colors/iceberg.vim @@ -8,7 +8,7 @@ " " File: iceberg.vim " Maintainer: cocopon -" Modified: 2019-01-04 19:45+0900 +" Modified: 2019-04-19 10:02+0900 " License: MIT @@ -102,6 +102,8 @@ hi! GitGutterAdd ctermbg=235 ctermfg=150 guibg=#1e2132 guifg=#b4be82 hi! GitGutterChange ctermbg=235 ctermfg=109 guibg=#1e2132 guifg=#89b8c2 hi! GitGutterChangeDelete ctermbg=235 ctermfg=109 guibg=#1e2132 guifg=#89b8c2 hi! GitGutterDelete ctermbg=235 ctermfg=203 guibg=#1e2132 guifg=#e27878 +hi! gitmessengerEndOfBuffer ctermbg=235 ctermfg=239 guibg=#1e2132 guifg=#444b71 +hi! gitmessengerPopupNormal ctermbg=235 ctermfg=252 guibg=#1e2132 guifg=#c6c8d1 hi! Sneak ctermbg=140 ctermfg=234 guibg=#a093c7 guifg=#161821 hi! SneakScope ctermbg=236 ctermfg=242 guibg=#272c42 guifg=#6b7089 hi! SyntasticErrorSign ctermbg=235 ctermfg=203 guibg=#1e2132 guifg=#e27878 @@ -157,6 +159,9 @@ hi! link jsFlowObject Normal hi! link jsFlowType PreProc hi! link graphqlName Normal hi! link graphqlOperator Normal +hi! link gitmessengerHash Comment +hi! link gitmessengerHeader Statement +hi! link gitmessengerHistory Constant hi! link jsArrowFunction Operator hi! link jsClassDefinition Normal hi! link jsClassFuncName Title diff --git a/src/iceberg.vim b/src/iceberg.vim index 827590c..f8b9e9d 100644 --- a/src/iceberg.vim +++ b/src/iceberg.vim @@ -528,6 +528,25 @@ function! s:create_context() abort \ 'guifg': g.red, \ })) + " [git-messenger.vim](https://github.com/rhysd/git-messenger.vim) + call add(links, pgmnt#hi#link('gitmessengerHash', 'Comment')) + call add(links, pgmnt#hi#link('gitmessengerHeader', 'Statement')) + call add(links, pgmnt#hi#link('gitmessengerHistory', 'Constant')) + call extend(rules, pgmnt#hi#group( + \ 'gitmessengerEndOfBuffer', { + \ 'ctermbg': c.linenr_bg, + \ 'ctermfg': c.linenr_fg, + \ 'guibg': g.linenr_bg, + \ 'guifg': g.linenr_fg, + \ })) + call extend(rules, pgmnt#hi#group( + \ 'gitmessengerPopupNormal', { + \ 'ctermbg': c.linenr_bg, + \ 'ctermfg': c.normal_fg, + \ 'guibg': g.linenr_bg, + \ 'guifg': g.normal_fg, + \ })) + " [vim-javascript](https://github.com/pangloss/vim-javascript) call add(links, pgmnt#hi#link('jsArrowFunction', 'Operator')) call add(links, pgmnt#hi#link('jsClassDefinition', 'Normal'))