Mercurial > vim

comparison runtime/syntax/vim.vim @ 34564:d50bdd93d1c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
runtime(vim): Update base-syntax, revert last change to vimUserFunc (#14202) Commit: https://github.com/vim/vim/commit/b4b3d7de2413bf277445ea724c9cbd5e6bf9a334 Author: dkearns <dougkearns@gmail.com> Date: Sat Mar 16 04:53:53 2024 +1100 runtime(vim): Update base-syntax, revert last change to vimUserFunc (https://github.com/vim/vim/issues/14202) Fix highlighting of ":echo (expr)" (broken in commit 61887b3) by re-enabling the original fix for https://github.com/vim/vim/issues/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. Signed-off-by: Doug Kearns <dougkearns@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Fri, 15 Mar 2024 19:00:03 +0100
parents 98d8ef6b57c9
children 69ab5ebb3d3f
comparison
equal deleted inserted replaced
34563:98d8ef6b57c9 34564:d50bdd93d1c8
583 syn case match 583 syn case match
584 584
585 " User Function Highlighting: {{{2 585 " User Function Highlighting: {{{2
586 " (following Gautam Iyer's suggestion) 586 " (following Gautam Iyer's suggestion)
587 " ========================== 587 " ==========================
588 syn match vimFunc "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*(" contains=vimFuncName,vimUserFunc,vimExecute 588 syn match vimFunc "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*(" contains=vimFuncEcho,vimFuncName,vimUserFunc,vimExecute
589 syn match vimUserFunc contained "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>" contains=vimNotation 589 syn match vimUserFunc contained "\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>" contains=vimNotation
590 syn keyword vimFuncEcho contained ec ech echo
591
590 592
591 " User Command Highlighting: {{{2 593 " User Command Highlighting: {{{2
592 syn match vimUsrCmd '^\s*\zs\u\%(\w*\)\@>\%([(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!' 594 syn match vimUsrCmd '^\s*\zs\u\%(\w*\)\@>\%([(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!'
593 595
594 " Errors And Warnings: {{{2 596 " Errors And Warnings: {{{2