diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4c466c6..17835ac3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,122 @@
---
+# 0.11.0
+
+ [](https://github.com/arcticicestudio/nord-vim/projects/16) [](https://github.com/arcticicestudio/nord-vim/milestone/13)
+
+## Features
+
+### Syntax
+
+**Basic support for Asciidoc syntax highlighting** — #131 ⇄ #152 (⊶ 6e6025b9) by [@tidux][gh-user-tidux]
+↠ Added basic syntax highlighting support for [Asciidoc][] that comes bundled with Vim 8.
+
+
+
+**Basic syntax highlighting support for Rust** — #138 ⇄ #154 (⊶ b0ffc6b5) by [@TerminalWitchcraft][gh-user-terminalwitchcraft]
+↠ Added basic syntax highlighting support for [Rust][].
+
+[Traits][rustdoc-traits] and [enums][rustdoc-enums] are colorized with `nord7` and with bold font to make them visually stand out more.
+Also [attributes][rustdoc-attributes] and [derives][rustdoc-derives] are colored with `nord10`.
+
+Before
+
+After
+
+[Macros][rustdoc-macros] are colorized with `nord8` and bold font to make them visually different from "normal" functions.
+
+Before
+
+After
+
+[Escape][rustdoc-escapes] sequences are colored with `nord13`.
+
+Before
+
+After
+
+Import statements and paths are correctly colored with keyword and type colors.
+
+Before
+
+After
+
+#### Plugin Support
+
+**Haskell Syntax Plugin Support** — #104 ⇄ #150 (⊶ b0ffc6b5) by [@vabatta][gh-user-vabatta]
+↠ Added support for Haskell syntax through the [neovimhaskell/haskell-vim][] plugin.
+This includes better coloring for types/classes using `nord7` instead of highlighting them like keywords (`nord9`) and pre-processor and pragma elements are now colorized correctly with `nord10`.
+
+#### Pragma
+
+Before
+
+After
+
+#### Pre-Processor
+
+Before
+
+After
+
+#### Types/Classes
+
+Before
+
+After
+
+### UI
+
+**Theme config for bolder vertical split line** — #132 ⇄ #153 (⊶ 9059d7d8) by [@huyvohcmc][gh-user-huyvohcmc]
+↠ Previously the [`VertSplit`][vdoc-vsplit] (`:help VertSplit`) key used `nord1` as background color by default making the line appear to be very lumpy. This has now been changed to use `nord0` as background instead to visually merge with the background so only the separator characters are a visual indicator for the split line which makes it look more lightweight and declutters the overall appearance.
+
+With base editor background (default)
+
+With enabled bold nord1 background
+
+To allow user who liked the previous implementation to keep the style a new `nord_bold_vertical_split_line` theme config was also added that can be assigned to `1` to achieve the legacy design.
+
+```viml
+let g:nord_bold_vertical_split_line = 1
+```
+
+The README includes information and hints how to change the separator character by customizing Vim's [`fillchars`][vdoc-fchar] (`:help fillchars`) variable.
+
+#### Plugin Support
+
+**`:terminal` status line in airline** — #134 (⊶ be815f09) by [@meck][gh-user-meck]
+↠ Added support for Vim's new `:terminal` mode in [airline][gh-src-airline].
+
+Before: No :terminal support (before)
+
+After: Support for airline's new _term theme keys
+
+## Improvements
+
+### Syntax
+
+**Better generator expressions in CMake** — #137 ⇄ #151 (⊶ d2774cbb) by [@markand][gh-user-markand]
+↠ [CMake generator expressions][cmake-doc-genexpr] are now highlighted using `nord10` as foreground instead of `nord13` as background and `nord0` as foreground.
+
+Before
+
+After
+
+### UI
+
+#### Plugin Support
+
+**airline warnings and errors** — #130 (⊶ e85dbe75) by [@axelitus][gh-user-axelitus]
+↠ Added support for error and warning elements of [airline][gh-src-airline].
+
+Before
+
+After
+
+**ALE error and warning support** — #135 (⊶ 9d82b7a1) by [@meck][gh-user-meck]
+↠ Added support highlighting and underlines for [ALE][plugin-ale] errors and warnings to also align the style with gutter signs.
+
# 0.10.0
 [](https://github.com/arcticicestudio/nord-vim/projects/15) [](https://github.com/arcticicestudio/nord-vim/milestone/12)
@@ -483,6 +599,21 @@ Detailed information about features, supported plugins/languages and install ins
+
+
+
+
+
+
+[asciidoc]: https://asciidoctor.org
[gh-11]: https://github.com/arcticicestudio/nord-vim/issues/11
[gh-55-arcticicestudio/nord]: https://github.com/arcticicestudio/nord/issues/55
[gh-lightline.vim]: https://github.com/itchyny/lightline.vim
@@ -491,11 +622,11 @@ Detailed information about features, supported plugins/languages and install ins
[gh-tmuxline.vim]: https://github.com/edkolev/tmuxline.vim
[gh-user-cg433n]: https://github.com/cg433n
[gist-colors-in-terminals]: https://gist.github.com/XVilka/8346728
-[itchyny/lightline.vim-gh-257]: https://github.com/itchyny/lightline.vim/pull/257
[itchyny/lightline-adv-config]: https://github.com/itchyny/lightline.vim#advanced-configuration
+[itchyny/lightline.vim-gh-257]: https://github.com/itchyny/lightline.vim/pull/257
[lesscss-doc-fn-lighten]: http://lesscss.org/functions/#color-operations-lighten
-[nord-gh]: https://github.com/arcticicestudio/nord
[nord-atom-syntax-pr-47]: https://github.com/arcticicestudio/nord-atom-syntax/pull/47
+[nord-gh]: https://github.com/arcticicestudio/nord
[nord-lightline]: https://github.com/arcticicestudio/nord-vim/blob/develop/autoload/lightline/colorscheme/nord.vim
[plugin-ale]: https://github.com/w0rp/ale
[plugin-ctrlp]: https://github.com/ctrlpvim/ctrlp.vim
@@ -506,12 +637,33 @@ Detailed information about features, supported plugins/languages and install ins
[plugin-stephpy/vim-yaml]: https://github.com/stephpy/vim-yaml
[plugin-tpope/vim-fugitive]: https://github.com/tpope/vim-fugitive
[plugin-vimwiki/vimwiki]: https://github.com/vimwiki/vimwiki
-[readme-config]: https://github.com/arcticicestudio/nord-vim#configuration
[readme-config-comment-brightness]: https://github.com/arcticicestudio/nord-vim#comment-contrast
[readme-config-italic]: https://github.com/arcticicestudio/nord-vim#italic-support
[readme-config-line-number-background]: https://github.com/arcticicestudio/nord-vim#line-number-background
[readme-config-underline-support]: https://github.com/arcticicestudio/nord-vim#underline-support
[readme-config-uniform-diff-background]: https://github.com/arcticicestudio/nord-vim#uniform-diff-background
[readme-config-uniform-statusline-background]: https://github.com/arcticicestudio/nord-vim#uniform-status-lines
-[vim-doc-diffAdd]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-DiffAdd
+[readme-config]: https://github.com/arcticicestudio/nord-vim#configuration
+[rust]: https://www.rust-lang.org
+[vdoc-fchar]: http://vimdoc.sourceforge.net/htmldoc/options.html#'fillchars'
+[vdoc-vsplit]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-VertSplit
+[vim-doc-diffadd]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-DiffAdd
[yaml]: http://yaml.org
+
+
+
+[cmake-doc-genexpr]: https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html
+[gh-user-axelitus]: https://github.com/axelitus
+[gh-user-huyvohcmc]: https://github.com/huyvohcmc
+[gh-user-markand]: https://github.com/markand
+[gh-user-meck]: https://github.com/meck
+[gh-user-terminalwitchcraft]: https://github.com/terminalwitchcraft
+[gh-user-tidux]: https://github.com/tidux
+[gh-user-vabatta]: https://github.com/vabatta
+[neovimhaskell/haskell-vim]: https://github.com/neovimhaskell/haskell-vim
+[rustdoc-attributes]: https://doc.rust-lang.org/reference/attributes.html
+[rustdoc-derives]: https://doc.rust-lang.org/edition-guide/rust-2018/macros/custom-derive.html
+[rustdoc-enums]: https://doc.rust-lang.org/1.1.0/book/enums.html
+[rustdoc-escapes]: https://doc.rust-lang.org/reference/tokens.html#ascii-escapes
+[rustdoc-macros]: https://doc.rust-lang.org/1.8.0/book/macros.html
+[rustdoc-traits]: https://doc.rust-lang.org/book/ch10-02-traits.html
diff --git a/README.md b/README.md
index 06157d02..92ccf7c7 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su
- [Comment Contrast](#comment-contrast)
- [Uniform diff Background](#uniform-diff-background)
- [Line number background](#line-number-background)
+ - [Bold Vertical Split Line](#bold-vertical-split-line)
- [Plugin Support](#plugin-support)
- [UI Plugins](#ui-plugins)
- [Language Plugins](#language-plugins)
@@ -91,7 +92,7 @@ Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' }
A explicit version can be installed via Git tags:
```vim
-Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.10.0' }
+Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.11.0' }
```
#### Manual
@@ -259,6 +260,20 @@ let g:nord_cursor_line_number_background = 1
No background (default)
Enabled background
+### Bold Vertical Split Line
+
+Enables a bolder vertical split line by using `nord1` as background.
+
+```viml
+let g:nord_bold_vertical_split_line = 1
+```
+
+To change the separator character used to display the vertical line please see the documentation about Vim's [`fillchars`][vdoc-fillchars] variable: `:help fillchars`
+
+With base editor background (default)
+
+With enabled bold nord1 background
+
## Plugin Support
Nord Vim provides support for many third-party language- and UI plugins.
@@ -301,7 +316,7 @@ Detailed descriptions for supported languages can be found in the [project wiki]
## Development
-[](https://github.com/arcticicestudio/nord-vim/blob/v0.10.0/CHANGELOG.md#0100) [](http://nvie.com/posts/a-successful-git-branching-model) [](https://github.com/arcticicestudio/arcver)
+[](https://github.com/arcticicestudio/nord-vim/blob/v0.11.0/CHANGELOG.md#0110) [](http://nvie.com/posts/a-successful-git-branching-model) [](https://github.com/arcticicestudio/arcver)
### Contribution
@@ -332,3 +347,4 @@ Please report issues/bugs, feature requests and suggestions for improvements to
[scrot-lang-ruby]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-ruby.png
[scrot-readme-default-profile]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-readme-default-profile.png
[scrot-readme-lazy-profile-change]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-readme-lazy-profile-change.png
+[vdoc-fillchars]: http://vimdoc.sourceforge.net/htmldoc/options.html#'fillchars'
diff --git a/assets/scrot-config-bold-vertical-split-line-default.png b/assets/scrot-config-bold-vertical-split-line-default.png
new file mode 100644
index 00000000..bbda6880
Binary files /dev/null and b/assets/scrot-config-bold-vertical-split-line-default.png differ
diff --git a/assets/scrot-config-bold-vertical-split-line.png b/assets/scrot-config-bold-vertical-split-line.png
new file mode 100644
index 00000000..05d91042
Binary files /dev/null and b/assets/scrot-config-bold-vertical-split-line.png differ
diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim
index 354f1fa7..358b3900 100755
--- a/autoload/airline/themes/nord.vim
+++ b/autoload/airline/themes/nord.vim
@@ -5,7 +5,7 @@
" Repository: https://github.com/arcticicestudio/nord-vim
" License: MIT
-let s:nord_vim_version="0.10.0"
+let s:nord_vim_version="0.11.0"
let g:airline#themes#nord#palette = {}
let s:nord0_gui = "#2E3440"
@@ -45,24 +45,50 @@ let s:nord6_term = "15"
let s:NMain = [s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term]
let s:NRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term]
let s:NMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
+let s:NWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term]
+let s:NError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term]
let g:airline#themes#nord#palette.normal = airline#themes#generate_color_map(s:NMain, s:NRight, s:NMiddle)
+let g:airline#themes#nord#palette.normal.airline_warning = s:NWarn
+let g:airline#themes#nord#palette.normal.airline_error = s:NError
let s:IMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord6_term]
let s:IRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term]
let s:IMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
+let s:IWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term]
+let s:IError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term]
let g:airline#themes#nord#palette.insert = airline#themes#generate_color_map(s:IMain, s:IRight, s:IMiddle)
+let g:airline#themes#nord#palette.insert.airline_warning = s:IWarn
+let g:airline#themes#nord#palette.insert.airline_error = s:IError
let s:RMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord14_term]
let s:RRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term]
let s:RMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
+let s:RWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term]
+let s:RError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term]
let g:airline#themes#nord#palette.replace = airline#themes#generate_color_map(s:RMain, s:RRight, s:RMiddle)
+let g:airline#themes#nord#palette.replace.airline_warning = s:RWarn
+let g:airline#themes#nord#palette.replace.airline_error = s:RError
let s:VMain = [s:nord1_gui, s:nord7_gui, s:nord1_term, s:nord7_term]
let s:VRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term]
let s:VMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
+let s:VWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term]
+let s:VError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term]
let g:airline#themes#nord#palette.visual = airline#themes#generate_color_map(s:VMain, s:VRight, s:VMiddle)
+let g:airline#themes#nord#palette.visual.airline_warning = s:VWarn
+let g:airline#themes#nord#palette.visual.airline_error = s:VError
let s:IAMain = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
let s:IARight = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
let s:IAMiddle = [s:nord5_gui, s:nord1_gui, s:nord5_term, s:nord1_term]
+let s:IAWarn = [s:nord1_gui, s:nord13_gui, s:nord3_term, s:nord13_term]
+let s:IAError = [s:nord0_gui, s:nord11_gui, s:nord1_term, s:nord11_term]
let g:airline#themes#nord#palette.inactive = airline#themes#generate_color_map(s:IAMain, s:IARight, s:IAMiddle)
+let g:airline#themes#nord#palette.inactive.airline_warning = s:IAWarn
+let g:airline#themes#nord#palette.inactive.airline_error = s:IAError
+
+let g:airline#themes#nord#palette.normal.airline_term = s:NMiddle
+let g:airline#themes#nord#palette.insert.airline_term = s:IMiddle
+let g:airline#themes#nord#palette.replace.airline_term = s:RMiddle
+let g:airline#themes#nord#palette.visual.airline_term = s:VMiddle
+let g:airline#themes#nord#palette.inactive.airline_term = s:IAMiddle
diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim
index 76e7ab2e..11813014 100755
--- a/autoload/lightline/colorscheme/nord.vim
+++ b/autoload/lightline/colorscheme/nord.vim
@@ -5,7 +5,7 @@
" Repository: https://github.com/arcticicestudio/nord-vim
" License: MIT
-let s:nord_vim_version="0.10.0"
+let s:nord_vim_version="0.11.0"
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:nord0 = ["#2E3440", "NONE"]
diff --git a/colors/nord.vim b/colors/nord.vim
index 328245f5..2e633c62 100755
--- a/colors/nord.vim
+++ b/colors/nord.vim
@@ -13,7 +13,7 @@ if version > 580
endif
let g:colors_name = "nord"
-let s:nord_vim_version="0.10.0"
+let s:nord_vim_version="0.11.0"
set background=dark
let s:nord0_gui = "#2E3440"
@@ -122,6 +122,10 @@ if !exists("g:nord_cursor_line_number_background")
let g:nord_cursor_line_number_background = 0
endif
+if !exists("g:nord_bold_vertical_split_line")
+ let g:nord_bold_vertical_split_line = 0
+endif
+
function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
if a:guifg != ""
exec "hi " . a:group . " guifg=" . a:guifg
@@ -248,7 +252,12 @@ call s:hi("TabLineSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "N
"+--- Window ---+
call s:hi("Title", s:nord4_gui, "", "NONE", "", "NONE", "")
-call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NONE", "")
+
+if g:nord_bold_vertical_split_line == 0
+ call s:hi("VertSplit", s:nord2_gui, s:nord0_gui, s:nord3_term, "NONE", "NONE", "")
+else
+ call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NONE", "")
+endif
"+----------------------+
"+ Language Base Groups +
@@ -288,6 +297,27 @@ hi! link PreCondit PreProc
"+-----------+
"+ Languages +
"+-----------+
+call s:hi("asciidocAttributeEntry", s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("asciidocAttributeList", s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("asciidocAttributeRef", s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("asciidocHLabel", s:nord9_gui, "", s:nord9_term, "", "", "")
+call s:hi("asciidocListingBlock", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("asciidocMacroAttributes", s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("asciidocOneLineTitle", s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("asciidocPassthroughBlock", s:nord9_gui, "", s:nord9_term, "", "", "")
+call s:hi("asciidocQuotedMonospaced", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("asciidocTriplePlusPassthrough", s:nord7_gui, "", s:nord7_term, "", "", "")
+hi! link asciidocAdmonition Keyword
+hi! link asciidocAttributeRef markdownH1
+hi! link asciidocBackslash Keyword
+hi! link asciidocMacro Keyword
+hi! link asciidocQuotedBold Bold
+hi! link asciidocQuotedEmphasized Italic
+hi! link asciidocQuotedMonospaced2 asciidocQuotedMonospaced
+hi! link asciidocQuotedUnconstrainedBold asciidocQuotedBold
+hi! link asciidocQuotedUnconstrainedEmphasized asciidocQuotedEmphasized
+hi! link asciidocURL markdownLinkText
+
call s:hi("awkCharClass", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("awkPatterns", s:nord9_gui, "", s:nord9_term, "", "bold", "")
hi! link awkArrayElement Identifier
@@ -309,6 +339,8 @@ call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term, "", "", "")
hi! link cOperator Operator
hi! link cPreCondit PreCondit
+call s:hi("cmakeGeneratorExpression", s:nord10_gui, "", s:nord10_term, "", "", "")
+
hi! link csPreCondit PreCondit
hi! link csType Type
hi! link csXmlTag SpecialComment
@@ -449,6 +481,18 @@ hi! link rubyLocalVariableOrMethod Function
hi! link rubyPseudoVariable Keyword
hi! link rubyRegexp SpecialChar
+call s:hi("rustAttribute", s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("rustEnum", s:nord7_gui, "", s:nord7_term, "", "bold", "")
+call s:hi("rustMacro", s:nord8_gui, "", s:nord8_term, "", "bold", "")
+call s:hi("rustModPath", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("rustPanic", s:nord9_gui, "", s:nord9_term, "", "bold", "")
+call s:hi("rustTrait", s:nord7_gui, "", s:nord7_term, "", s:italic, "")
+hi! link rustCommentLineDoc Comment
+hi! link rustDerive rustAttribute
+hi! link rustEnumVariant rustEnum
+hi! link rustEscape SpecialChar
+hi! link rustQuestionMark Keyword
+
call s:hi("sassClass", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("sassId", s:nord7_gui, "", s:nord7_term, "", s:underline, "")
hi! link sassAmpersand Keyword
@@ -503,6 +547,8 @@ hi! link yamlDocumentStart Keyword
" > w0rp/ale
call s:hi("ALEWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "")
call s:hi("ALEErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "")
+call s:hi("ALEWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "")
+call s:hi("ALEError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "")
" GitGutter
" > airblade/vim-gitgutter
@@ -548,6 +594,12 @@ call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "")
call s:hi("SignatureMarkText", s:nord8_gui, "", s:nord8_term, "", "", "")
"+--- Languages ---+
+" Haskell
+" > neovimhaskell/haskell-vim
+call s:hi("haskellPreProc", s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("haskellType", s:nord7_gui, "", s:nord7_term, "", "", "")
+hi! link haskellPragma haskellPreProc
+
" JavaScript
" > pangloss/vim-javascript
call s:hi("jsGlobalNodeObjects", s:nord8_gui, "", s:nord8_term, "", s:italic, "")