Skip to content

Commit

Permalink
Fix bugs reported by @vladimir-didenko
Browse files Browse the repository at this point in the history
  • Loading branch information
swnakamura committed Dec 27, 2021
1 parent 2029099 commit 67c9e80
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
12 changes: 10 additions & 2 deletions colors/iceberg.vim
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"
" File: iceberg.vim
" Maintainer: cocopon <[email protected]>
" Modified: 2021-12-27 20:00+0900
" Modified: 2021-12-27 20:02+0900
" License: MIT


Expand Down Expand Up @@ -119,6 +119,10 @@ if &background == 'light'
hi TSMethod ctermfg=237 guifg=#505695
hi TSURI cterm=underline ctermfg=31 gui=underline guifg=#3f83a6 term=underline
hi ZenSpace ctermbg=125 guibg=#cc517a
hi LspDiagnosticsUnderlineInformation cterm=underline ctermfg=130 gui=underline guifg=#c57339 term=underline
hi LspDiagnosticsUnderlineHint cterm=underline ctermfg=130 gui=underline guifg=#c57339 term=underline
hi LspDiagnosticsUnderlineWarning cterm=underline ctermfg=130 gui=underline guifg=#c57339 term=underline
hi LspDiagnosticsUnderlineError cterm=underline ctermfg=125 gui=underline guifg=#cc517a term=underline
hi icebergALAccentRed ctermfg=125 guifg=#cc517a

if has('nvim')
Expand Down Expand Up @@ -240,6 +244,10 @@ else
hi TSMethod ctermfg=252 guifg=#a3adcb
hi TSURI cterm=underline ctermfg=109 gui=underline guifg=#89b8c2 term=underline
hi ZenSpace ctermbg=203 guibg=#e27878
hi LspDiagnosticsUnderlineInformation cterm=underline ctermfg=216 gui=underline guifg=#e2a478 term=underline
hi LspDiagnosticsUnderlineHint cterm=underline ctermfg=216 gui=underline guifg=#e2a478 term=underline
hi LspDiagnosticsUnderlineWarning cterm=underline ctermfg=216 gui=underline guifg=#e2a478 term=underline
hi LspDiagnosticsUnderlineError cterm=underline ctermfg=203 gui=underline guifg=#e27878 term=underline
hi icebergALAccentRed ctermfg=203 guifg=#e27878

if has('nvim')
Expand Down Expand Up @@ -421,7 +429,7 @@ hi! link typescriptIdentifier Statement
hi! link typescriptMessage icebergNormalFg
hi! link typescriptNull Constant
hi! link typescriptParens icebergNormalFg
hi! link LspDiagnosticsDefaultError ErrorMsg
hi! link LspDiagnosticsDefaultError ALEVirtualTextError
hi! link LspDiagnosticsDefaultWarning ALEVirtualTextWarning
hi! link LspDiagnosticsDefaultInformation ALEVirtualTextWarning
hi! link LspDiagnosticsDefaultHint ALEVirtualTextWarning
Expand Down
15 changes: 14 additions & 1 deletion src/iceberg.vim
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,19 @@ function! s:create_colors(palette) abort
\ }))
" }}}

" [Neovim built-in LSP](https://neovim.io/doc/user/lsp.html)
for [key, value] in items({'Error': 'red', 'Warning': 'orange', 'Information': 'orange', 'Hint': 'orange'})
call extend(rules, pgmnt#hi#group(
\ 'LspDiagnosticsUnderline'..key, {
\ 'cterm': 'underline',
\ 'gui': 'underline',
\ 'term': 'underline',
\ 'ctermfg': eval('c.'..value),
\ 'guifg': eval('g.'.value),
\ }))
endfor
" }}}

" Palettes for statusline plugins {{{
call extend(rules, pgmnt#hi#group(
\ 'icebergALAccentRed', {
Expand Down Expand Up @@ -844,7 +857,7 @@ function! s:create_links() abort
call add(links, pgmnt#hi#link('typescriptParens', 'icebergNormalFg'))

" [Neovim built-in LSP](https://neovim.io/doc/user/lsp.html)
call add(links, pgmnt#hi#link('LspDiagnosticsDefaultError','ErrorMsg'))
call add(links, pgmnt#hi#link('LspDiagnosticsDefaultError','ALEVirtualTextError'))
call add(links, pgmnt#hi#link('LspDiagnosticsDefaultWarning','ALEVirtualTextWarning'))
call add(links, pgmnt#hi#link('LspDiagnosticsDefaultInformation','ALEVirtualTextWarning'))
call add(links, pgmnt#hi#link('LspDiagnosticsDefaultHint','ALEVirtualTextWarning'))
Expand Down

0 comments on commit 67c9e80

Please sign in to comment.