Merge with upstream

This commit is contained in:
Joey Yakimowich-Payne 2023-02-27 11:48:51 -07:00
commit 559461b0ba
No known key found for this signature in database
GPG key ID: CC55F39D665E964D
3 changed files with 190 additions and 96 deletions

View file

@ -21,41 +21,40 @@
#### Fixed 8/16 colors #### Fixed 8/16 colors
![Terminal on Debian with 16 colors](https://cloud.githubusercontent.com/assets/10374559/23341713/0e8dd778-fc4d-11e6-8430-b11f161305d7.png) ![Terminal on Debian with 16 colors](https://cloud.githubusercontent.com/assets/10374559/23341713/0e8dd778-fc4d-11e6-8430-b11f161305d7.png)
## Color Palette
![Color Palette](https://cloud.githubusercontent.com/assets/10374559/23341312/1961f416-fc45-11e6-83ba-d7180c5fdd6d.png)
## Installation ## Installation
### 1) Download ### 1) Download
Simply as any other Vim plugins: download manually or follow the standard procedure of your plugin manager: Simply as any other Vim plugins: download manually or follow the standard procedure of your plugin manager:
* [Vundle](https://github.com/gmarik/vundle) * [Vundle](https://github.com/gmarik/vundle)
``` ```vim
Plugin 'tomasiser/vim-code-dark' Plugin 'tomasiser/vim-code-dark'
``` ```
* [vim-plug](https://github.com/junegunn/vim-plug) * [vim-plug](https://github.com/junegunn/vim-plug)
``` ```vim
Plug 'tomasiser/vim-code-dark' Plug 'tomasiser/vim-code-dark'
``` ```
* manual * [builtin package manager](https://vimhelp.org/repeat.txt.html#packages)
```bash
# Regular Vim
mkdir -p ~/.vim/pack/themes/start
cd ~/.vim/pack/themes/start
git clone https://github.com/tomasiser/vim-code-dark
copy all of the files to `~/.vim` (or `$HOME\vimfiles` on Windows) directory # Neovim
mkdir -p ~/.local/share/nvim/site/pack/themes/start
cd ~/.local/share/nvim/site/pack/themes/start
git clone https://github.com/tomasiser/vim-code-dark
```
### 2) Enable in `.vimrc` ### 2) Enable in `.vimrc`
Add the following line to your `.vimrc`: Add the following line to your `.vimrc`:
``` ```vim
colorscheme codedark colorscheme codedark
``` ```
If you have [`vim-airline`](https://github.com/vim-airline/vim-airline), you can also enable the provided theme:
```
let g:airline_theme = 'codedark'
```
### 3) Terminal support ### 3) Terminal support
#### 3.1) If you use gVim / a modern terminal #### 3.1) If you use gVim / a modern terminal
@ -63,8 +62,7 @@ let g:airline_theme = 'codedark'
#### 3.2) If the colors seem to be wrong #### 3.2) If the colors seem to be wrong
If your terminal supports 256 colors (see [this script](http://www.robmeerman.co.uk/unix/256colours) if you want to test your terminal), you **may need to set `t_Co` to 256** and [possibly also reset the `t_ut` value](http://vi.stackexchange.com/questions/238/tmux-is-changing-part-of-the-background-in-vim) in your `.vimrc` before setting the colorscheme: If your terminal supports 256 colors (see [this script](http://www.robmeerman.co.uk/unix/256colours) if you want to test your terminal), you **may need to set `t_Co` to 256** and [possibly also reset the `t_ut` value](http://vi.stackexchange.com/questions/238/tmux-is-changing-part-of-the-background-in-vim) in your `.vimrc` before setting the colorscheme:
```vim
```
set t_Co=256 set t_Co=256
set t_ut= set t_ut=
colorscheme codedark colorscheme codedark
@ -81,7 +79,7 @@ If your terminal does not support 256 colors, you may want to change your termin
##### 3.3.1) Some Unix terminals ##### 3.3.1) Some Unix terminals
Clone [`base16-shell`](https://github.com/chriskempson/base16-shell/) into `~/.config/base16-shell`: Clone [`base16-shell`](https://github.com/chriskempson/base16-shell/) into `~/.config/base16-shell`:
``` ```bash
git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell
``` ```
@ -89,7 +87,7 @@ Then copy a script from this (`vim-code-dark`) repository (`base16/templates/she
Following the instructions from [`base16-shell`](https://github.com/chriskempson/base16-shell/), you should now modify your `~/.bashrc` or `~/.zshrc` (depending on your shell) and insert the following lines: Following the instructions from [`base16-shell`](https://github.com/chriskempson/base16-shell/), you should now modify your `~/.bashrc` or `~/.zshrc` (depending on your shell) and insert the following lines:
``` ```bash
BASE16_SHELL=$HOME/.config/base16-shell/ BASE16_SHELL=$HOME/.config/base16-shell/
[ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)" [ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)"
``` ```
@ -98,30 +96,35 @@ Now start a new shell and type the following command: `base16_codedark`.
You should now be able to use Vim with your new colorscheme. You should now be able to use Vim with your new colorscheme.
##### 3.3.2) iTerm2 ##### 3.3.2) PuTTY
iTerm2 should actually support 256 colors, try setting `Report Terminal Type` to `xterm-256color` and follow step 3.2). If it does not work, you can manually modify your terminal colors in settings (`CMD+i`, Colors tab) following the [color palette picture](#color-palette). You will have to choose which color to use as red, blue etc. according to your personal preferences.
##### 3.3.3) PuTTY
PuTTY should actually support 256 colors, try following [steps on StackOverflow](http://superuser.com/questions/436910/emulate-256-colors-in-putty-terminal). If it does not work, run `base16/templates/putty/putty/base16-codedark.reg` to modify your registry, then run PuTTY and load `codedark` in the session list. This will modify your PuTTY terminal colors. PuTTY should actually support 256 colors, try following [steps on StackOverflow](http://superuser.com/questions/436910/emulate-256-colors-in-putty-terminal). If it does not work, run `base16/templates/putty/putty/base16-codedark.reg` to modify your registry, then run PuTTY and load `codedark` in the session list. This will modify your PuTTY terminal colors.
## CUSTOMIZATION
**:exclamation: To enable any of the following customizations, put the specific lines before setting the colorscheme**
```vim
" If you don't like many colors and prefer the conservative style of the standard Visual Studio
let g:codedark_conservative=1
" Activates italicized comments (make sure your terminal supports italics)
let g:codedark_italics=1
" Make the background transparent
let g:codedark_transparent=1
" If you have vim-airline, you can also enable the provided theme
let g:airline_theme = 'codedark'
colorscheme codedark
```
## FAQ ## FAQ
### The background color in my terminal is wrong when there is no text! ### The background color in my terminal is wrong when there is no text!
Try resetting the `t_ut` value in your `.vimrc` as [described here](http://vi.stackexchange.com/questions/238/tmux-is-changing-part-of-the-background-in-vim): Try resetting the `t_ut` value in your `.vimrc` as [described here](http://vi.stackexchange.com/questions/238/tmux-is-changing-part-of-the-background-in-vim):
``` ```vim
set t_Co=256 set t_Co=256
set t_ut= set t_ut=
colorscheme codedark colorscheme codedark
``` ```
### What is and how to enable the conservative mode?
If you don't like many colors and prefer the **conservative style of the standard Visual Studio**, you can try the conservative mode with reduced number of colors. To enable it, put the following line to your `.vimrc` *before* setting the scheme, like so:
```
let g:codedark_conservative = 1
colorscheme codedark
```
### Something is broken but I know how to fix it! ### Something is broken but I know how to fix it!
Pull requests are welcome! Feel free to send one with an explanation! Pull requests are welcome! Feel free to send one with an explanation!
@ -134,9 +137,12 @@ There are a lot of syntax definitions with different highlight groups. Feel free
### What setup can I see on the first screenshots? ### What setup can I see on the first screenshots?
Screenshots come from gVim on Windows with the following font options and [`vim-airline`](https://github.com/vim-airline/vim-airline) enabled. Screenshots come from gVim on Windows with the following font options and [`vim-airline`](https://github.com/vim-airline/vim-airline) enabled.
``` ```vim
set enc=utf-8 set enc=utf-8
set guifont=Powerline_Consolas:h11 set guifont=Powerline_Consolas:h11
set renderoptions=type:directx,gamma:1.5,contrast:0.5,geom:1,renmode:5,taamode:1,level:0.5 set renderoptions=type:directx,gamma:1.5,contrast:0.5,geom:1,renmode:5,taamode:1,level:0.5
``` ```
## Color Palette
![Color Palette](https://cloud.githubusercontent.com/assets/10374559/23341312/1961f416-fc45-11e6-83ba-d7180c5fdd6d.png)

View file

@ -38,7 +38,7 @@ elseif !exists("g:codedark_term256")
let g:codedark_term256=0 let g:codedark_term256=0
endif endif
let s:cdFront = {'gui': '#FFFFFF', 'cterm': (g:codedark_term256 ? '15' : s:cterm07)} let s:cdFront = {'gui': '#FFFFFF', 'cterm': (g:codedark_term256 ? '231' : s:cterm07)}
let s:cdFrontGray = {'gui': '#D4D4D4', 'cterm': (g:codedark_term256 ? '188' : s:cterm05)} let s:cdFrontGray = {'gui': '#D4D4D4', 'cterm': (g:codedark_term256 ? '188' : s:cterm05)}
let s:cdBack = {'gui': '#1E1E1E', 'cterm': (g:codedark_term256 ? '234' : s:cterm00)} let s:cdBack = {'gui': '#1E1E1E', 'cterm': (g:codedark_term256 ? '234' : s:cterm00)}
let s:cdSelection = {'gui': '#264F78', 'cterm': (g:codedark_term256 ? '24' : s:cterm01)} let s:cdSelection = {'gui': '#264F78', 'cterm': (g:codedark_term256 ? '24' : s:cterm01)}

View file

@ -30,6 +30,10 @@ fun! <sid>hi(group, fg, bg, attr, sp)
exec "hi " . a:group . " guisp=" . a:sp.gui exec "hi " . a:group . " guisp=" . a:sp.gui
endif endif
endfun endfun
" Choose old or new name for Treesitter groups depending on Neovim version
fun! <sid>hiTS(g_new, g_old, fg, bg, attr, sp)
call <sid>hi(has("nvim-0.8.0")? a:g_new : a:g_old, a:fg, a:bg, a:attr, a:sp)
endfun
" ------------------ " ------------------
" Color definitions: " Color definitions:
@ -65,10 +69,16 @@ endif
" General appearance colors: " General appearance colors:
" (some of them may be unused) " (some of them may be unused)
" Transparent background
if !exists("g:codedark_transparent")
let g:codedark_transparent=0
endif
let s:cdNone = {'gui': 'NONE', 'cterm': 'NONE', 'cterm256': 'NONE'} let s:cdNone = {'gui': 'NONE', 'cterm': 'NONE', 'cterm256': 'NONE'}
let s:cdFront = {'gui': '#e6e2e9', 'cterm': s:cterm05, 'cterm256': '188'} let s:cdFront = {'gui': '#e6e2e9', 'cterm': s:cterm05, 'cterm256': '188'}
let s:cdDeactivated = {'gui': '#8B8C92', 'cterm': s:cterm05, 'cterm256': '188'} let s:cdDeactivated = {'gui': '#8B8C92', 'cterm': s:cterm05, 'cterm256': '188'}
let s:cdBack = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'} let s:cdBack = {'gui': '#1E1E1E', 'cterm': s:cterm00, 'cterm256': '234'}
if g:codedark_transparent | let s:cdBack = {'gui': 'NONE', 'cterm': 'NONE', 'cterm256': 'NONE'} | endif
let s:cdTabCurrent = {'gui': '#264F78', 'cterm': s:cterm00, 'cterm256': '234'} let s:cdTabCurrent = {'gui': '#264F78', 'cterm': s:cterm00, 'cterm256': '234'}
" let s:cdTabOther = {'gui': '#2D2D2D', 'cterm': s:cterm01, 'cterm256': '236'} " let s:cdTabOther = {'gui': '#2D2D2D', 'cterm': s:cterm01, 'cterm256': '236'}
@ -102,8 +112,10 @@ let s:cdDiffFgLight = {'gui': 'none', 'cterm': s:cterm08, 'cterm256': '52'}
let s:cdDiffRedLightLight = {'gui': '#FB0101', 'cterm': s:cterm08, 'cterm256': '09'} let s:cdDiffRedLightLight = {'gui': '#FB0101', 'cterm': s:cterm08, 'cterm256': '09'}
let s:cdDiffGreenDark = {'gui': '#373D29', 'cterm': s:cterm0B, 'cterm256': '237'} let s:cdDiffGreenDark = {'gui': '#373D29', 'cterm': s:cterm0B, 'cterm256': '237'}
let s:cdDiffGreenLight = {'gui': '#086815', 'cterm': s:cterm09, 'cterm256': '58'} let s:cdDiffGreenLight = {'gui': '#086815', 'cterm': s:cterm09, 'cterm256': '58'}
let s:cdDiffBlueLight = {'gui': '#87d7ff', 'cterm': s:cterm0C, 'cterm256': '117'}
let s:cdDiffBlue = {'gui': '#005f87', 'cterm': s:cterm0D, 'cterm256': '24'}
let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'}
let s:cdSearch = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'} let s:cdSearch = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'}
" Syntax colors: " Syntax colors:
@ -112,6 +124,11 @@ if !exists("g:codedark_conservative")
let g:codedark_conservative=0 let g:codedark_conservative=0
endif endif
" Italicized comments
if !exists("g:codedark_italics")
let g:codedark_italics=0
endif
let s:cdGray = {'gui': '#808080', 'cterm': s:cterm04, 'cterm256': '08'} let s:cdGray = {'gui': '#808080', 'cterm': s:cterm04, 'cterm256': '08'}
let s:cdViolet = {'gui': '#646695', 'cterm': s:cterm04, 'cterm256': '60'} let s:cdViolet = {'gui': '#646695', 'cterm': s:cterm04, 'cterm256': '60'}
let s:cdViolet2 = {'gui': '#7E6CC4', 'cterm': s:cterm04, 'cterm256': '60'} let s:cdViolet2 = {'gui': '#7E6CC4', 'cterm': s:cterm04, 'cterm256': '60'}
@ -131,6 +148,7 @@ let s:cdYellow = {'gui': '#dde0a1', 'cterm': s:cterm0A, 'cterm256': '187'}
if g:codedark_conservative | let s:cdYellow = s:cdFront | endif if g:codedark_conservative | let s:cdYellow = s:cdFront | endif
let s:cdPink = {'gui': '#C586C0', 'cterm': s:cterm0E, 'cterm256': '176'} let s:cdPink = {'gui': '#C586C0', 'cterm': s:cterm0E, 'cterm256': '176'}
if g:codedark_conservative | let s:cdPink = s:cdBlue | endif if g:codedark_conservative | let s:cdPink = s:cdBlue | endif
let s:cdSilver = {'gui': '#C0C0C0', 'cterm': s:cterm05, 'cterm256': '7'}
" Vim editor colors " Vim editor colors
" <sid>hi(GROUP, FOREGROUND, BACKGROUND, ATTRIBUTE, SPECIAL) " <sid>hi(GROUP, FOREGROUND, BACKGROUND, ATTRIBUTE, SPECIAL)
@ -148,6 +166,11 @@ call <sid>hi('DiffAddL', s:cdNone, s:cdDiffGreenLight, 'none', {})
call <sid>hi('DiffChangeL', s:cdNone, s:cdDiffYellowDark, 'none', {}) call <sid>hi('DiffChangeL', s:cdNone, s:cdDiffYellowDark, 'none', {})
call <sid>hi('DiffDeleteL', s:cdNone, s:cdDiffRedLight, 'none', {}) call <sid>hi('DiffDeleteL', s:cdNone, s:cdDiffRedLight, 'none', {})
call <sid>hi('DiffTextL', s:cdNone, s:cdDiffRedLight, 'none', {}) call <sid>hi('DiffTextL', s:cdNone, s:cdDiffRedLight, 'none', {})
" call <sid>hi('Directory', s:cdBlue, s:cdNone, 'none', {})
" call <sid>hi('DiffAdd', s:cdFront, s:cdDiffGreenLight, 'none', {})
" call <sid>hi('DiffChange', s:cdFront, s:cdDiffBlue, 'none', {})
" call <sid>hi('DiffDelete', s:cdFront, s:cdDiffRedLight, 'none', {})
" call <sid>hi('DiffText', s:cdBack, s:cdDiffBlueLight, 'none', {})
call <sid>hi('EndOfBuffer', s:cdLineNumber, s:cdBack, 'none', {}) call <sid>hi('EndOfBuffer', s:cdLineNumber, s:cdBack, 'none', {})
call <sid>hi('ErrorMsg', s:cdRed, s:cdBack, 'none', {}) call <sid>hi('ErrorMsg', s:cdRed, s:cdBack, 'none', {})
call <sid>hi('VertSplit', s:cdSplitDark, s:cdBack, 'none', {}) call <sid>hi('VertSplit', s:cdSplitDark, s:cdBack, 'none', {})
@ -160,7 +183,7 @@ call <sid>hi('CursorLineNr', s:cdPopupFront, s:cdBack, 'none', {})
call <sid>hi('MatchParen', s:cdNone, s:cdCursorDark, 'none', {}) call <sid>hi('MatchParen', s:cdNone, s:cdCursorDark, 'none', {})
call <sid>hi('ModeMsg', s:cdFront, s:cdLeftDark, 'none', {}) call <sid>hi('ModeMsg', s:cdFront, s:cdLeftDark, 'none', {})
call <sid>hi('MoreMsg', s:cdFront, s:cdLeftDark, 'none', {}) call <sid>hi('MoreMsg', s:cdFront, s:cdLeftDark, 'none', {})
call <sid>hi('NonText', s:cdLineNumber, s:cdBack, 'none', {}) call <sid>hi('NonText', s:cdLineNumber, s:cdNone, 'none', {})
call <sid>hi('Pmenu', s:cdPopupFront, s:cdPopupBack, 'none', {}) call <sid>hi('Pmenu', s:cdPopupFront, s:cdPopupBack, 'none', {})
call <sid>hi('PmenuSel', s:cdPopupFront, s:cdPopupHighlightBlue, 'none', {}) call <sid>hi('PmenuSel', s:cdPopupFront, s:cdPopupHighlightBlue, 'none', {})
call <sid>hi('PmenuSbar', {}, s:cdPopupHighlightGray, 'none', {}) call <sid>hi('PmenuSbar', {}, s:cdPopupHighlightGray, 'none', {})
@ -178,13 +201,14 @@ call <sid>hi('Visual', s:cdNone, s:cdSelection, 'none', {})
call <sid>hi('VisualNOS', s:cdNone, s:cdSelection, 'none', {}) call <sid>hi('VisualNOS', s:cdNone, s:cdSelection, 'none', {})
call <sid>hi('WarningMsg', s:cdOrange, s:cdBack, 'none', {}) call <sid>hi('WarningMsg', s:cdOrange, s:cdBack, 'none', {})
call <sid>hi('WildMenu', s:cdNone, s:cdSelection, 'none', {}) call <sid>hi('WildMenu', s:cdNone, s:cdSelection, 'none', {})
call <sid>hi('netrwMarkFile', s:cdFront, s:cdSelection, 'none', {})
" Legacy groups for official git.vim and diff.vim syntax " Legacy groups for official git.vim and diff.vim syntax
hi! link diffAdded DiffAddL hi! link diffAdded DiffAddL
hi! link diffChanged DiffChangeL hi! link diffChanged DiffChangeL
hi! link diffRemoved DiffDeleteL hi! link diffRemoved DiffDeleteL
call <sid>hi('Comment', s:cdGreen, {}, 'none', {}) if g:codedark_italics | call <sid>hi('Comment', s:cdGreen, {}, 'italic', {}) | else | call <sid>hi('Comment', s:cdGreen, {}, 'none', {}) | endif
call <sid>hi('Constant', s:cdViolet2, {}, 'none', {}) call <sid>hi('Constant', s:cdViolet2, {}, 'none', {})
call <sid>hi('String', s:cdOrange, {}, 'none', {}) call <sid>hi('String', s:cdOrange, {}, 'none', {})
@ -220,13 +244,14 @@ call <sid>hi('Special', s:cdYellowOrange, {}, 'none', {})
call <sid>hi('SpecialChar', s:cdFront, {}, 'none', {}) call <sid>hi('SpecialChar', s:cdFront, {}, 'none', {})
call <sid>hi('Tag', s:cdFront, {}, 'none', {}) call <sid>hi('Tag', s:cdFront, {}, 'none', {})
call <sid>hi('Delimiter', s:cdFront, {}, 'none', {}) call <sid>hi('Delimiter', s:cdFront, {}, 'none', {})
call <sid>hi('SpecialComment', s:cdGreen, {}, 'none', {}) if g:codedark_italics | call <sid>hi('SpecialComment', s:cdGreen, {}, 'italic', {}) | else | call <sid>hi('SpecialComment', s:cdGreen, {}, 'none', {}) | endif
call <sid>hi('Debug', s:cdFront, {}, 'none', {}) call <sid>hi('Debug', s:cdFront, {}, 'none', {})
call <sid>hi('Underlined', s:cdNone, {}, 'underline', {}) call <sid>hi('Underlined', s:cdNone, {}, 'underline', {})
call <sid>hi("Conceal", s:cdFront, s:cdBack, 'none', {}) call <sid>hi("Conceal", s:cdFront, s:cdBack, 'none', {})
call <sid>hi('Ignore', s:cdDeactivated, {}, 'none', {}) call <sid>hi('Ignore', s:cdDeactivated, {}, 'none', {})
" call <sid>hi('Ignore', s:cdBack, {}, 'none', {})
call <sid>hi('Error', s:cdRed, s:cdBack, 'undercurl', s:cdRed) call <sid>hi('Error', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
@ -237,65 +262,86 @@ call <sid>hi('SpellCap', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
call <sid>hi('SpellRare', s:cdRed, s:cdBack, 'undercurl', s:cdRed) call <sid>hi('SpellRare', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
call <sid>hi('SpellLocal', s:cdRed, s:cdBack, 'undercurl', s:cdRed) call <sid>hi('SpellLocal', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
" Make neovim specific groups load only on Neovim
if has("nvim")
" Neovim Treesitter:
call <sid>hiTS('@error', 'TSError', s:cdRed, {}, 'none', {})
call <sid>hiTS('@punctuation.delimiter', 'TSPunctDelimiter', s:cdFront, {}, 'none', {})
call <sid>hiTS('@punctuation.bracket', 'TSPunctBracket', s:cdFront, {}, 'none', {})
call <sid>hiTS('@punctuation.special', 'TSPunctSpecial', s:cdFront, {}, 'none', {})
" Constant
call <sid>hiTS('@constant', 'TSConstant', s:cdViolet2, {}, 'none', {})
call <sid>hiTS('@constant.builtin', 'TSConstBuiltin', s:cdBlue, {}, 'none', {})
call <sid>hiTS('@constant.macro', 'TSConstMacro', s:cdBlueGreen, {}, 'none', {})
call <sid>hiTS('@string.regex', 'TSStringRegex', s:cdOrange, {}, 'none', {})
call <sid>hiTS('@string', 'TSString', s:cdOrange, {}, 'none', {})
call <sid>hiTS('@string.escape', 'TSStringEscape', s:cdYellowOrange, {}, 'none', {})
call <sid>hiTS('@character', 'TSCharacter', s:cdOrange, {}, 'none', {})
call <sid>hiTS('@number', 'TSNumber', s:cdLightGreen, {}, 'none', {})
call <sid>hiTS('@boolean', 'TSBoolean', s:cdBlue, {}, 'none', {})
call <sid>hiTS('@float', 'TSFloat', s:cdLightGreen, {}, 'none', {})
call <sid>hiTS('@annotation', 'TSAnnotation', s:cdYellow, {}, 'none', {})
call <sid>hiTS('@attribute', 'TSAttribute', s:cdBlueGreen, {}, 'none', {})
call <sid>hiTS('@namespace', 'TSNamespace', s:cdBlueGreen, {}, 'none', {})
" Functions
call <sid>hiTS('@function.builtin', 'TSFuncBuiltin', s:cdYellow, {}, 'none', {})
call <sid>hiTS('@function', 'TSFunction', s:cdYellow, {}, 'none', {})
call <sid>hiTS('@function.macro', 'TSFuncMacro', s:cdYellow, {}, 'none', {})
call <sid>hiTS('@parameter', 'TSParameter', s:cdFront, {}, 'none', {})
call <sid>hiTS('@parameter.reference', 'TSParameterReference', s:cdFront, {}, 'none', {})
call <sid>hiTS('@method', 'TSMethod', s:cdYellow, {}, 'none', {})
call <sid>hiTS('@field', 'TSField', s:cdLightBlue, {}, 'none', {})
call <sid>hiTS('@property', 'TSProperty', s:cdLightBlue, {}, 'none', {})
call <sid>hiTS('@constructor', 'TSConstructor', s:cdBlueGreen, {}, 'none', {})
" Keywords
call <sid>hiTS('@conditional', 'TSConditional', s:cdPink, {}, 'none', {})
call <sid>hiTS('@repeat', 'TSRepeat', s:cdPink, {}, 'none', {})
call <sid>hiTS('@label', 'TSLabel', s:cdLightBlue, {}, 'none', {})
call <sid>hiTS('@keyword', 'TSKeyword', s:cdBlue, {}, 'none', {})
call <sid>hiTS('@keyword.function', 'TSKeywordFunction', s:cdBlue, {}, 'none', {})
call <sid>hiTS('@keyword.operator', 'TSKeywordOperator', s:cdBlue, {}, 'none', {})
call <sid>hiTS('@operator', 'TSOperator', s:cdFront, {}, 'none', {})
call <sid>hiTS('@exception', 'TSException', s:cdPink, {}, 'none', {})
call <sid>hiTS('@type', 'TSType', s:cdBlueGreen, {}, 'none', {})
call <sid>hiTS('@type.builtin', 'TSTypeBuiltin', s:cdBlue, {}, 'none', {})
call <sid>hi('TSStructure', s:cdLightBlue, {}, 'none', {})
call <sid>hiTS('@include', 'TSInclude', s:cdPink, {}, 'none', {})
" Variable
call <sid>hiTS('@variable', 'TSVariable', s:cdFront, {}, 'none', {})
call <sid>hiTS('@variable.builtin', 'TSVariableBuiltin', s:cdLightBlue, {}, 'none', {})
" Text
call <sid>hiTS('@text', 'TSText', s:cdYellowOrange, {}, 'none', {})
call <sid>hiTS('@text.strong', 'TSStrong', s:cdYellowOrange, {}, 'none', {})
call <sid>hiTS('@text.emphasis', 'TSEmphasis', s:cdYellowOrange, {}, 'none', {})
call <sid>hiTS('@text.underline', 'TSUnderline', s:cdYellowOrange, {}, 'none', {})
call <sid>hiTS('@text.title', 'TSTitle', s:cdYellowOrange, {}, 'none', {})
call <sid>hiTS('@text.literal', 'TSLiteral', s:cdYellowOrange, {}, 'none', {})
call <sid>hiTS('@text.uri', 'TSURI', s:cdYellowOrange, {}, 'none', {})
" Tags
call <sid>hiTS('@tag', 'TSTag', s:cdBlue, {}, 'none', {})
call <sid>hiTS('@tag.delimiter', 'TSTagDelimiter', s:cdGray, {}, 'none', {})
" Neovim Treesitter: " nvim-cmp
call <sid>hi('TSError', s:cdRed, {}, 'none', {}) call <sid>hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'none', {})
call <sid>hi('TSPunctDelimiter', s:cdFront, {}, 'none', {}) call <sid>hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {})
call <sid>hi('TSPunctBracket', s:cdFront, {}, 'none', {}) call <sid>hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {})
call <sid>hi('TSPunctSpecial', s:cdFront, {}, 'none', {}) call <sid>hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {})
" Constant call <sid>hi('CmpItemKindInterface', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSConstant', s:cdYellow, {}, 'none', {}) call <sid>hi('CmpItemKindText', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSConstBuiltin', s:cdBlue, {}, 'none', {}) call <sid>hi('CmpItemKindFunction', s:cdPink, {}, 'none', {})
call <sid>hi('TSConstMacro', s:cdBlueGreen, {}, 'none', {}) call <sid>hi('CmpItemKindMethod ', s:cdPink, {}, 'none', {})
call <sid>hi('TSStringRegex', s:cdOrange, {}, 'none', {}) call <sid>hi('CmpItemKindKeyword', s:cdFront, {}, 'none', {})
call <sid>hi('TSString', s:cdOrange, {}, 'none', {}) call <sid>hi('CmpItemKindProperty', s:cdFront, {}, 'none', {})
call <sid>hi('TSStringEscape', s:cdYellowOrange, {}, 'none', {}) call <sid>hi('CmpItemKindUnit', s:cdFront, {}, 'none', {})
call <sid>hi('TSCharacter', s:cdOrange, {}, 'none', {}) endif
call <sid>hi('TSNumber', s:cdLightGreen, {}, 'none', {})
call <sid>hi('TSBoolean', s:cdBlue, {}, 'none', {})
call <sid>hi('TSFloat', s:cdLightGreen, {}, 'none', {})
call <sid>hi('TSAnnotation', s:cdYellow, {}, 'none', {})
call <sid>hi('TSAttribute', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TSNamespace', s:cdBlueGreen, {}, 'none', {})
" Functions
call <sid>hi('TSFuncBuiltin', s:cdYellow, {}, 'none', {})
call <sid>hi('TSFunction', s:cdYellow, {}, 'none', {})
call <sid>hi('TSFuncMacro', s:cdYellow, {}, 'none', {})
call <sid>hi('TSParameter', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSParameterReference', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSMethod', s:cdYellow, {}, 'none', {})
call <sid>hi('TSField', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSProperty', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSConstructor', s:cdBlueGreen, {}, 'none', {})
" Keywords
call <sid>hi('TSConditional', s:cdPink, {}, 'none', {})
call <sid>hi('TSRepeat', s:cdPink, {}, 'none', {})
call <sid>hi('TSLabel', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSKeyword', s:cdBlue, {}, 'none', {})
call <sid>hi('TSKeywordFunction', s:cdPink, {}, 'none', {})
call <sid>hi('TSKeywordOperator', s:cdBlue, {}, 'none', {})
call <sid>hi('TSOperator', s:cdFront, {}, 'none', {})
call <sid>hi('TSException', s:cdPink, {}, 'none', {})
call <sid>hi('TSType', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TSTypeBuiltin', s:cdBlue, {}, 'none', {})
call <sid>hi('TSStructure', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSInclude', s:cdPink, {}, 'none', {})
" Variable
call <sid>hi('TSVariable', s:cdLightBlue, {}, 'none', {})
call <sid>hi('TSVariableBuiltin', s:cdLightBlue, {}, 'none', {})
" Text
call <sid>hi('TSText', s:cdYellowOrange, {}, 'none', {})
call <sid>hi('TSStrong', s:cdYellowOrange, {}, 'none', {})
call <sid>hi('TSEmphasis', s:cdYellowOrange, {}, 'none', {})
call <sid>hi('TSUnderline', s:cdYellowOrange, {}, 'none', {})
call <sid>hi('TSTitle', s:cdYellowOrange, {}, 'none', {})
call <sid>hi('TSLiteral', s:cdYellowOrange, {}, 'none', {})
call <sid>hi('TSURI', s:cdYellowOrange, {}, 'none', {})
" Tags
call <sid>hi('TSTag', s:cdBlue, {}, 'none', {})
call <sid>hi('TSTagDelimiter', s:cdGray, {}, 'none', {})
" Markdown: " Markdown:
call <sid>hi('markdownH1', s:cdBlue, {}, 'bold', {})
call <sid>hi('markdownH2', s:cdBlue, {}, 'bold', {})
call <sid>hi('markdownH3', s:cdBlue, {}, 'bold', {})
call <sid>hi('markdownH4', s:cdBlue, {}, 'bold', {})
call <sid>hi('markdownH5', s:cdBlue, {}, 'bold', {})
call <sid>hi('markdownH6', s:cdBlue, {}, 'bold', {})
call <sid>hi('markdownBold', s:cdBlue, {}, 'bold', {}) call <sid>hi('markdownBold', s:cdBlue, {}, 'bold', {})
call <sid>hi('markdownCode', s:cdOrange, {}, 'none', {}) call <sid>hi('markdownCode', s:cdOrange, {}, 'none', {})
call <sid>hi('markdownRule', s:cdBlue, {}, 'bold', {}) call <sid>hi('markdownRule', s:cdBlue, {}, 'bold', {})
@ -547,6 +593,7 @@ call <sid>hi('luaFuncKeyword', s:cdPink, {}, 'none', {})
call <sid>hi('luaLocal', s:cdPink, {}, 'none', {}) call <sid>hi('luaLocal', s:cdPink, {}, 'none', {})
call <sid>hi('luaBuiltIn', s:cdBlue, {}, 'none', {}) call <sid>hi('luaBuiltIn', s:cdBlue, {}, 'none', {})
" SH: " SH:
call <sid>hi('shDeref', s:cdLightBlue, {}, 'none', {}) call <sid>hi('shDeref', s:cdLightBlue, {}, 'none', {})
call <sid>hi('shVariable', s:cdLightBlue, {}, 'none', {}) call <sid>hi('shVariable', s:cdLightBlue, {}, 'none', {})
@ -560,5 +607,46 @@ call <sid>hi('sqlOperator', s:cdPink, {}, 'none', {})
call <sid>hi('yamlKey', s:cdBlue, {}, 'none', {}) call <sid>hi('yamlKey', s:cdBlue, {}, 'none', {})
call <sid>hi('yamlConstant', s:cdBlue, {}, 'none', {}) call <sid>hi('yamlConstant', s:cdBlue, {}, 'none', {})
" C++:
call <sid>hi('CTagsClass', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('CTagsStructure', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('CTagsNamespace', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('CTagsGlobalVariable', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('CTagsDefinedName ', s:cdBlue, {}, 'none', {})
highlight def link CTagsFunction Function
highlight def link CTagsMember Identifier
" C++ color_coded
call <sid>hi('StructDecl', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('UnionDecl', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('ClassDecl', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TypeRef', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TypedefDecl', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TypeAliasDecl', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('EnumDecl', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TemplateTypeParameter', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TypeAliasTemplateDecl', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('ClassTemplate', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('ClassTemplatePartialSpecialization', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('FunctionTemplate', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TemplateRef', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('TemplateTemplateParameter', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('UsingDeclaration', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('MemberRef', s:cdLightBlue, {}, 'italic', {})
call <sid>hi('MemberRefExpr', s:cdYellow, {}, 'italic', {})
call <sid>hi('Namespace', s:cdSilver, {}, 'none', {})
call <sid>hi('NamespaceRef', s:cdSilver, {}, 'none', {})
call <sid>hi('NamespaceAlias', s:cdSilver, {}, 'none', {})
" C++ lsp-cxx-highlight
call <sid>hi('LspCxxHlSymClass', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('LspCxxHlSymStruct', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('LspCxxHlSymEnum', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('LspCxxHlSymTypeAlias', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('LspCxxHlSymTypeParameter', s:cdBlueGreen, {}, 'none', {})
call <sid>hi('LspCxxHlSymConcept', s:cdBlueGreen, {}, 'italic', {})
call <sid>hi('LspCxxHlSymNamespace', s:cdSilver, {}, 'none', {})
" Coc Explorer: " Coc Explorer:
call <sid>hi('CocHighlightText', {}, s:cdSelection, 'none', {})
call <sid>hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {}) call <sid>hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {})