From 9c8ecad5533b64056209a592d64301c94fd201ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Poisot?= Date: Sun, 11 Jul 2021 04:21:00 -0400 Subject: [PATCH 1/4] Add support for pandoc (#220) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for `vim-pandoc/vim-pandoc-syntax` To improve syntax highlighting for Pandoc [1], support for the vim-pandoc/vim-pandoc-syntax [2] plugin has been implemented. Most groups are linked to existing Markdown groups to ensure a consistent style across languages and different plugins. Configurations used for testing: ```vim let g:pandoc#syntax#conceal#cchar_overrides = {"atx": "〉"} let g:nord_italic = 1 ``` Resources: - `g:pandoc#syntax#conceal#cchar_overrides` docs [3] - `s:cchars` definition [4] - Markdown "Extended Syntax" Guide [5] [1]: https://pandoc.org [2]: https://github.com/vim-pandoc/vim-pandoc-syntax [3]: https://github.com/vim-pandoc/vim-pandoc-syntax/blob/68d7249/doc/pandoc-syntax.txt#L45-L50 [4]: https://github.com/vim-pandoc/vim-pandoc-syntax/blob/5056e63/syntax/pandoc.vim#L37-L72 [5]: https://www.markdownguide.org/extended-syntax Co-authored-by: Arctic Ice Studio Co-authored-by: Sven Greb Closes GH-220 --- colors/nord.vim | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/colors/nord.vim b/colors/nord.vim index 9f7d6502..d0a91e82 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -690,6 +690,31 @@ hi! link jsNoise Delimiter hi! link jsPrototype Keyword hi! link jsRegexpString SpecialChar +" Pandoc +" > vim-pandoc/vim-pandoc-syntax +call s:hi("pandocDefinitionBlockTerm", s:nord7_gui, "", s:nord7_term, "", s:italic, "") +call s:hi("pandocTableDelims", s:nord3_gui, "", s:nord3_term, "", "", "") +hi! link pandocAtxHeader markdownH1 +hi! link pandocBlockQuote markdownBlockquote +hi! link pandocCiteAnchor Operator +hi! link pandocCiteKey pandocReferenceLabel +hi! link pandocDefinitionBlockMark Operator +hi! link pandocEmphasis markdownItalic +hi! link pandocFootnoteID pandocReferenceLabel +hi! link pandocFootnoteIDHead markdownLinkDelimiter +hi! link pandocFootnoteIDTail pandocFootnoteIDHead +hi! link pandocGridTableDelims pandocTableDelims +hi! link pandocGridTableHeader pandocTableDelims +hi! link pandocOperator Operator +hi! link pandocPipeTableDelims pandocTableDelims +hi! link pandocReferenceDefinition pandocReferenceLabel +hi! link pandocReferenceLabel markdownLinkText +hi! link pandocReferenceURL markdownUrl +hi! link pandocSimpleTableHeader pandocAtxHeader +hi! link pandocStrong markdownBold +hi! link pandocTableHeaderWord pandocAtxHeader +hi! link pandocUListItemBullet Operator + " tree-sitter " > nvim-treesitter/nvim-treesitter if has("nvim") From bb1d027ff7b69f2ecfb2ff6a9c5a56adbfae0668 Mon Sep 17 00:00:00 2001 From: Jan Steinke Date: Sun, 5 Sep 2021 21:10:16 +0200 Subject: [PATCH 2/4] add support for Lsp codelens (#266) Support for LSP code lenses Before LSP code lenses [1] where code lenses were highlighted with the default color which has been changed to make it less visually intrusive, like other UI related elements, i.e. messages of linters. [1]: https://neovim.io/doc/user/lsp.html#lsp-highlight-codelens GH-266 Co-authored-by: Arctic Ice Studio --- colors/nord.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/colors/nord.vim b/colors/nord.vim index d0a91e82..69b61deb 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -574,6 +574,7 @@ call s:hi("CocHintSign" , s:nord10_gui, "", s:nord10_term, "", "", "") " Neovim LSP " > neovim/nvim-lspconfig +call s:hi("LspCodeLens", s:nord3_gui_bright, "", s:nord3_term, "", "", "") call s:hi("LspDiagnosticsDefaultWarning", s:nord13_gui, "", s:nord13_term, "", "", "") call s:hi("LspDiagnosticsDefaultError" , s:nord11_gui, "", s:nord11_term, "", "", "") call s:hi("LspDiagnosticsDefaultInformation" , s:nord8_gui, "", s:nord8_term, "", "", "") From 6f183104bd185a1fa2e11f0ad3bd388e71496bca Mon Sep 17 00:00:00 2001 From: George Tom Date: Mon, 13 Sep 2021 01:44:42 +0530 Subject: [PATCH 3/4] Remove `TSError` syntax highlighting group (#270) The `TSError` group is used to highlight syntax/parser errors [1] which caused an aggressive styling where the background color of many syntax elements was rendered with `nord11` during typing. This was caused due to the fast processing of `tree-sitter` which also resulted in highlight flickering. This is a known problem and was fixed by many other themes (e.g. Dracula [2]) by removing the group again. One of the core maintainers of `nvim-treesitter` provided a solution by remapping groups [3] and also mentioned that the group is styled by the `nvim-treesitter` plugin but the active theme [4]. Syntax errors can still be highlighted through linters and parsers like Neovim's LSP [5] can still be used instead to highlight errors with the correct style (e.g. only change the foreground color of a single word). [1]: https://github.com/nvim-treesitter/nvim-treesitter/blob/fb5d6e04/doc/nvim-treesitter.txt#L493-L495 [2]: https://github.com/dracula/vim/pull/232 [3]: https://github.com/nvim-treesitter/nvim-treesitter/issues/78#issuecomment-647140700 [4]: https://github.com/nvim-treesitter/nvim-treesitter/issues/1016#issuecomment-797049591 [5]: https://github.com/neovim/nvim-lspconfig Fixes GH-269 --- colors/nord.vim | 1 - 1 file changed, 1 deletion(-) diff --git a/colors/nord.vim b/colors/nord.vim index 69b61deb..8a342d64 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -723,7 +723,6 @@ if has("nvim") hi! link TSConstBuiltin Constant hi! link TSConstructor Function hi! link TSEmphasis Italic - hi! link TSError Error hi! link TSFuncBuiltin Function hi! link TSFuncMacro Function hi! link TSStringRegex SpecialChar From 865dd93ad45d80d149bd83d9ed2933e7b8655d8c Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sun, 12 Sep 2021 23:07:55 +0200 Subject: [PATCH 4/4] Release version 0.18.0 --- CHANGELOG.md | 82 ++++++++++++++++++++----- autoload/airline/themes/nord.vim | 2 +- autoload/lightline/colorscheme/nord.vim | 2 +- colors/nord.vim | 2 +- 4 files changed, 70 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 939646e3..97cec598 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,56 @@ +# 0.18.0 + +![Release Date: 2021-09-12](https://img.shields.io/static/v1.svg?style=flat-square&label=Release%20Date&message=2021-09-12&colorA=4c566a&colorB=88c0d0) [![Project Board](https://img.shields.io/static/v1.svg?style=flat-square&label=Project%20Board&message=0.18.0&logo=github&logoColor=eceff4&colorA=4c566a&colorB=88c0d0)](https://github.com/arcticicestudio/nord-vim/projects/24) [![Milestone](https://img.shields.io/static/v1.svg?style=flat-square&label=Milestone&message=0.18.0&logo=github&logoColor=eceff4&colorA=4c566a&colorB=88c0d0)](https://github.com/arcticicestudio/nord-vim/milestone/20) + +⇅ [Show all commits][gh-compare-tag-v0.17.0_v0.18.0] + +## Features + +### Syntax + +
+Support for vim-pandoc/vim-pandoc-syntax — #220 (⊶ 8d8b9bf8) by @tpoisot and @BirgerNi + +↠ To improve syntax highlighting for [Pandoc][], support for the [vim-pandoc/vim-pandoc-syntax][] plugin has been implemented. +Most groups are linked to existing Markdown groups to ensure a consistent style across languages and different plugins. + +

+ +
+ +### UI + +
+Support for LSP code lenses — #266 (⊶ 02ddfadb) by @jan-xyz + +↠ Before [LSP code lenses][nvim-docs-lsp#codelens] were highlighted with the default color which has been changed to make it less visually intrusive, like other UI related elements, e.g. messages of linters. + +

Before

+

+ +

After

+

+ +
+ +## Improvements + +### Syntax + +
+Prevent aggressive error highlighting — #269 ⇄ #270 (⊶ e3e8a75c) by @jan-xyz + +↠ The `TSError` group is used to [highlight syntax/parser errors][nvim-treesitter/nvim-treesitter-blob-fb5d6e04#l493-l495] which caused an aggressive styling where the background color of many syntax elements was rendered with `nord11` during typing. This is a known problem and was fixed by many other themes by removing the group again. One of the [core maintainers of `nvim-treesitter` provided a solution by remapping groups][nvim-treesitter/nvim-treesitter#78#comment-647140700] and also mentioned that the group is [styled by the `nvim-treesitter` plugin but the active theme][nvim-treesitter/nvim-treesitter#1016#comment-797049591]. + +Syntax errors can still be highlighted through linters and parsers like [Neovim's LSP][neovim/nvim-lspconfig] can still be used instead to highlight errors with the correct style, e.g. only change the foreground color of a single word. + +

+ +
+ # 0.17.0 ![Release Date: 2021-07-10](https://img.shields.io/static/v1.svg?style=flat-square&label=Release%20Date&message=2021-07-10&colorA=4c566a&colorB=88c0d0) [![Project Board](https://img.shields.io/static/v1.svg?style=flat-square&label=Project%20Board&message=0.17.0&logo=github&logoColor=eceff4&colorA=4c566a&colorB=88c0d0)](https://github.com/arcticicestudio/nord-vim/projects/23) [![Milestone](https://img.shields.io/static/v1.svg?style=flat-square&label=Milestone&message=0.17.0&logo=github&logoColor=eceff4&colorA=4c566a&colorB=88c0d0)](https://github.com/arcticicestudio/nord-vim/milestone/19) @@ -48,7 +98,7 @@ Even though Neovim divides more and more from Vim through specific features like
Support for the php.vim plugin — #218, #262 ⇄ #263 (⊶ b3c46c87, 07452c71) by @pirey -↠ In [arcticicestudio/nord-vim#218][1] new highlighting groups for the bundled PHP syntax were added to improve the highlighting of classes, function and methods and the overall syntax token detection, but they are actually defined by the [php.vim][stanangeloff/php.vim] plugin. Therefore the added highlighting calls have been moved to a plugin section. +↠ In [arcticicestudio/nord-vim#218][] new highlighting groups for the bundled PHP syntax were added to improve the highlighting of classes, function and methods and the overall syntax token detection, but they are actually defined by the [php.vim][stanangeloff/php.vim] plugin. Therefore the added highlighting calls have been moved to a plugin section. Additionally, the `phpClassExtends` and `phpClassImplements` groups have been added to improve the highlighting for classes that implement or extended interfaces/classes. The `phpUseClass` has also been added to improve the highlighting for imports. To improve the highlighting with the bundled PHP syntax, the [following options][vim-docs#php_syntax] can be set: @@ -813,7 +863,7 @@ To optimally improve the highlighting `nord3` will now be used as background col ### Configurations -❯ Added a configuration to enable [italic comments](https://github.com/arcticicestudio/nord-vim#italic-comments). +❯ Added a configuration to enable [italic comments](https://github.com/arcticicestudio/nord-vim#italic-comments). To adhere to the Nord style guide this option is disabled by default. It can be enabled by setting the `g:nord_italic_comments` variable to `1`. ```vim @@ -839,7 +889,7 @@ let g:nord_italic_comments = 1 ### Documentation -❯ Added the new terminal emulator port project [Nord Hyper](https://github.com/arcticicestudio/nord-hyper) +❯ Added the new terminal emulator port project [Nord Hyper](https://github.com/arcticicestudio/nord-hyper) [![Nord Hyper](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-hyper-banner.svg)](https://github.com/arcticicestudio/nord-hyper) # 0.3.0 @@ -850,7 +900,7 @@ let g:nord_italic_comments = 1 ### Plugin Support -❯ The [Nord lightline.vim][nord-lightline] UI plugin theme now includes better support for the [tmuxline.vim](https://github.com/edkolev/tmuxline.vim) plugin. Before this implementation text shown in the main segment of the tmuxline, generated via the `:Tmuxline lightline` command, has been colorized using `nord0` which resulted in unreadable text due to a `nord3` background. +❯ The [Nord lightline.vim][nord-lightline] UI plugin theme now includes better support for the [tmuxline.vim](https://github.com/edkolev/tmuxline.vim) plugin. Before this implementation text shown in the main segment of the tmuxline, generated via the `:Tmuxline lightline` command, has been colorized using `nord0` which resulted in unreadable text due to a `nord3` background. This has been fixed by using `nord5` as foreground color. (@scottwillmoore, #11, 4ea37f7e)

Before

After

With unicode separators

Without specified configurations (tmuxline.vim autodetect)

@@ -954,14 +1004,17 @@ otherwise Markdown elements are not parsed and rendered! [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 +[liuchengxu/vim-clap]: https://github.com/liuchengxu/vim-clap [neoclide/coc.nvim]: https://github.com/neoclide/coc.nvim +[neovim-docs-lsp]: https://neovim.io/doc/user/lsp.html +[neovim/nvim-lspconfig]: https://github.com/neovim/nvim-lspconfig [nord-atom-syntax-pr-47]: https://github.com/arcticicestudio/nord-atom-syntax/pull/47 [nord-config-port-vim#uni_st_line]: https://www.nordtheme.com/docs/ports/vim/configuration#uniform-status-lines [nord-docs-config-font-bold]: https://www.nordtheme.com/ports/vim/configuration#bold-styles [nord-gh]: https://github.com/arcticicestudio/nord -[nord-home]: https://www.nordtheme.com/ports/vim [nord-lightline]: https://github.com/arcticicestudio/nord-vim/blob/develop/autoload/lightline/colorscheme/nord.vim [nord]: https://www.nordtheme.com +[pandoc]: https://pandoc.org [plugin-ale]: https://github.com/w0rp/ale [plugin-ctrlp]: https://github.com/ctrlpvim/ctrlp.vim [plugin-junegunn/vim-plug]: https://github.com/junegunn/vim-plug @@ -977,11 +1030,11 @@ otherwise Markdown elements are not parsed and rendered! [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 -[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 +[vim-pandoc/vim-pandoc-syntax]: https://github.com/vim-pandoc/vim-pandoc-syntax [yaml]: http://yaml.org @@ -1018,7 +1071,6 @@ otherwise Markdown elements are not parsed and rendered! [gh-user-nixtrace]: https://github.com/nixtrace [gh-user-vasilescur]: https://github.com/vasilescur [mhinz/vim-startify]: https://github.com/mhinz/vim-startify -[nord-config-port-vim#uni_st_line]: https://www.nordtheme.com/docs/ports/vim/configuration#uniform-status-lines [vim/vim-diff#d9b0d83b...017ba07f]: https://github.com/vim/vim/compare/d9b0d83b13d2691e4544709abd87eac004715175...017ba07fa2cdc578245618717229444fd50c470d#diff-80fffb3e9c20e93e5b2328a9a20e19c [vim/vim-rel-v8.1.2029]: https://github.com/vim/vim/releases/tag/v8.1.2029 [vim/vim#4933]: https://github.com/vim/vim/pull/4933 @@ -1035,7 +1087,6 @@ otherwise Markdown elements are not parsed and rendered! [gh-user-iamdidev]: https://github.com/iamdidev [gh-user-ikalnytskyi]: https://github.com/ikalnytskyi [herringtonharkholme/yats.vim]: https://github.com/HerringtonDarkholme/yats.vim -[liuchengxu/vim-clap]: https://github.com/liuchengxu/vim-clap [ts-docs-decorators]: https://www.typescriptlang.org/docs/handbook/decorators.html [ts-docs-jsx]: https://www.typescriptlang.org/docs/handbook/jsx.html [typescript]: https://www.typescriptlang.org @@ -1051,26 +1102,27 @@ otherwise Markdown elements are not parsed and rendered! [gh-user-crispgm]: https://github.com/crispgm [gh-user-ojroques]: https://github.com/ojroques [latex]: https://www.latex-project.org -[liuchengxu/vim-clap]: https://github.com/liuchengxu/vim-clap [nathanaelkane/vim-indent-guides]: https://github.com/nathanaelkane/vim-indent-guides [nathanaelkane/vim-indent-guides#custom_color]: https://github.com/nathanaelkane/vim-indent-guides#setting-custom-indent-colors -[neoclide/coc.nvim]: https://github.com/neoclide/coc.nvim -[neovim-docs-lsp]: https://neovim.io/doc/user/lsp.html [neovim/neovim-ms#19]: https://github.com/neovim/neovim/milestone/19 [neovim/neovim#12655]: https://github.com/neovim/neovim#12655 [overleaf-latex-learn-math_expr]: https://www.overleaf.com/learn/latex/mathematical_expressions -[pandoc]: https://pandoc.org [stanangeloff/php.vim]: https://github.com/StanAngeloff/php.vim [vim-docs#php_syntax]: https://vimhelp.org/syntax.txt.html#ft%2dphp%2dsyntax -[vim-pandoc/vim-pandoc-syntax]: https://github.com/vim-pandoc/vim-pandoc-syntax [wikip-greek_alphabet]: https://en.wikipedia.org/wiki/Greek_alphabet [gh-compare-tag-v0.16.0_v0.17.0]: https://github.com/arcticicestudio/nord-vim/compare/v0.16.0...v0.17.0 -[neovim-docs-lsp]: https://neovim.io/doc/user/lsp.html [neovim/neovim-v0.5.0]: https://github.com/neovim/neovim/releases/tag/v0.5.0 -[neovim/nvim-lspconfig]: https://github.com/neovim/nvim-lspconfig [nvim-treesitter/nvim-treesitter-blob-90f15d9]: https://github.com/nvim-treesitter/nvim-treesitter/blob/90f15d9/plugin/nvim-treesitter.vim [nvim-treesitter/nvim-treesitter]: https://github.com/nvim-treesitter/nvim-treesitter [tree-sitter/tree-sitter]: https://github.com/tree-sitter/tree-sitter + + + +[gh-compare-tag-v0.17.0_v0.18.0]: https://github.com/arcticicestudio/nord-vim/compare/v0.17.0...v0.18.0 +[nvim-docs-lsp#codelens]: https://neovim.io/doc/user/lsp.html#lsp-highlight-codelens +[nvim-treesitter/nvim-treesitter-blob-fb5d6e04#l493-l495]: https://github.com/nvim-treesitter/nvim-treesitter/blob/fb5d6e04/doc/nvim-treesitter.txt#L493-L495 +[nvim-treesitter/nvim-treesitter#1016#comment-797049591]: https://github.com/nvim-treesitter/nvim-treesitter/issues/1016#issuecomment-797049591 +[nvim-treesitter/nvim-treesitter#78#comment-647140700]: https://github.com/nvim-treesitter/nvim-treesitter/issues/78#issuecomment-647140700 diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index e8c65d2f..9c478762 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.17.0" +let s:nord_vim_version="0.18.0" let g:airline#themes#nord#palette = {} let s:nord0_gui = "#2E3440" diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim index ed929616..5138a943 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.17.0" +let s:nord_vim_version="0.18.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 8a342d64..bfcfb064 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.17.0" +let s:nord_vim_version="0.18.0" set background=dark let s:nord0_gui = "#2E3440"