Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error underlines and helpfile tweaks #203

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Error underlines and helpfile tweaks #203

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebe38f1
Fix helpstar and helpbar, add s:ft_undercurl
LunarWatcher Jun 10, 2024
5211bf6
Add ctermul, add cterm=underline to s:ft_undercurl
LunarWatcher Jun 10, 2024
474ffbd
Add undercurl to warning, change helpBar/Star/Backtick to link to Ope…
LunarWatcher Jun 10, 2024
bc921f4
Switch from Operator to Typedef, and include helpIgnore
LunarWatcher Jun 10, 2024
8aa5f3d
Remove underlines for FernGitStatusUnmerged/Worktree
LunarWatcher Jun 12, 2024
54b3386
Revert Error and WarningMsg additions
LunarWatcher Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions colors/PaperColor.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,18 +817,21 @@ fun! s:set_format_attributes()
let s:ft_reverse = " cterm=reverse gui=reverse "
let s:ft_italic = " cterm=italic gui=italic "
let s:ft_italic_bold = " cterm=italic,bold gui=italic,bold "
let s:ft_undercurl = " cterm=underline gui=undercurl "
elseif s:mode == s:MODE_256_COLOR
let s:ft_bold = " cterm=bold "
let s:ft_none = " cterm=none "
let s:ft_reverse = " cterm=reverse "
let s:ft_italic = " cterm=italic "
let s:ft_italic_bold = " cterm=italic,bold "
let s:ft_undercurl = " cterm=underline "
else
let s:ft_bold = ""
let s:ft_none = " cterm=none "
let s:ft_reverse = " cterm=reverse "
let s:ft_italic = ""
let s:ft_italic_bold = ""
let s:ft_undercurl = ""
endif

" Unless instructed otherwise either by theme setting or user overriding
Expand Down Expand Up @@ -918,13 +921,21 @@ fun! s:set_color_variables()
fun! s:create_color_variables(color_name, rich_color, term_color)
let {'s:fg_' . a:color_name} = ' ctermfg=' . a:rich_color[1] . ' '
let {'s:bg_' . a:color_name} = ' ctermbg=' . a:rich_color[1] . ' '
let {'s:sp_' . a:color_name} = ''
if has('patch-8.2.863')
let {'s:sp_' . a:color_name} = ' ctermul=' . a:rich_color[1] . ' '
else
let {'s:sp_' . a:color_name} = ' '
endif
endfun
else
fun! s:create_color_variables(color_name, rich_color, term_color)
let {'s:fg_' . a:color_name} = ' ctermfg=' . a:term_color . ' '
let {'s:bg_' . a:color_name} = ' ctermbg=' . a:term_color . ' '
let {'s:sp_' . a:color_name} = ''
if has('patch-8.2.863')
let {'s:sp_' . a:color_name} = ' ctermul=' . a:term_color . ' '
else
let {'s:sp_' . a:color_name} = ' '
endif
endfun
endif
" }}}
Expand Down Expand Up @@ -1314,6 +1325,12 @@ fun! s:apply_syntax_highlightings()
exec 'hi vimGroup' . s:fg_navy . s:ft_bold
exec 'hi vimOnlyOption' . s:fg_blue

" Helpfile
exec 'hi link helpIgnore Typedef'
exec 'hi link helpStar Typedef'
exec 'hi link helpBar Typedef'
exec 'hi link helpBacktick Typedef'

" Makefile Highlighting
exec 'hi makeIdent' . s:fg_blue
exec 'hi makeSpecTarget' . s:fg_olive
Expand Down Expand Up @@ -2165,6 +2182,10 @@ fun! s:apply_syntax_highlightings()
exec 'hi NERDTreeOpenable' . s:fg_aqua . s:ft_bold
exec 'hi NERDTreeClosable' . s:fg_pink

" Plugin: vim-fern-git-status
exec 'hi FernGitStatusUnmerged' . s:fg_error_fg . s:bg_error_bg
exec 'hi FernGitStatusWorktree' . s:fg_pink

" Plugin: Tagbar
exec 'hi TagbarHelpTitle' . s:fg_blue . s:ft_bold
exec 'hi TagbarHelp' . s:fg_foreground
Expand Down Expand Up @@ -2260,8 +2281,8 @@ fun! s:apply_syntax_highlightings()
exec 'hi CocInfoFloat' . s:fg_popupmenu_fg . s:bg_popupmenu_bg . s:ft_none
exec 'hi CocHintFloat' . s:fg_popupmenu_fg . s:bg_popupmenu_bg . s:ft_none

exec 'hi CocErrorHighlight' . s:fg_foreground . s:bg_spellbad
exec 'hi CocWarningHighlight' . s:fg_foreground . s:bg_spellcap
exec 'hi CocErrorHighlight' . s:fg_foreground . s:bg_spellbad . s:ft_undercurl . s:sp_red
exec 'hi CocWarningHighlight' . s:fg_foreground . s:bg_spellcap . s:ft_undercurl
exec 'hi CocInfoHighlight' . s:fg_foreground . s:bg_spellcap
exec 'hi CocHintHighlight' . s:fg_foreground . s:bg_spellcap

Expand Down