mirror of
https://github.com/joshdick/onedark.vim.git
synced 2025-11-16 06:53:47 -05:00
Tweaks and Updates (#100)
* Change comment style to use folds, in turn necessitating changing the template delimeters * Add "Underlined" styling * Update the gui gutter foreground color * Automatically generate terminal color palette files * README.md: Add 'Relatives of onedark.vim' section * README.md tweaks to (hopefully) make installation and troubleshooting easier. * README.md: Update preview image information * README.md: Re-update preview image information * README.md: Fixed wording about italics troubleshooting screenshot * README.md: "setting" -> "option" where appropriate * README.md: Fix typos
This commit is contained in:
Josh Dick
@@ -1,10 +1,21 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const doT = require('doT')
|
||||
const termcolors = require('termcolors')
|
||||
const { readFileSync, writeFileSync } = require('fs')
|
||||
const { resolve } = require('path')
|
||||
|
||||
doT.templateSettings.strip = false // preserve whitespace
|
||||
doT.templateSettings = {
|
||||
evaluate: /\<\%([\s\S]+?)\%\>/g,
|
||||
interpolate: /\<\%=([\s\S]+?)\%\>/g,
|
||||
encode: /\<\%!([\s\S]+?)\%\>/g,
|
||||
use: /\<\%#([\s\S]+?)\%\>/g,
|
||||
define: /\<\%##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\%\>/g,
|
||||
conditional: /\<\%\?(\?)?\s*([\s\S]*?)\s*\%\>/g,
|
||||
iterate: /\<\%~\s*(?:\%\>|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\%\>)/g,
|
||||
varname: 'it',
|
||||
strip: false, // preserve whitespace
|
||||
}
|
||||
|
||||
const baseColors = Object.freeze({
|
||||
red: { gui: '#E06C75', cterm: '204', cterm16: '1' }, // alternate cterm: 168
|
||||
@@ -21,7 +32,7 @@ const baseColors = Object.freeze({
|
||||
|
||||
const specialColors = Object.freeze({
|
||||
comment_grey: { gui: '#5C6370', cterm: '59', cterm16: '15' },
|
||||
gutter_fg_grey: { gui: '#636D83', cterm: '238', cterm16: '15' },
|
||||
gutter_fg_grey: { gui: '#4B5263', cterm: '238', cterm16: '15' },
|
||||
cursor_grey: { gui: '#2C323C', cterm: '236', cterm16: '8' },
|
||||
visual_grey: { gui: '#3E4452', cterm: '237', cterm16: '15' },
|
||||
menu_grey: { cterm16: '8' }, // vim theme handles gui/cterm values
|
||||
@@ -32,9 +43,10 @@ const specialColors = Object.freeze({
|
||||
const colors = Object.assign({}, baseColors, specialColors)
|
||||
|
||||
const templateMap = Object.freeze({
|
||||
'./templates/onedark.template.vim': '../colors/onedark.vim',
|
||||
'./templates/lightline.template.vim': '../autoload/lightline/colorscheme/onedark.vim',
|
||||
'./templates/airline.template.vim': '../autoload/airline/themes/onedark.vim'
|
||||
'templates/onedark.template.vim': '../colors/onedark.vim',
|
||||
'templates/lightline.template.vim': '../autoload/lightline/colorscheme/onedark.vim',
|
||||
'templates/airline.template.vim': '../autoload/airline/themes/onedark.vim',
|
||||
'templates/One Dark.Xresources': '../term/One Dark.Xresources'
|
||||
})
|
||||
|
||||
const shouldCheck = String(process.argv[2]).toLowerCase() === 'check'
|
||||
@@ -100,5 +112,21 @@ Object.keys(templateMap).forEach(templateFilename => {
|
||||
|
||||
})
|
||||
|
||||
try {
|
||||
// Use the Xresources theme as a color source since it was generated above via templating
|
||||
const xresources = readFileSync(resolve(__dirname, '../term/One Dark.Xresources'), 'utf8')
|
||||
const terminalPalette = termcolors.xresources.import(xresources)
|
||||
|
||||
try {
|
||||
writeFileSync(resolve(__dirname, '../term/One\ Dark.itermcolors'), termcolors.iterm.export(terminalPalette))
|
||||
writeFileSync(resolve(__dirname, '../term/One\ Dark.terminal'), termcolors.terminalapp.export(terminalPalette))
|
||||
} catch (e) {
|
||||
handleError('Error writing terminal color file', e)
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
handleError('Error reading Xresources terminal color file', e)
|
||||
}
|
||||
|
||||
console.log('Success!')
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
"husky": "^0.13.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"dot": "^1.1.1"
|
||||
"dot": "^1.1.1",
|
||||
"termcolors": "latest"
|
||||
}
|
||||
}
|
||||
|
||||
37
build/templates/One Dark.Xresources
Normal file
37
build/templates/One Dark.Xresources
Normal file
@@ -0,0 +1,37 @@
|
||||
! special
|
||||
*.foreground: <%=it.white.gui%>
|
||||
*.background: <%=it.black.gui%>
|
||||
*.cursorColor: <%=it.white.gui%>
|
||||
|
||||
! black
|
||||
*.color0: <%=it.black.gui%>
|
||||
*.color8: <%=it.visual_grey.gui%>
|
||||
|
||||
! red
|
||||
*.color1: <%=it.red.gui%>
|
||||
*.color9: <%=it.dark_red.gui%>
|
||||
|
||||
! green
|
||||
*.color2: <%=it.green.gui%>
|
||||
*.color10: <%=it.green.gui%>
|
||||
|
||||
! yellow
|
||||
*.color3: <%=it.yellow.gui%>
|
||||
*.color11: <%=it.dark_yellow.gui%>
|
||||
|
||||
! blue
|
||||
*.color4: <%=it.blue.gui%>
|
||||
*.color12: <%=it.blue.gui%>
|
||||
|
||||
! magenta
|
||||
*.color5: <%=it.purple.gui%>
|
||||
*.color13: <%=it.purple.gui%>
|
||||
|
||||
! cyan
|
||||
*.color6: <%=it.cyan.gui%>
|
||||
*.color14: <%=it.cyan.gui%>
|
||||
|
||||
! white
|
||||
*.color7: <%=it.white.gui%>
|
||||
*.color15: <%=it.comment_grey.gui%>
|
||||
|
||||
@@ -7,34 +7,34 @@
|
||||
function! airline#themes#onedark#refresh()
|
||||
|
||||
if get(g:, 'onedark_termcolors', 256) == 16
|
||||
let s:term_red = {{=it.red.cterm16}}
|
||||
let s:term_green = {{=it.green.cterm16}}
|
||||
let s:term_yellow = {{=it.yellow.cterm16}}
|
||||
let s:term_blue = {{=it.blue.cterm16}}
|
||||
let s:term_purple = {{=it.purple.cterm16}}
|
||||
let s:term_white = {{=it.white.cterm16}}
|
||||
let s:term_black = {{=it.black.cterm16}}
|
||||
let s:term_grey = {{=it.cursor_grey.cterm16}}
|
||||
let s:term_red = <%=it.red.cterm16%>
|
||||
let s:term_green = <%=it.green.cterm16%>
|
||||
let s:term_yellow = <%=it.yellow.cterm16%>
|
||||
let s:term_blue = <%=it.blue.cterm16%>
|
||||
let s:term_purple = <%=it.purple.cterm16%>
|
||||
let s:term_white = <%=it.white.cterm16%>
|
||||
let s:term_black = <%=it.black.cterm16%>
|
||||
let s:term_grey = <%=it.cursor_grey.cterm16%>
|
||||
else
|
||||
let s:term_red = {{=it.red.cterm}}
|
||||
let s:term_green = {{=it.green.cterm}}
|
||||
let s:term_yellow = {{=it.yellow.cterm}}
|
||||
let s:term_blue = {{=it.blue.cterm}}
|
||||
let s:term_purple = {{=it.purple.cterm}}
|
||||
let s:term_white = {{=it.white.cterm}}
|
||||
let s:term_black = {{=it.black.cterm}}
|
||||
let s:term_grey = {{=it.cursor_grey.cterm}}
|
||||
let s:term_red = <%=it.red.cterm%>
|
||||
let s:term_green = <%=it.green.cterm%>
|
||||
let s:term_yellow = <%=it.yellow.cterm%>
|
||||
let s:term_blue = <%=it.blue.cterm%>
|
||||
let s:term_purple = <%=it.purple.cterm%>
|
||||
let s:term_white = <%=it.white.cterm%>
|
||||
let s:term_black = <%=it.black.cterm%>
|
||||
let s:term_grey = <%=it.cursor_grey.cterm%>
|
||||
endif
|
||||
|
||||
let g:airline#themes#onedark#palette = {}
|
||||
|
||||
let g:airline#themes#onedark#palette.accents = {
|
||||
\ 'red': [ '{{=it.red.gui}}', '', s:term_red, 0 ]
|
||||
\ 'red': [ '<%=it.red.gui%>', '', s:term_red, 0 ]
|
||||
\ }
|
||||
|
||||
let s:N1 = [ '{{=it.black.gui}}', '{{=it.green.gui}}', s:term_black, s:term_green ]
|
||||
let s:N2 = [ '{{=it.white.gui}}', '{{=it.visual_grey.gui}}', s:term_white, s:term_grey ]
|
||||
let s:N3 = [ '{{=it.green.gui}}', '{{=it.black.gui}}', s:term_green, '' ]
|
||||
let s:N1 = [ '<%=it.black.gui%>', '<%=it.green.gui%>', s:term_black, s:term_green ]
|
||||
let s:N2 = [ '<%=it.white.gui%>', '<%=it.visual_grey.gui%>', s:term_white, s:term_grey ]
|
||||
let s:N3 = [ '<%=it.green.gui%>', '<%=it.black.gui%>', s:term_green, '' ]
|
||||
let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
|
||||
|
||||
let group = airline#themes#get_highlight('vimCommand')
|
||||
@@ -42,26 +42,26 @@ function! airline#themes#onedark#refresh()
|
||||
\ 'airline_c': [ group[0], '', group[2], '', '' ]
|
||||
\ }
|
||||
|
||||
let s:I1 = [ '{{=it.black.gui}}', '{{=it.blue.gui}}', s:term_black, s:term_blue ]
|
||||
let s:I1 = [ '<%=it.black.gui%>', '<%=it.blue.gui%>', s:term_black, s:term_blue ]
|
||||
let s:I2 = s:N2
|
||||
let s:I3 = [ '{{=it.blue.gui}}', '{{=it.black.gui}}', s:term_blue, '' ]
|
||||
let s:I3 = [ '<%=it.blue.gui%>', '<%=it.black.gui%>', s:term_blue, '' ]
|
||||
let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
|
||||
let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified
|
||||
|
||||
let s:R1 = [ '{{=it.black.gui}}', '{{=it.red.gui}}', s:term_black, s:term_red ]
|
||||
let s:R1 = [ '<%=it.black.gui%>', '<%=it.red.gui%>', s:term_black, s:term_red ]
|
||||
let s:R2 = s:N2
|
||||
let s:R3 = [ '{{=it.red.gui}}', '{{=it.black.gui}}', s:term_red, '' ]
|
||||
let s:R3 = [ '<%=it.red.gui%>', '<%=it.black.gui%>', s:term_red, '' ]
|
||||
let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
|
||||
let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified
|
||||
|
||||
let s:V1 = [ '{{=it.black.gui}}', '{{=it.purple.gui}}', s:term_black, s:term_purple ]
|
||||
let s:V1 = [ '<%=it.black.gui%>', '<%=it.purple.gui%>', s:term_black, s:term_purple ]
|
||||
let s:V2 = s:N2
|
||||
let s:V3 = [ '{{=it.purple.gui}}', '{{=it.black.gui}}', s:term_purple, '' ]
|
||||
let s:V3 = [ '<%=it.purple.gui%>', '<%=it.black.gui%>', s:term_purple, '' ]
|
||||
let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
|
||||
let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified
|
||||
|
||||
let s:IA1 = [ '{{=it.black.gui}}', '{{=it.white.gui}}', s:term_black, s:term_white ]
|
||||
let s:IA2 = [ '{{=it.white.gui}}', '{{=it.visual_grey.gui}}', s:term_white, s:term_grey ]
|
||||
let s:IA1 = [ '<%=it.black.gui%>', '<%=it.white.gui%>', s:term_black, s:term_white ]
|
||||
let s:IA2 = [ '<%=it.white.gui%>', '<%=it.visual_grey.gui%>', s:term_white, s:term_grey ]
|
||||
let s:IA3 = s:N2
|
||||
let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
|
||||
let g:airline#themes#onedark#palette.inactive_modified = {
|
||||
@@ -71,7 +71,7 @@ function! airline#themes#onedark#refresh()
|
||||
" Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim)
|
||||
|
||||
" Warnings
|
||||
let s:WI = [ '{{=it.black.gui}}', '{{=it.yellow.gui}}', s:term_black, s:term_yellow ]
|
||||
let s:WI = [ '<%=it.black.gui%>', '<%=it.yellow.gui%>', s:term_black, s:term_yellow ]
|
||||
let g:airline#themes#onedark#palette.normal.airline_warning = [
|
||||
\ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
|
||||
\ ]
|
||||
@@ -98,7 +98,7 @@ function! airline#themes#onedark#refresh()
|
||||
\ g:airline#themes#onedark#palette.normal.airline_warning
|
||||
|
||||
" Errors
|
||||
let s:ER = [ '{{=it.black.gui}}', '{{=it.red.gui}}', s:term_black, s:term_red ]
|
||||
let s:ER = [ '<%=it.black.gui%>', '<%=it.red.gui%>', s:term_black, s:term_red ]
|
||||
let g:airline#themes#onedark#palette.normal.airline_error = [
|
||||
\ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
|
||||
\ ]
|
||||
|
||||
@@ -4,33 +4,33 @@
|
||||
" the [onedark.vim](https://github.com/joshdick/onedark.vim) colorscheme.
|
||||
|
||||
if get(g:, 'onedark_termcolors', 256) == 16
|
||||
let s:term_red = {{=it.red.cterm16}}
|
||||
let s:term_green = {{=it.green.cterm16}}
|
||||
let s:term_yellow = {{=it.yellow.cterm16}}
|
||||
let s:term_blue = {{=it.blue.cterm16}}
|
||||
let s:term_purple = {{=it.purple.cterm16}}
|
||||
let s:term_white = {{=it.white.cterm16}}
|
||||
let s:term_black = {{=it.black.cterm16}}
|
||||
let s:term_grey = {{=it.cursor_grey.cterm16}}
|
||||
let s:term_red = <%=it.red.cterm16%>
|
||||
let s:term_green = <%=it.green.cterm16%>
|
||||
let s:term_yellow = <%=it.yellow.cterm16%>
|
||||
let s:term_blue = <%=it.blue.cterm16%>
|
||||
let s:term_purple = <%=it.purple.cterm16%>
|
||||
let s:term_white = <%=it.white.cterm16%>
|
||||
let s:term_black = <%=it.black.cterm16%>
|
||||
let s:term_grey = <%=it.cursor_grey.cterm16%>
|
||||
else
|
||||
let s:term_red = {{=it.red.cterm}}
|
||||
let s:term_green = {{=it.green.cterm}}
|
||||
let s:term_yellow = {{=it.yellow.cterm}}
|
||||
let s:term_blue = {{=it.blue.cterm}}
|
||||
let s:term_purple = {{=it.purple.cterm}}
|
||||
let s:term_white = {{=it.white.cterm}}
|
||||
let s:term_black = {{=it.black.cterm}}
|
||||
let s:term_grey = {{=it.cursor_grey.cterm}}
|
||||
let s:term_red = <%=it.red.cterm%>
|
||||
let s:term_green = <%=it.green.cterm%>
|
||||
let s:term_yellow = <%=it.yellow.cterm%>
|
||||
let s:term_blue = <%=it.blue.cterm%>
|
||||
let s:term_purple = <%=it.purple.cterm%>
|
||||
let s:term_white = <%=it.white.cterm%>
|
||||
let s:term_black = <%=it.black.cterm%>
|
||||
let s:term_grey = <%=it.cursor_grey.cterm%>
|
||||
endif
|
||||
|
||||
let s:red = [ '{{=it.red.gui}}', s:term_red ]
|
||||
let s:green = [ '{{=it.green.gui}}', s:term_green ]
|
||||
let s:yellow = [ '{{=it.yellow.gui}}', s:term_yellow ]
|
||||
let s:blue = [ '{{=it.blue.gui}}', s:term_blue ]
|
||||
let s:purple = [ '{{=it.purple.gui}}', s:term_purple ]
|
||||
let s:white = [ '{{=it.white.gui}}', s:term_white ]
|
||||
let s:black = [ '{{=it.black.gui}}', s:term_black ]
|
||||
let s:grey = [ '{{=it.visual_grey.gui}}', s:term_grey ]
|
||||
let s:red = [ '<%=it.red.gui%>', s:term_red ]
|
||||
let s:green = [ '<%=it.green.gui%>', s:term_green ]
|
||||
let s:yellow = [ '<%=it.yellow.gui%>', s:term_yellow ]
|
||||
let s:blue = [ '<%=it.blue.gui%>', s:term_blue ]
|
||||
let s:purple = [ '<%=it.purple.gui%>', s:term_purple ]
|
||||
let s:white = [ '<%=it.white.gui%>', s:term_white ]
|
||||
let s:black = [ '<%=it.black.gui%>', s:term_black ]
|
||||
let s:grey = [ '<%=it.visual_grey.gui%>', s:term_grey ]
|
||||
|
||||
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
|
||||
let s:p.normal.left = [ [ s:black, s:green ], [ s:white, s:grey ] ]
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
" vim:fdm=marker
|
||||
" Vim Color File
|
||||
" Name: onedark.vim
|
||||
" Maintainer: https://github.com/joshdick/onedark.vim/
|
||||
@@ -6,9 +7,7 @@
|
||||
|
||||
" A companion [vim-airline](https://github.com/bling/vim-airline) theme is available at: https://github.com/joshdick/airline-onedark.vim
|
||||
|
||||
" +-----------------+
|
||||
" | Color Reference |
|
||||
" +-----------------+
|
||||
" Color Reference {{{
|
||||
|
||||
" The following colors were measured inside Atom using its built-in inspector.
|
||||
|
||||
@@ -35,14 +34,14 @@
|
||||
" |--------------+--------------------+---------|
|
||||
" | Cyan | rgb(86, 182, 194) | #56b6c2 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Gutter Grey | rgb(99, 109, 131) | #636d83 |
|
||||
" | Gutter Grey | rgb(76, 82, 99) | #4b5263 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Comment Grey | rgb(92, 99, 112) | #5c6370 |
|
||||
" +---------------------------------------------+
|
||||
|
||||
" +----------------+
|
||||
" | Initialization |
|
||||
" +----------------+
|
||||
" }}}
|
||||
|
||||
" Initialization {{{
|
||||
|
||||
highlight clear
|
||||
|
||||
@@ -96,48 +95,48 @@ function! s:h(group, style)
|
||||
\ "cterm=" (has_key(a:style, "cterm") ? a:style.cterm : "NONE")
|
||||
endfunction
|
||||
|
||||
" public
|
||||
" public {{{
|
||||
|
||||
function! onedark#set_highlight(group, style)
|
||||
call s:h(a:group, a:style)
|
||||
endfunction
|
||||
|
||||
" /public
|
||||
" }}}
|
||||
|
||||
" +-----------------+
|
||||
" | Color Variables |
|
||||
" +-----------------+
|
||||
" }}}
|
||||
|
||||
let s:red = { "gui": "{{=it.red.gui}}", "cterm": "{{=it.red.cterm}}", "cterm16": "{{=it.red.cterm16}}" }
|
||||
let s:dark_red = { "gui": "{{=it.dark_red.gui}}", "cterm": "{{=it.dark_red.cterm}}", "cterm16": "{{=it.dark_red.cterm16}}" }
|
||||
" Color Variables {{{
|
||||
|
||||
let s:green = { "gui": "{{=it.green.gui}}", "cterm": "{{=it.green.cterm}}", "cterm16": "{{=it.green.cterm16}}" }
|
||||
let s:red = { "gui": "<%=it.red.gui%>", "cterm": "<%=it.red.cterm%>", "cterm16": "<%=it.red.cterm16%>" }
|
||||
let s:dark_red = { "gui": "<%=it.dark_red.gui%>", "cterm": "<%=it.dark_red.cterm%>", "cterm16": "<%=it.dark_red.cterm16%>" }
|
||||
|
||||
let s:yellow = { "gui": "{{=it.yellow.gui}}", "cterm": "{{=it.yellow.cterm}}", "cterm16": "{{=it.yellow.cterm16}}" }
|
||||
let s:dark_yellow = { "gui": "{{=it.dark_yellow.gui}}", "cterm": "{{=it.dark_yellow.cterm}}", "cterm16": "{{=it.dark_yellow.cterm16}}" }
|
||||
let s:green = { "gui": "<%=it.green.gui%>", "cterm": "<%=it.green.cterm%>", "cterm16": "<%=it.green.cterm16%>" }
|
||||
|
||||
let s:blue = { "gui": "{{=it.blue.gui}}", "cterm": "{{=it.blue.cterm}}", "cterm16": "{{=it.blue.cterm16}}" }
|
||||
let s:yellow = { "gui": "<%=it.yellow.gui%>", "cterm": "<%=it.yellow.cterm%>", "cterm16": "<%=it.yellow.cterm16%>" }
|
||||
let s:dark_yellow = { "gui": "<%=it.dark_yellow.gui%>", "cterm": "<%=it.dark_yellow.cterm%>", "cterm16": "<%=it.dark_yellow.cterm16%>" }
|
||||
|
||||
let s:purple = { "gui": "{{=it.purple.gui}}", "cterm": "{{=it.purple.cterm}}", "cterm16": "{{=it.purple.cterm16}}" }
|
||||
let s:blue = { "gui": "<%=it.blue.gui%>", "cterm": "<%=it.blue.cterm%>", "cterm16": "<%=it.blue.cterm16%>" }
|
||||
|
||||
let s:cyan = { "gui": "{{=it.cyan.gui}}", "cterm": "{{=it.cyan.cterm}}", "cterm16": "{{=it.cyan.cterm16}}" }
|
||||
let s:purple = { "gui": "<%=it.purple.gui%>", "cterm": "<%=it.purple.cterm%>", "cterm16": "<%=it.purple.cterm16%>" }
|
||||
|
||||
let s:white = { "gui": "{{=it.white.gui}}", "cterm": "{{=it.white.cterm}}", "cterm16": "{{=it.white.cterm16}}" }
|
||||
let s:cyan = { "gui": "<%=it.cyan.gui%>", "cterm": "<%=it.cyan.cterm%>", "cterm16": "<%=it.cyan.cterm16%>" }
|
||||
|
||||
let s:black = { "gui": "{{=it.black.gui}}", "cterm": "{{=it.black.cterm}}", "cterm16": "{{=it.black.cterm16}}" }
|
||||
let s:white = { "gui": "<%=it.white.gui%>", "cterm": "<%=it.white.cterm%>", "cterm16": "<%=it.white.cterm16%>" }
|
||||
|
||||
let s:black = { "gui": "<%=it.black.gui%>", "cterm": "<%=it.black.cterm%>", "cterm16": "<%=it.black.cterm16%>" }
|
||||
let s:visual_black = { "gui": "NONE", "cterm": "NONE", "cterm16": s:black.cterm16 } " Black out selected text in 16-color visual mode
|
||||
|
||||
let s:comment_grey = { "gui": "{{=it.comment_grey.gui}}", "cterm": "{{=it.comment_grey.cterm}}", "cterm16": "{{=it.comment_grey.cterm16}}" }
|
||||
let s:gutter_fg_grey = { "gui": "{{=it.gutter_fg_grey.gui}}", "cterm": "{{=it.gutter_fg_grey.cterm}}", "cterm16": "{{=it.gutter_fg_grey.cterm16}}" }
|
||||
let s:cursor_grey = { "gui": "{{=it.cursor_grey.gui}}", "cterm": "{{=it.cursor_grey.cterm}}", "cterm16": "{{=it.cursor_grey.cterm16}}" }
|
||||
let s:visual_grey = { "gui": "{{=it.visual_grey.gui}}", "cterm": "{{=it.visual_grey.cterm}}", "cterm16": "{{=it.visual_grey.cterm16}}" }
|
||||
let s:menu_grey = { "gui": s:visual_grey.gui, "cterm": s:visual_grey.cterm, "cterm16": "{{=it.menu_grey.cterm16}}" }
|
||||
let s:special_grey = { "gui": "{{=it.special_grey.gui}}", "cterm": "{{=it.special_grey.cterm}}", "cterm16": "{{=it.special_grey.cterm16}}" }
|
||||
let s:vertsplit = { "gui": "{{=it.vertsplit.gui}}", "cterm": "{{=it.vertsplit.cterm}}", "cterm16": "{{=it.vertsplit.cterm16}}" }
|
||||
let s:comment_grey = { "gui": "<%=it.comment_grey.gui%>", "cterm": "<%=it.comment_grey.cterm%>", "cterm16": "<%=it.comment_grey.cterm16%>" }
|
||||
let s:gutter_fg_grey = { "gui": "<%=it.gutter_fg_grey.gui%>", "cterm": "<%=it.gutter_fg_grey.cterm%>", "cterm16": "<%=it.gutter_fg_grey.cterm16%>" }
|
||||
let s:cursor_grey = { "gui": "<%=it.cursor_grey.gui%>", "cterm": "<%=it.cursor_grey.cterm%>", "cterm16": "<%=it.cursor_grey.cterm16%>" }
|
||||
let s:visual_grey = { "gui": "<%=it.visual_grey.gui%>", "cterm": "<%=it.visual_grey.cterm%>", "cterm16": "<%=it.visual_grey.cterm16%>" }
|
||||
let s:menu_grey = { "gui": s:visual_grey.gui, "cterm": s:visual_grey.cterm, "cterm16": "<%=it.menu_grey.cterm16%>" }
|
||||
let s:special_grey = { "gui": "<%=it.special_grey.gui%>", "cterm": "<%=it.special_grey.cterm%>", "cterm16": "<%=it.special_grey.cterm16%>" }
|
||||
let s:vertsplit = { "gui": "<%=it.vertsplit.gui%>", "cterm": "<%=it.vertsplit.cterm%>", "cterm16": "<%=it.vertsplit.cterm16%>" }
|
||||
|
||||
" +---------------------------------------------------------+
|
||||
" | Syntax Groups (descriptions and ordering from `:h w18`) |
|
||||
" +---------------------------------------------------------+
|
||||
" }}}
|
||||
|
||||
" Syntax Groups (descriptions and ordering from `:h w18`) {{{
|
||||
|
||||
call s:h("Comment", { "fg": s:comment_grey, "gui": "italic", "cterm": "italic" }) " any comment
|
||||
call s:h("Constant", { "fg": s:cyan }) " any constant
|
||||
@@ -170,14 +169,14 @@ call s:h("Tag", {}) " you can use CTRL-] on this
|
||||
call s:h("Delimiter", {}) " character that needs attention
|
||||
call s:h("SpecialComment", { "fg": s:comment_grey }) " special things inside a comment
|
||||
call s:h("Debug", {}) " debugging statements
|
||||
call s:h("Underlined", {}) " text that stands out, HTML links
|
||||
call s:h("Underlined", { "gui": "underline", "cterm": "underline" }) " text that stands out, HTML links
|
||||
call s:h("Ignore", {}) " left blank, hidden
|
||||
call s:h("Error", { "fg": s:red }) " any erroneous construct
|
||||
call s:h("Todo", { "fg": s:purple }) " anything that needs extra attention; mostly the keywords TODO FIXME and XXX
|
||||
|
||||
" +----------------------------------------------------------------------+
|
||||
" | Highlighting Groups (descriptions and ordering from `:h hitest.vim`) |
|
||||
" +----------------------------------------------------------------------+
|
||||
" }}}
|
||||
|
||||
" Highlighting Groups (descriptions and ordering from `:h hitest.vim`) {{{
|
||||
|
||||
call s:h("ColorColumn", { "bg": s:cursor_grey }) " used for the columns set with 'colorcolumn'
|
||||
call s:h("Conceal", {}) " placeholder characters substituted for concealed text (see 'conceallevel')
|
||||
@@ -225,9 +224,9 @@ call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim
|
||||
call s:h("WarningMsg", { "fg": s:yellow }) " warning messages
|
||||
call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion
|
||||
|
||||
" +--------------------------------+
|
||||
" | Language-Specific Highlighting |
|
||||
" +--------------------------------+
|
||||
" }}}
|
||||
|
||||
" Language-Specific Highlighting {{{
|
||||
|
||||
" CSS
|
||||
call s:h("cssAttrComma", { "fg": s:purple })
|
||||
@@ -453,9 +452,9 @@ call s:h("xmlEndTag", { "fg": s:red })
|
||||
call s:h("xmlTag", { "fg": s:red })
|
||||
call s:h("xmlTagName", { "fg": s:red })
|
||||
|
||||
" +---------------------+
|
||||
" | Plugin Highlighting |
|
||||
" +---------------------+
|
||||
" }}}
|
||||
|
||||
" Plugin Highlighting {{{
|
||||
|
||||
" airblade/vim-gitgutter
|
||||
hi link GitGutterAdd SignifySignAdd
|
||||
@@ -476,9 +475,9 @@ call s:h("NeomakeInfoSign", { "fg": s:blue })
|
||||
call s:h("diffAdded", { "fg": s:green })
|
||||
call s:h("diffRemoved", { "fg": s:red })
|
||||
|
||||
" +------------------+
|
||||
" | Git Highlighting |
|
||||
" +------------------+
|
||||
" }}}
|
||||
|
||||
" Git Highlighting {{{
|
||||
|
||||
call s:h("gitcommitComment", { "fg": s:comment_grey })
|
||||
call s:h("gitcommitUnmerged", { "fg": s:green })
|
||||
@@ -502,9 +501,9 @@ hi link gitcommitDiscardedArrow gitcommitDiscardedFile
|
||||
hi link gitcommitSelectedArrow gitcommitSelectedFile
|
||||
hi link gitcommitUnmergedArrow gitcommitUnmergedFile
|
||||
|
||||
" +------------------------+
|
||||
" | Neovim terminal colors |
|
||||
" +------------------------+
|
||||
" }}}
|
||||
|
||||
" Neovim terminal colors {{{
|
||||
|
||||
if has("nvim")
|
||||
let g:terminal_color_0 = s:black.gui
|
||||
@@ -527,6 +526,8 @@ if has("nvim")
|
||||
let g:terminal_color_foreground = g:terminal_color_7
|
||||
endif
|
||||
|
||||
" }}}
|
||||
|
||||
" Must appear at the end of the file to work around this oddity:
|
||||
" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
|
||||
set background=dark
|
||||
|
||||
Reference in New Issue
Block a user