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:
@@ -793,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
@@ -819,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)
[](https://github.com/arcticicestudio/nord-hyper)
# 0.3.0
@@ -830,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)

@@ -934,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
@@ -957,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
@@ -998,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
@@ -1015,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
@@ -1031,16 +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/neovim-v0.5.0]: https://github.com/neovim/neovim/releases/tag/v0.5.0
+[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 525f0d6d..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.16.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 ce58e5fd..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.16.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 c7ad0705..0bb355fe 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.16.0"
+let s:nord_vim_version="0.18.0"
set background=dark
let s:nord0_gui = "#2E3440"
@@ -216,6 +216,24 @@ if has('nvim')
let g:terminal_color_15 = s:nord6_gui
endif
+"+- Neovim Diagnostics API -+
+call s:hi("DiagnosticWarn", s:nord13_gui, "", s:nord13_term, "", "", "")
+call s:hi("DiagnosticError" , s:nord11_gui, "", s:nord11_term, "", "", "")
+call s:hi("DiagnosticInfo" , s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("DiagnosticHint" , s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("DiagnosticUnderlineWarn" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "")
+call s:hi("DiagnosticUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "")
+call s:hi("DiagnosticUnderlineInfo" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "")
+call s:hi("DiagnosticUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "")
+
+"+- Neovim DocumentHighlight -+
+call s:hi("LspReferenceText", "", s:nord3_gui, "", s:nord3_term, "", "")
+call s:hi("LspReferenceRead", "", s:nord3_gui, "", s:nord3_term, "", "")
+call s:hi("LspReferenceWrite", "", s:nord3_gui, "", s:nord3_term, "", "")
+
+"+- Neovim LspSignatureHelp -+
+call s:hi("LspSignatureActiveParameter", s:nord8_gui, "", s:nord8_term, "", s:underline, "")
+
"+--- Gutter ---+
call s:hi("CursorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "")
if g:nord_cursor_line_number_background == 0
@@ -277,11 +295,15 @@ call s:hi("Comment", s:nord3_gui_bright, "", s:nord3_term, "", s:italicize_comme
call s:hi("Conceal", "", "NONE", "", "NONE", "", "")
call s:hi("Conditional", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("Constant", s:nord4_gui, "", "NONE", "", "", "")
+call s:hi("Decorator", s:nord12_gui, "", s:nord12_term, "", "", "")
call s:hi("Define", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("Delimiter", s:nord6_gui, "", s:nord6_term, "", "", "")
+call s:hi("Semicolon", s:nord9_gui, "", s:nord9_term, "", "", "")
+call s:hi("QuotationsMarks", s:nord6_gui, "", s:nord6_term, "", "", "")
call s:hi("Exception", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("Float", s:nord15_gui, "", s:nord15_term, "", "", "")
call s:hi("Function", s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("FormatSpecifier", s:nord13_gui, "", s:nord13_term, "", "", "")
call s:hi("Identifier", s:nord4_gui, "", "NONE", "", "NONE", "")
call s:hi("Include", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("Keyword", s:nord9_gui, "", s:nord9_term, "", "", "")
@@ -301,8 +323,10 @@ call s:hi("Tag", s:nord4_gui, "", "", "", "", "")
call s:hi("Todo", s:nord13_gui, "NONE", s:nord13_term, "NONE", "", "")
call s:hi("Type", s:nord9_gui, "", s:nord9_term, "", "NONE", "")
call s:hi("Typedef", s:nord9_gui, "", s:nord9_term, "", "", "")
+hi! link Annotation Decorator
hi! link Macro Define
hi! link PreCondit PreProc
+hi! link Variable Identifier
"+-----------+
"+ Languages +
@@ -348,6 +372,7 @@ hi! link awkVariables Identifier
call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term, "", "", "")
hi! link cOperator Operator
hi! link cPreCondit PreCondit
+hi! link cConstant Type
call s:hi("cmakeGeneratorExpression", s:nord10_gui, "", s:nord10_term, "", "", "")
@@ -398,8 +423,6 @@ hi! link diffRemoved DiffDelete
call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("goBuiltins", s:nord7_gui, "", s:nord7_term, "", "", "")
-hi! link goConstants Keyword
call s:hi("helpBar", s:nord3_gui, "", s:nord3_term, "", "", "")
call s:hi("helpHyperTextJump", s:nord8_gui, "", s:nord8_term, "", s:underline, "")
@@ -569,16 +592,44 @@ call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "")
call s:hi("CocInfoSign" , s:nord8_gui, "", s:nord8_term, "", "", "")
call s:hi("CocHintSign" , s:nord10_gui, "", s:nord10_term, "", "", "")
+" vim-go
+" > fatih/vim-go
+call s:hi("goBuiltins", s:nord7_gui, "", s:nord7_term, "", "", "")
+hi! link goConstants Keyword
+hi! link goFunctionCall Function
+hi! link goFormatSpecifier FormatSpecifier
+hi! link goEscapeOctal FormatSpecifier
+hi! link goEscapeC FormatSpecifier
+hi! link goEscapeX FormatSpecifier
+hi! link goEscapeU FormatSpecifier
+hi! link goEscapeBigU FormatSpecifier
+hi! link goEscapeError FormatSpecifier
+" TODO: these are not exposed by vim-go so you need to add
+" these groups to vim-go
+" hi! link goSemicolon Semicolon
+" hi! link goQuotationsMarks QuotationsMarks
+
+" Nvim LSP
+" > neovim/nvim-lsp
+call s:hi("LSPDiagnosticsWarning", s:nord13_gui, "", s:nord13_term, "", "", "")
+call s:hi("LSPDiagnosticsError" , s:nord11_gui, "", s:nord11_term, "", "", "")
+call s:hi("LSPDiagnosticsInformation" , s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("LSPDiagnosticsHint" , s:nord10_gui, "", s:nord10_term, "", "", "")
+
" Neovim LSP
" > neovim/nvim-lspconfig
-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, "", "", "")
-call s:hi("LspDiagnosticsDefaultHint" , s:nord10_gui, "", s:nord10_term, "", "", "")
-call s:hi("LspDiagnosticsUnderlineWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "")
-call s:hi("LspDiagnosticsUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "")
-call s:hi("LspDiagnosticsUnderlineInformation" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "")
-call s:hi("LspDiagnosticsUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "")
+call s:hi("LspCodeLens", s:nord3_gui_bright, "", s:nord3_term, "", "", "")
+if has("nvim-0.5")
+ 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, "", "", "")
+ call s:hi("LspDiagnosticsDefaultHint" , s:nord10_gui, "", s:nord10_term, "", "", "")
+ call s:hi("LspDiagnosticsUnderlineWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "")
+ call s:hi("LspDiagnosticsUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "")
+ call s:hi("LspDiagnosticsUnderlineInformation" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "")
+ call s:hi("LspDiagnosticsUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "")
+endif
+
" GitGutter
" > airblade/vim-gitgutter
@@ -687,6 +738,49 @@ 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")
+ hi! link TSAnnotation Annotation
+ hi! link TSConstBuiltin Constant
+ hi! link TSConstructor Function
+ hi! link TSEmphasis Italic
+ hi! link TSFuncBuiltin Function
+ hi! link TSFuncMacro Function
+ hi! link TSStringRegex SpecialChar
+ hi! link TSStrong Bold
+ hi! link TSStructure Structure
+ hi! link TSTagDelimiter TSTag
+ hi! link TSUnderline Underline
+ hi! link TSVariable Variable
+ hi! link TSVariableBuiltin Keyword
+endif
+
" TypeScript
" > HerringtonDarkholme/yats.vim
call s:hi("typescriptBOMWindowMethod", s:nord8_gui, "", s:nord8_term, "", s:italic, "")