diff vendor/vim-packs/srcery-vim/colors/srcery.vim @ 726:78469331407e default tip

Update syntaxes
author nanaya <me@nanaya.net>
date Mon, 19 Aug 2024 17:04:13 +0900
parents 1e0f578f6752
children
line wrap: on
line diff
--- a/vendor/vim-packs/srcery-vim/colors/srcery.vim	Mon Aug 19 17:03:52 2024 +0900
+++ b/vendor/vim-packs/srcery-vim/colors/srcery.vim	Mon Aug 19 17:04:13 2024 +0900
@@ -171,11 +171,10 @@
 
 " Normal text
 "
-if g:srcery_bg_passthrough == 1 && !has('gui_running')
-  call s:HL('Normal', s:bright_white, s:none)
- else
-  call s:HL('Normal', s:bright_white, s:black)
-endif
+call s:HL('Normal', s:bright_white, g:srcery_bg)
+
+call s:HL('FloatBorder', s:white, g:srcery_bg)
+call s:HL('NormalFloat', s:none, s:xgray2)
 
 if v:version >= 700
   " Screen line that the cursor is
@@ -206,11 +205,7 @@
   call s:HL('Conceal', s:blue, s:none)
 
   " Line number of CursorLine
-  if g:srcery_bg_passthrough == 1 && !has('gui_running')
-    call s:HL('CursorLineNr', s:yellow, s:none)
-  else
-    call s:HL('CursorLineNr', s:yellow, s:black)
-  endif
+  call s:HL('CursorLineNr', s:yellow, g:srcery_bg)
 
 endif
 
@@ -227,29 +222,23 @@
 
 if g:srcery_inverse == 1 && g:srcery_inverse_matches == 1
   call s:HL('Search', s:none, s:none, s:inverse)
-  call s:HL('IncSearch', s:none, s:none, s:inverse)
+  call s:HL('IncSearch', s:none, s:none, s:underline . s:inverse . s:bold)
+  call s:HL('CurSearch', s:none, s:none, s:underline . s:inverse . s:bold)
 else
-  call s:HL('Search', s:none, s:xgray5, s:bold)
+  call s:HL('Search', s:none, s:xgray5)
   call s:HL('IncSearch', s:none, s:xgray5, s:underline . s:bold)
+  call s:HL('CurSearch', s:none, s:xgray5, s:underline . s:bold)
 endif
 
 call s:HL('Underlined', s:blue, s:none, s:underline)
 
 call s:HL('StatusLine',   s:bright_white, s:xgray2)
 
-if g:srcery_bg_passthrough == 1 && !has('gui_running')
-  call s:HL('StatusLineNC', s:bright_black, s:none, s:underline)
-
-  " The column separating vertically split windows
-  call s:HL('VertSplit', s:bright_white, s:none)
-
-  " Current match in wildmenu completion
-  call s:HL('WildMenu', s:blue, s:none, s:bold)
-else
-  call s:HL('StatusLineNC', s:bright_black, s:black, s:underline)
-  call s:HL('VertSplit', s:bright_white, s:black)
-  call s:HL('WildMenu', s:blue, s:black, s:bold)
-endif
+call s:HL('StatusLineNC', s:bright_black, g:srcery_bg, s:underline)
+" The column separating vertically split windows
+call s:HL('VertSplit', s:bright_white, g:srcery_bg)
+" Current match in wildmenu completion
+call s:HL('WildMenu', s:blue, g:srcery_bg, s:bold)
 
 " Directory names, special names in listing
 hi! link Directory SrceryGreenBold
@@ -274,19 +263,13 @@
 " Line number for :number and :# commands
 call s:HL('LineNr', s:bright_black)
 
-if g:srcery_bg_passthrough == 1 && !has('gui_running')
-  " Column where signs are displayed
-  " TODO Possibly need to fix  SignColumn
-  call s:HL('SignColumn', s:none, s:none)
-  " Line used for closed folds
-  call s:HL('Folded', s:bright_black, s:none, s:italic)
-  " Column where folds are displayed
-  call s:HL('FoldColumn', s:bright_black, s:none)
-else
-  call s:HL('SignColumn', s:none, s:black)
-  call s:HL('Folded', s:bright_black, s:black, s:italic)
-  call s:HL('FoldColumn', s:bright_black, s:black)
-endif
+" Column where signs are displayed
+" TODO Possibly need to fix  SignColumn
+call s:HL('SignColumn', s:none, g:srcery_bg)
+" Line used for closed folds
+call s:HL('Folded', s:bright_black, g:srcery_bg, s:italic)
+" Column where folds are displayed
+call s:HL('FoldColumn', s:bright_black, g:srcery_bg)
 
 " }}}
 " Cursor: {{{
@@ -307,11 +290,7 @@
 
 call s:HL('Comment', s:bright_black, s:none, s:italic)
 
-if g:srcery_bg_passthrough == 1 && !has('gui_running')
-  call s:HL('Todo', s:bright_white, s:none, s:bold . s:italic)
-else
-  call s:HL('Todo', s:bright_white, s:black, s:bold . s:italic)
-endif
+call s:HL('Todo', s:bright_white, g:srcery_bg, s:bold . s:italic)
 
 call s:HL('Error', s:bright_white, s:red, s:bold)
 
@@ -329,7 +308,7 @@
 " try, catch, throw
 hi! link Exception SrceryRed
 " sizeof, "+", "*", etc.
-hi! link Operator Normal
+hi! link Operator SrceryBrightWhite
 " Any other keyword
 hi! link Keyword SrceryRed
 
@@ -388,31 +367,19 @@
   " Popup menu: selected item
   call s:HL('PmenuSel', s:bright_white, s:blue, s:bold)
 
-  if g:srcery_bg_passthrough == 1 && !has('gui_running')
-    " Popup menu: scrollbar
-    call s:HL('PmenuSbar', s:none, s:none)
-    " Popup menu: scrollbar thumb
-    call s:HL('PmenuThumb', s:none, s:none)
-  else
-    call s:HL('PmenuSbar', s:none, s:black)
-    call s:HL('PmenuThumb', s:none, s:black)
-  endif
+  " Popup menu: scrollbar
+  call s:HL('PmenuSbar', s:none, g:srcery_bg)
+  " Popup menu: scrollbar thumb
+  call s:HL('PmenuThumb', s:none, s:orange)
 endif
 
 " }}}
 " Diffs: {{{
 
-if g:srcery_bg_passthrough == 1 && !has('gui_running')
-  call s:HL('DiffDelete', s:red, s:none)
-  call s:HL('DiffAdd',    s:green, s:none)
-  call s:HL('DiffChange', s:cyan, s:none)
-  call s:HL('DiffText',   s:yellow, s:none)
-else
-  call s:HL('DiffDelete', s:red, s:black)
-  call s:HL('DiffAdd',    s:green, s:black)
-  call s:HL('DiffChange', s:cyan, s:black)
-  call s:HL('DiffText',   s:yellow, s:black)
-endif
+call s:HL('DiffDelete', s:red, g:srcery_bg)
+call s:HL('DiffAdd',    s:green, g:srcery_bg)
+call s:HL('DiffChange', s:cyan, g:srcery_bg)
+call s:HL('DiffText',   s:yellow, g:srcery_bg)
 
 " }}}
 " Spelling: {{{
@@ -436,6 +403,30 @@
   " Therefore not useful with transparent background option
   call s:HL('Terminal', s:bright_white, s:hard_black)
 endif
+" }}}
+" Neovim LSP: {{{
+
+if has('nvim')
+  " for backward compatibility with neovim v0.5.x
+  hi! link LspDiagnosticsDefaultError DiagnosticError
+  hi! link LspDiagnosticsDefaultWarning DiagnosticWarn
+  hi! link LspDiagnosticsDefaultInformation DiagnosticInfo
+  hi! link LspDiagnosticsDefaultHint DiagnosticHint
+  hi! link LspDiagnosticsUnderlineError DiagnosticUnderlineError
+  hi! link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint
+  hi! link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo
+  hi! link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn
+
+  " latest hl groups
+  hi! link DiagnosticError SrceryBrightRed
+  hi! link DiagnosticWarn SrceryBrightYellow
+  hi! link DiagnosticInfo SrceryBrightGreen
+  hi! link DiagnosticHint SrceryBrightCyan
+  call s:HL('DiagnosticUnderlineError', s:bright_red, s:none, s:undercurl)
+  call s:HL('DiagnosticUnderlineWarn', s:bright_yellow, s:none, s:undercurl)
+  call s:HL('DiagnosticUnderlineInfo', s:bright_green, s:none, s:undercurl)
+  call s:HL('DiagnosticUnderlineHint', s:bright_cyan, s:none, s:undercurl)
+endif
 
 " }}}