vim/nordtheme.vim
1
0
Fork 0
mirror of https://github.com/nordtheme/vim.git synced 2026-09-10 07:36:23 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor theme configuration conditions (#295)

Browse source 
The conditions and default values of the theme configurations were quite
verbose so this commit improves them by...

- ...using inline ternary operators instead of if/else blocks to reduce
  the code overhead and make it way more readable.
- ...using Vim builtin `get` function [1] instead of if/else blocks.
- ...inlining the script-scoped `logWarning` function since it was only
  used once.
- ...grouping some blocks where it made sense.

[1]: https://vimhelp.org/builtin.txt.html#builtin.txt#get%28%29

GH-295


Co-authored-by: Sven Greb <development@svengreb.de>
This commit is contained in:
Julien Voisin 2022-04-16 09:53:54 +02:00 committed by Sven Greb
parent 085a184d5d
commit bf09e50f5c
1 changed files with 16 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
colors/nord.vim
View file

@ -72,68 +72,36 @@ let s:nord3_gui_brightened = [
\ "#7b88a1", \ "#7b88a1",
\ ] \ ]
if !exists("g:nord_bold") let g:nord_bold = get(g:, "nord_bold", 1)
let g:nord_bold = 1 let s:bold = (g:nord_bold == 0) ? "" : "bold,"
endif
let s:bold = "bold," let g:nord_underline = get(g:, "nord_underline", 1)
if g:nord_bold == 0 let s:underline = (g:nord_underline == 0) ? "NONE," : "underline,"
let s:bold = ""
endif
if !exists("g:nord_italic") let g:nord_italic = get(g:, "nord_italic", (has("gui_running") || $TERM_ITALICS == "true"))
if has("gui_running") || $TERM_ITALICS == "true" let s:italic = (g:nord_italic == 0) ? "" : "italic,"
let g:nord_italic = 1
else
let g:nord_italic = 0
endif
endif
let s:italic = "italic,"
if g:nord_italic == 0
let s:italic = ""
endif
let s:underline = "underline,"
if ! get(g:, "nord_underline", 1)
let s:underline = "NONE,"
endif
let s:italicize_comments = "" let s:italicize_comments = ""
if exists("g:nord_italic_comments") if get(g:, "nord_italic_comments", 0)
if g:nord_italic_comments == 1 let s:italicize_comments = s:italic
let s:italicize_comments = s:italic
endif
endif endif
if !exists('g:nord_uniform_status_lines') let g:nord_uniform_status_lines = get(g:, "nord_uniform_status_lines", 0)
let g:nord_uniform_status_lines = 0
endif
function! s:logWarning(msg)
echohl WarningMsg
echomsg 'nord: warning: ' . a:msg
echohl None
endfunction
if exists("g:nord_comment_brightness") if exists("g:nord_comment_brightness")
call s:logWarning('Variable g:nord_comment_brightness has been deprecated and will be removed in version 1.0.0!' . echohl WarningMsg
echomsg 'nord: warning: Variable g:nord_comment_brightness has been deprecated and will be removed in version 1.0.0!' .
\' The comment color brightness has been increased by 10% by default.' . \' The comment color brightness has been increased by 10% by default.' .
\' Please see https://github.com/arcticicestudio/nord-vim/issues/145 for more details.') \' Please see https://github.com/arcticicestudio/nord-vim/issues/145 for more details.'
echohl None
let g:nord_comment_brightness = 10 let g:nord_comment_brightness = 10
endif endif
if !exists("g:nord_uniform_diff_background") let g:nord_uniform_diff_background = get(g:, "nord_uniform_diff_background", 0)
let g:nord_uniform_diff_background = 0
endif
if !exists("g:nord_cursor_line_number_background") let g:nord_cursor_line_number_background = get(g:, "nord_cursor_line_number_background", 0)
let g:nord_cursor_line_number_background = 0
endif
if !exists("g:nord_bold_vertical_split_line") let g:nord_bold_vertical_split_line = get(g:, "nord_bold_vertical_split_line", 0)
let g:nord_bold_vertical_split_line = 0
endif
function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
if a:guifg != "" if a:guifg != ""