@@ -21,10 +21,10 @@ let s:gui01 = "232530"
21
21
let g: base16_gui01 = " 232530"
22
22
let s: gui02 = " 2E303E"
23
23
let g: base16_gui02 = " 2E303E"
24
- let s: gui03 = " 676A8D "
25
- let g: base16_gui03 = " 676A8D "
26
- let s: gui04 = " CED1D0 "
27
- let g: base16_gui04 = " CED1D0 "
24
+ let s: gui03 = " 6F6F70 "
25
+ let g: base16_gui03 = " 6F6F70 "
26
+ let s: gui04 = " 9DA0A2 "
27
+ let g: base16_gui04 = " 9DA0A2 "
28
28
let s: gui05 = " CBCED0"
29
29
let g: base16_gui05 = " CBCED0"
30
30
let s: gui06 = " DCDFE4"
@@ -107,7 +107,7 @@ if has("nvim")
107
107
let g: terminal_color_5 = " #B072D1"
108
108
let g: terminal_color_6 = " #24A8B4"
109
109
let g: terminal_color_7 = " #CBCED0"
110
- let g: terminal_color_8 = " #676A8D "
110
+ let g: terminal_color_8 = " #6F6F70 "
111
111
let g: terminal_color_9 = " #E93C58"
112
112
let g: terminal_color_10 = " #EFAF8E"
113
113
let g: terminal_color_11 = " #EFB993"
@@ -131,7 +131,7 @@ elseif has("terminal")
131
131
\ " #B072D1" ,
132
132
\ " #24A8B4" ,
133
133
\ " #CBCED0" ,
134
- \ " #676A8D " ,
134
+ \ " #6F6F70 " ,
135
135
\ " #E93C58" ,
136
136
\ " #EFAF8E" ,
137
137
\ " #EFB993" ,
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
153
153
let l: attr = get (a: , 1 , " " )
154
154
let l: guisp = get (a: , 2 , " " )
155
155
156
+ " See :help highlight-guifg
157
+ let l: gui_special_names = [" NONE" , " bg" , " background" , " fg" , " foreground" ]
158
+
156
159
if a: guifg != " "
157
- exec " hi " . a: group . " guifg=#" . a: guifg
160
+ if index (l: gui_special_names , a: guifg ) >= 0
161
+ exec " hi " . a: group . " guifg=" . a: guifg
162
+ else
163
+ exec " hi " . a: group . " guifg=#" . a: guifg
164
+ endif
158
165
endif
159
166
if a: guibg != " "
160
- exec " hi " . a: group . " guibg=#" . a: guibg
167
+ if index (l: gui_special_names , a: guibg ) >= 0
168
+ exec " hi " . a: group . " guibg=" . a: guibg
169
+ else
170
+ exec " hi " . a: group . " guibg=#" . a: guibg
171
+ endif
161
172
endif
162
173
if a: ctermfg != " "
163
174
exec " hi " . a: group . " ctermfg=" . a: ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
169
180
exec " hi " . a: group . " gui=" . l: attr . " cterm=" . l: attr
170
181
endif
171
182
if l: guisp != " "
172
- exec " hi " . a: group . " guisp=#" . l: guisp
183
+ if index (l: gui_special_names , l: guisp ) >= 0
184
+ exec " hi " . a: group . " guisp=" . l: guisp
185
+ else
186
+ exec " hi " . a: group . " guisp=#" . l: guisp
187
+ endif
173
188
endif
174
189
endfunction
175
190
@@ -332,6 +347,12 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
332
347
call <sid> hi (" jsExceptions" , s: gui0A , " " , s: cterm0A , " " , " " , " " )
333
348
call <sid> hi (" jsBuiltins" , s: gui0A , " " , s: cterm0A , " " , " " , " " )
334
349
350
+ " LSP highlighting
351
+ call <sid> hi (" LspDiagnosticsDefaultError" , s: gui08 , " " , s: cterm08 , " " , " " , " " )
352
+ call <sid> hi (" LspDiagnosticsDefaultWarning" , s: gui09 , " " , s: cterm09 , " " , " " , " " )
353
+ call <sid> hi (" LspDiagnosticsDefaultHnformation" , s: gui05 , " " , s: cterm05 , " " , " " , " " )
354
+ call <sid> hi (" LspDiagnosticsDefaultHint" , s: gui03 , " " , s: cterm03 , " " , " " , " " )
355
+
335
356
" Mail highlighting
336
357
call <sid> hi (" mailQuoted1" , s: gui0A , " " , s: cterm0A , " " , " " , " " )
337
358
call <sid> hi (" mailQuoted2" , s: gui0B , " " , s: cterm0B , " " , " " , " " )
0 commit comments