diff options
35 files changed, 1340 insertions, 2458 deletions
diff --git a/runtime/autoload/python.vim b/runtime/autoload/python.vim index 4b220708cf..e45dbd9db8 100644 --- a/runtime/autoload/python.vim +++ b/runtime/autoload/python.vim @@ -15,8 +15,9 @@ let s:maxoff = 50 " maximum number of lines to look backwards for () function s:SearchBracket(fromlnum, flags) return searchpairpos('[[({]', '', '[])}]', a:flags, - \ {-> synID('.', col('.'), v:true)->synIDattr('name') - \ =~ '\%(Comment\|Todo\|String\)$'}, + \ {-> synstack('.', col('.')) + \ ->map({_, id -> id->synIDattr('name')}) + \ ->match('\%(Comment\|Todo\|String\)$') >= 0}, \ [0, a:fromlnum - s:maxoff]->max(), s:searchpair_timeout) endfunction @@ -143,12 +144,16 @@ function python#GetIndent(lnum, ...) " If the last character in the line is a comment, do a binary search for " the start of the comment. synID() is slow, a linear search would take " too long on a long line. - if synIDattr(synID(plnum, pline_len, 1), "name") =~ "\\(Comment\\|Todo\\)" + if synstack(plnum, pline_len) + \ ->map({_, id -> id->synIDattr('name')}) + \ ->match('\%(Comment\|Todo\)$') >= 0 let min = 1 let max = pline_len while min < max let col = (min + max) / 2 - if synIDattr(synID(plnum, col, 1), "name") =~ "\\(Comment\\|Todo\\)" + if synstack(plnum, col) + \ ->map({_, id -> id->synIDattr('name')}) + \ ->match('\%(Comment\|Todo\)$') >= 0 let max = col else let min = col + 1 diff --git a/runtime/colors/blue.vim b/runtime/colors/blue.vim index 20f87bede8..a99ecaa98c 100644 --- a/runtime/colors/blue.vim +++ b/runtime/colors/blue.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au> " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:49:58 +" Last Updated: Fri Aug 5 12:25:12 2022 " Generated by Colortemplate v2.2.0 @@ -13,12 +13,12 @@ set background=dark hi clear let g:colors_name = 'blue' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#870000', '#006400', '#878700', '#000087', '#870087', '#008787', '#bcbcbc', '#878787', '#d70000', '#00ff00', '#ffdf00', '#5fafff', '#d787d7', '#5fffff', '#ffffff'] + let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff'] endif -hi Normal guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE +hi Normal guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE hi CursorLine guifg=NONE guibg=#005faf gui=NONE cterm=NONE hi Pmenu guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE hi PmenuSel guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE @@ -27,9 +27,9 @@ hi ColorColumn guifg=NONE guibg=#870087 gui=NONE cterm=NONE hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE hi CursorColumn guifg=NONE guibg=#005faf gui=NONE cterm=NONE -hi CursorIM guifg=#000000 guibg=#ffdf00 gui=NONE cterm=NONE -hi CursorLineNr guifg=#ffdf00 guibg=#005faf gui=bold cterm=NONE -hi EndOfBuffer guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE +hi CursorIM guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE +hi CursorLineNr guifg=#ffd700 guibg=#005faf gui=bold cterm=NONE +hi EndOfBuffer guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE hi Error guifg=#ff7f50 guibg=#000087 gui=reverse cterm=reverse hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE hi FoldColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE @@ -43,7 +43,7 @@ hi NonText guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE -hi Search guifg=#ffdf00 guibg=#000000 gui=reverse cterm=reverse +hi Search guifg=#ffd700 guibg=#000000 gui=reverse cterm=reverse hi SignColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE hi SpecialKey guifg=#5fffff guibg=NONE gui=NONE cterm=NONE hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl cterm=underline @@ -58,7 +58,7 @@ hi VertSplit guifg=#008787 guibg=NONE gui=NONE cterm=NONE hi Visual guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE hi VisualNOS guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE hi WarningMsg guifg=#d70000 guibg=NONE gui=NONE cterm=NONE -hi WildMenu guifg=#000087 guibg=#ffdf00 gui=NONE cterm=NONE +hi WildMenu guifg=#000087 guibg=#ffd700 gui=NONE cterm=NONE hi debugBreakpoint guifg=#00ff00 guibg=#000087 gui=reverse cterm=reverse hi debugPC guifg=#5fffff guibg=#000087 gui=reverse cterm=reverse hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE @@ -73,7 +73,7 @@ hi Statement guifg=#ffffff guibg=NONE gui=NONE cterm=NONE hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse hi Type guifg=#ffa500 guibg=NONE gui=bold cterm=NONE hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline -hi Label guifg=#ffdf00 guibg=NONE gui=NONE cterm=NONE +hi Label guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE hi! link Terminal Normal hi! link Debug Special hi! link diffAdded String @@ -526,6 +526,22 @@ if s:t_Co >= 0 endif " Background: dark +" Color: x_black #000000 16 black +" Color: x_darkred #cd0000 160 darkred +" Color: x_darkgreen #00cd00 40 darkgreen +" Color: x_darkyellow #cdcd00 184 darkyellow +" Color: x_darkblue #0000ee 21 darkblue +" Color: x_darkmagenta #cd00cd 164 darkmagenta +" Color: x_darkcyan #00cdcd 44 darkcyan +" Color: x_gray #e5e5e5 254 gray +" Color: x_darkgray #7f7f7f 244 darkgray +" Color: x_red #ff0000 196 red +" Color: x_green #00ff00 46 green +" Color: x_yellow #ffff00 226 yellow +" Color: x_blue #5c5cff 63 blue +" Color: x_magenta #ff00ff 201 magenta +" Color: x_cyan #00ffff 51 cyan +" Color: x_white #ffffff 231 white " Color: black #000000 16 black " Color: darkred #870000 88 darkred " Color: darkyellow #878700 100 darkyellow @@ -537,7 +553,7 @@ endif " Color: darkgray #878787 102 darkgray " Color: red #d70000 160 red " Color: green #00ff00 46 green -" Color: yellow #ffdf00 220 yellow +" Color: yellow #ffd700 220 yellow " Color: blue #005faf 25 blue " Color: magenta #d787d7 176 magenta " Color: cyan #5fffff 87 cyan @@ -549,8 +565,8 @@ endif " Color: coral #ff7f50 209 red " Color: olivedrab #6b8e23 64 green " Color: slateblue #6a5acd 62 darkmagenta -" Term colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan gray -" Term colors: darkgray red green yellow xtermblue magenta cyan white +" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray +" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white " Color: bgDiffA #5F875F 65 darkgreen " Color: bgDiffC #5F87AF 67 blue " Color: bgDiffD #AF5FAF 133 magenta diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim index 3d24c9235a..358f25bcc6 100644 --- a/runtime/colors/darkblue.vim +++ b/runtime/colors/darkblue.vim @@ -4,7 +4,7 @@ " Maintainer: Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua> " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:49:59 +" Last Updated: Mon Aug 8 15:21:06 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'darkblue' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff'] diff --git a/runtime/colors/delek.vim b/runtime/colors/delek.vim index c15d96ef33..623b7cd38d 100644 --- a/runtime/colors/delek.vim +++ b/runtime/colors/delek.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer David Schweikert <david@schweikert.ch> " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:00 +" Last Updated: Mon Aug 8 15:21:07 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=light hi clear let g:colors_name = 'delek' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000'] diff --git a/runtime/colors/desert.vim b/runtime/colors/desert.vim index 93bc73edec..82a2f1a451 100644 --- a/runtime/colors/desert.vim +++ b/runtime/colors/desert.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Hans Fugal <hans@fugal.net> " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:01 +" Last Updated: Mon Aug 8 15:21:08 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'desert' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5'] diff --git a/runtime/colors/elflord.vim b/runtime/colors/elflord.vim index f6e66ab06e..1d06e93b27 100644 --- a/runtime/colors/elflord.vim +++ b/runtime/colors/elflord.vim @@ -3,7 +3,7 @@ " Maintainer: original maintainer Ron Aaron <ron@ronware.org> " Website: https://www.github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:02 +" Last Updated: Mon Aug 8 15:21:08 2022 " Generated by Colortemplate v2.2.0 @@ -12,7 +12,7 @@ set background=dark hi clear let g:colors_name = 'elflord' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 hi! link Terminal Normal hi! link Boolean Constant diff --git a/runtime/colors/evening.vim b/runtime/colors/evening.vim index bc39e87b9a..cf3afbd44c 100644 --- a/runtime/colors/evening.vim +++ b/runtime/colors/evening.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au> " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:03 +" Last Updated: Mon Aug 8 15:21:09 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'evening' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#000000', '#ffa500', '#2e8b57', '#ffff00', '#006faf', '#8b008b', '#008b8b', '#bebebe', '#4d4d4d', '#ff5f5f', '#00ff00', '#ffff60', '#0087ff', '#ff80ff', '#00ffff', '#ffffff'] diff --git a/runtime/colors/habamax.vim b/runtime/colors/habamax.vim index 469d1846d6..054152e05e 100644 --- a/runtime/colors/habamax.vim +++ b/runtime/colors/habamax.vim @@ -4,7 +4,7 @@ " Maintainer: Maxim Kim <habamax@gmail.com> " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:04 +" Last Updated: Mon Aug 8 15:21:10 2022 " Generated by Colortemplate v2.2.0 @@ -13,10 +13,10 @@ set background=dark hi clear let g:colors_name = 'habamax' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#df875f', '#afd7af', '#dfdf87', '#87afd7', '#dfafdf', '#87afaf', '#bcbcbc'] + let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc'] endif hi! link Terminal Normal hi! link StatuslineTerm Statusline @@ -58,14 +58,14 @@ hi! link elixirInclude Statement hi! link elixirAtom PreProc hi! link elixirDocTest String hi ALEErrorSign guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE -hi ALEInfoSign guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE +hi ALEInfoSign guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE hi ALEWarningSign guifg=#af87af guibg=NONE gui=NONE cterm=NONE hi ALEError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE hi ALEVirtualTextError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE hi ALEWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE hi ALEVirtualTextWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE -hi ALEInfo guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE -hi ALEVirtualTextInfo guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE +hi ALEInfo guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE +hi ALEVirtualTextInfo guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE @@ -93,18 +93,18 @@ hi PmenuSel guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi Error guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse hi ErrorMsg guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse -hi ModeMsg guifg=#1c1c1c guibg=#dfdf87 gui=NONE cterm=NONE +hi ModeMsg guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE hi MoreMsg guifg=#87af87 guibg=NONE gui=NONE cterm=NONE hi Question guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE -hi WarningMsg guifg=#df875f guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=#dfdf87 guibg=#1c1c1c gui=reverse cterm=reverse +hi WarningMsg guifg=#d7875f guibg=NONE gui=NONE cterm=NONE +hi Todo guifg=#d7d787 guibg=#1c1c1c gui=reverse cterm=reverse hi MatchParen guifg=#5f8787 guibg=#1c1c1c gui=reverse cterm=reverse hi Search guifg=#1c1c1c guibg=#87af87 gui=NONE cterm=NONE hi IncSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE hi CurSearch guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE -hi WildMenu guifg=#1c1c1c guibg=#dfdf87 gui=NONE cterm=NONE +hi WildMenu guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE -hi debugBreakpoint guifg=#1c1c1c guibg=#df875f gui=NONE cterm=NONE +hi debugBreakpoint guifg=#1c1c1c guibg=#d7875f gui=NONE cterm=NONE hi Cursor guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE @@ -114,9 +114,9 @@ hi ColorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline hi SpellCap guifg=NONE guibg=NONE guisp=#5f87af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline hi SpellLocal guifg=NONE guibg=NONE guisp=#87af87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline -hi SpellRare guifg=NONE guibg=NONE guisp=#dfafdf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline +hi SpellRare guifg=NONE guibg=NONE guisp=#d7afd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#df875f guibg=NONE gui=NONE cterm=NONE +hi Constant guifg=#d7875f guibg=NONE gui=NONE cterm=NONE hi String guifg=#87af87 guibg=NONE gui=NONE cterm=NONE hi Character guifg=#afd7af guibg=NONE gui=NONE cterm=NONE hi Identifier guifg=#87afaf guibg=NONE gui=NONE cterm=NONE @@ -125,7 +125,7 @@ hi PreProc guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE hi Special guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline -hi Title guifg=#dfdf87 guibg=NONE gui=bold cterm=bold +hi Title guifg=#d7d787 guibg=NONE gui=bold cterm=bold hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold hi Conceal guifg=#767676 guibg=NONE gui=NONE cterm=NONE hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE @@ -135,7 +135,7 @@ hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE hi diffAdded guifg=#87af87 guibg=NONE gui=NONE cterm=NONE hi diffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE -hi DiffText guifg=#000000 guibg=#dfdfdf gui=NONE cterm=NONE +hi DiffText guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE hi DiffChange guifg=#000000 guibg=#afafaf gui=NONE cterm=NONE if s:t_Co >= 256 @@ -254,7 +254,7 @@ if s:t_Co >= 256 hi diffAdded ctermfg=108 ctermbg=NONE cterm=NONE hi diffRemoved ctermfg=167 ctermbg=NONE cterm=NONE hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE - hi DiffText ctermfg=16 ctermbg=254 cterm=NONE + hi DiffText ctermfg=16 ctermbg=188 cterm=NONE hi DiffChange ctermfg=16 ctermbg=145 cterm=NONE unlet s:t_Co finish @@ -489,15 +489,15 @@ endif " Color: color00 #1C1C1C 234 black " Color: color08 #767676 243 darkgray " Color: color01 #D75F5F 167 darkred -" Color: color09 #DF875F 173 red +" Color: color09 #D7875F 173 red " Color: color02 #87AF87 108 darkgreen " Color: color10 #AFD7AF 151 green " Color: color03 #AFAF87 144 darkyellow -" Color: color11 #DFDF87 186 yellow +" Color: color11 #D7D787 186 yellow " Color: color04 #5F87AF 67 blue " Color: color12 #87AFD7 110 blue " Color: color05 #AF87AF 139 darkmagenta -" Color: color13 #DFAFDF 182 magenta +" Color: color13 #D7AFD7 182 magenta " Color: color06 #5F8787 66 darkcyan " Color: color14 #87AFAF 109 cyan " Color: color07 #9E9E9E 247 gray @@ -506,12 +506,12 @@ endif " Color: colorB #262626 235 darkgrey " Color: colorNonT #585858 240 darkgrey " Color: colorC #FFAF5F 215 red -" Color: colorlC #5FFF00 ~ +" Color: colorlC #5FFF00 82 green " Color: colorV #1F3F5F 109 cyan " Color: diffAdd #87AF87 108 darkgreen " Color: diffDelete #af875f 137 darkyellow " Color: diffChange #AFAFAF 145 darkgray -" Color: diffText #DFDFDF 254 lightgrey +" Color: diffText #D7D7D7 188 lightgrey " Color: black #000000 16 black " Color: white #FFFFFF 231 white " Term colors: color00 color01 color02 color03 color04 color05 color06 color07 diff --git a/runtime/colors/industry.vim b/runtime/colors/industry.vim index d6678b2bb2..f002a2fe96 100644 --- a/runtime/colors/industry.vim +++ b/runtime/colors/industry.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Shian Lee. " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:05 +" Last Updated: Mon Aug 8 15:21:11 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'industry' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff'] diff --git a/runtime/colors/koehler.vim b/runtime/colors/koehler.vim index 87f1893ad7..4ee89278ab 100644 --- a/runtime/colors/koehler.vim +++ b/runtime/colors/koehler.vim @@ -3,7 +3,7 @@ " Maintainer: original maintainer Ron Aaron <ron@ronware.org> " Website: https://www.github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:06 +" Last Updated: Mon Aug 8 15:21:12 2022 " Generated by Colortemplate v2.2.0 @@ -12,7 +12,7 @@ set background=dark hi clear let g:colors_name = 'koehler' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 hi! link Terminal Normal hi! link Boolean Constant diff --git a/runtime/colors/lunaperche.vim b/runtime/colors/lunaperche.vim new file mode 100644 index 0000000000..f589c1f8aa --- /dev/null +++ b/runtime/colors/lunaperche.vim @@ -0,0 +1,911 @@ +" Name: Perchè il sole a Milano? Portofino? Dimmi la luna perchè? +" Description: White(perchè il sole)/Black(la luna perchè?) background colorscheme. +" Author: Maxim Kim <habamax@gmail.com> +" Maintainer: Maxim Kim <habamax@gmail.com> +" Website: https://www.github.com/vim/colorschemes +" License: Vim License (see `:help license`) +" Last Updated: Thu Aug 18 14:36:32 2022 + +" Generated by Colortemplate v2.2.0 + +hi clear +let g:colors_name = 'lunaperche' + +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 + +hi! link helpVim Title +hi! link helpHeader Title +hi! link helpHyperTextJump Underlined +hi! link fugitiveSymbolicRef PreProc +hi! link fugitiveHeading Statement +hi! link fugitiveStagedHeading Statement +hi! link fugitiveUnstagedHeading Statement +hi! link fugitiveUntrackedHeading Statement +hi! link fugitiveStagedModifier PreProc +hi! link fugitiveUnstagedModifier PreProc +hi! link fugitiveHash Constant +hi! link diffFile PreProc +hi! link markdownHeadingDelimiter Special +hi! link rstSectionDelimiter PreProc +hi! link rstDirective Special +hi! link rstHyperlinkReference Special +hi! link rstFieldName Special +hi! link rstDelimiter Special +hi! link rstInterpretedText Special +hi! link colortemplateKey Statement +hi! link xmlTagName Statement +hi! link javaScriptFunction Statement +hi! link javaScriptIdentifier Statement +hi! link sqlKeyword Statement +hi! link yamlBlockMappingKey Statement +hi! link rubyMacro Statement +hi! link rubyDefine Statement +hi! link vimGroup Normal +hi! link vimVar Normal +hi! link vimOper Normal +hi! link vimSep Normal +hi! link vimParenSep Normal +hi! link vimOption Normal +hi! link vimCommentString Comment +hi! link pythonInclude Statement +hi! link elixirOperator Statement +hi! link elixirKeyword Statement +hi! link elixirBlockDefinition Statement +hi! link elixirDefine Statement +hi! link elixirPrivateDefine Statement +hi! link elixirGuard Statement +hi! link elixirPrivateGuard Statement +hi! link elixirModuleDefine Statement +hi! link elixirProtocolDefine Statement +hi! link elixirImplDefine Statement +hi! link elixirRecordDefine Statement +hi! link elixirPrivateRecordDefine Statement +hi! link elixirMacroDefine Statement +hi! link elixirPrivateMacroDefine Statement +hi! link elixirDelegateDefine Statement +hi! link elixirOverridableDefine Statement +hi! link elixirExceptionDefine Statement +hi! link elixirCallbackDefine Statement +hi! link elixirStructDefine Statement +hi! link elixirExUnitMacro Statement +hi! link elixirInclude Statement +hi! link elixirVariable Special +hi! link elixirAtom Constant +hi! link elixirDocTest String +hi! link shQuote Constant +hi! link shNoQuote Normal +hi! link shTestOpr Normal +hi! link shOperator Normal +hi! link shSetOption Normal +hi! link shOption Normal +hi! link shCommandSub Normal +hi! link shDerefPattern shQuote +hi! link shDerefOp Special +hi! link Terminal Normal +hi! link StatuslineTerm Statusline +hi! link StatuslineTermNC StatuslineNC +hi! link LineNrAbove LineNr +hi! link LineNrBelow LineNr +if &background ==# 'dark' + if (has('termguicolors') && &termguicolors) || has('gui_running') + let g:terminal_ansi_colors = ['#000000', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#d787af', '#5fafaf', '#c6c6c6', '#767676', '#ff5f5f', '#5fd75f', '#ffd787', '#87afd7', '#ffafd7', '#5fd7d7', '#ffffff'] + endif + hi Normal guifg=#c6c6c6 guibg=#000000 gui=NONE cterm=NONE + hi Statusline guifg=#000000 guibg=#c6c6c6 gui=bold cterm=bold + hi StatuslineNC guifg=#000000 guibg=#767676 gui=NONE cterm=NONE + hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE + hi TabLine guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE + hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE + hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE + hi QuickFixLine guifg=#000000 guibg=#87afd7 gui=NONE cterm=NONE + hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold + hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi Pmenu guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE + hi PmenuSel guifg=NONE guibg=#005f00 gui=NONE cterm=NONE + hi PmenuThumb guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE + hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE + hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE + hi ModeMsg guifg=#ffd787 guibg=NONE gui=reverse cterm=reverse + hi MoreMsg guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE + hi Question guifg=#ffafd7 guibg=NONE gui=NONE cterm=NONE + hi WarningMsg guifg=#ff5f5f guibg=NONE gui=NONE cterm=NONE + hi Todo guifg=#5fd7d7 guibg=#000000 gui=reverse cterm=reverse + hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE + hi IncSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE + hi CurSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE + hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold + hi debugPC guifg=#5f87af guibg=NONE gui=reverse cterm=reverse + hi debugBreakpoint guifg=#5fafaf guibg=NONE gui=reverse cterm=reverse + hi Cursor guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse + hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse + hi Visual guifg=#ffffff guibg=#005f87 gui=NONE cterm=NONE + hi MatchParen guifg=#c5e7c5 guibg=#000000 gui=reverse cterm=reverse + hi VisualNOS guifg=#000000 guibg=#5fafaf gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE + hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE + hi Folded guifg=#767676 guibg=#1c1c1c gui=NONE cterm=NONE + hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE + hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE< |