diff options
author | zeertzjq <zeertzjq@outlook.com> | 2024-03-16 04:08:56 +0800 |
---|---|---|
committer | zeertzjq <zeertzjq@outlook.com> | 2024-03-16 04:09:35 +0800 |
commit | b82d755109d838267acac225e793eee560a3df4e (patch) | |
tree | 933971617e350e10b9017eacea7a5965901545d7 /runtime/syntax/vim.vim | |
parent | b958b5ee4f1eb3ce7ebae8222132e201f855e1ce (diff) | |
download | rneovim-b82d755109d838267acac225e793eee560a3df4e.tar.gz rneovim-b82d755109d838267acac225e793eee560a3df4e.tar.bz2 rneovim-b82d755109d838267acac225e793eee560a3df4e.zip |
vim-patch:b4b3d7de2413
runtime(vim): Update base-syntax, revert last change to vimUserFunc (vim/vim#14202)
Fix highlighting of ":echo (expr)" (broken in commit 61887b3) by
re-enabling the original fix for vim/vim#9987.
Addresses https://github.com/vim/vim/pull/14199#issuecomment-1999732062.
This will be fixed more generally when there is context-sensitive
matching for commands and functions.
https://github.com/vim/vim/commit/b4b3d7de2413bf277445ea724c9cbd5e6bf9a334
Co-authored-by: dkearns <dougkearns@gmail.com>
Diffstat (limited to 'runtime/syntax/vim.vim')
-rw-r--r-- | runtime/syntax/vim.vim | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 8d0da8e21f..e8f071f8d5 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -531,8 +531,10 @@ syn case match " User Function Highlighting: {{{2 " (following Gautam Iyer's suggestion) " ========================== -syn match vimFunc "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*(" contains=vimFuncName,vimUserFunc,vimExecute -syn match vimUserFunc contained "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>" contains=vimNotation +syn match vimFunc "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*(" contains=vimFuncEcho,vimFuncName,vimUserFunc,vimExecute +syn match vimUserFunc contained "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>" contains=vimNotation +syn keyword vimFuncEcho contained ec ech echo + " User Command Highlighting: {{{2 syn match vimUsrCmd '^\s*\zs\u\%(\w*\)\@>\%([(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!' |