Commit: runtime(vim): Update ftplugin, add heredocs to b:match_words

[Christian Brabandt]

runtime(vim): Update ftplugin, add heredocs to b:match_words

Commit: https://github.com/vim/vim/commit/7895c9e6b8c6293b293656b48f2cd5f5a46a58b6
Author: Doug Kearns <dougk...@gmail.com>
Date: Mon Jun 1 19:43:01 2026 +0000

runtime(vim): Update ftplugin, add heredocs to b:match_words

This depends on chrisbra/matchithttps://github.com/vim/vim/issues/61 for full support of non-alphnum
heredoc markers.

closes: #20399

Signed-off-by: Doug Kearns <dougk...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim
index 72a87d180..21ca040fa 100644
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -6,13 +6,7 @@
" @Konfekt
" @tpope (s:Help())
" @lacygoill
-" Last Change: 2025 Aug 07
-" 2025 Aug 06 by Vim Project (add gf maps #17881)
-" 2025 Aug 08 by Vim Project (add Vim script complete function #17871)
-" 2025 Aug 12 by Vim Project (improve vimgoto script #17970))
-" 2025 Aug 16 by Vim Project set com depending on Vim9 or legacy script
-" 2026 Jan 26 by Vim Project set path to common Vim directories #19219
-" 2026 Feb 03 by Vim Project update s:Help to improve detecting functions #19320
+" Last Change: 2026 May 31

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -204,15 +198,17 @@ if exists("loaded_matchit")
\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,' ..
\ '\<class\>:\<endclass\>,' ..
\ '\<interface\>:\<endinterface\>,' ..
- \ '\<enum\>:\<endenum\>'
+ \ '\<enum\>:\<endenum\>,' ..
+ "\ :let-heredoc
+ \ '\%(=<<\s\+\%(\%(trim\s\+eval\|eval\s\+trim\|trim\|eval\)\s\+\)\=\)\@16<=\(\l\@!\S\+\):\%(^\s*\)\@<= $'

" Ignore syntax region commands and settings, any 'en*' would clobber
" if-endif.
" - set spl=de,en
" - au! FileType javascript syntax region foldBraces start=/{/ end=/}/ 窶ｦ
- " Also ignore here-doc and dictionary keys (vimVar).
+ " Also ignore heredoc content and dictionary keys (vimVar).
let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
- \ =~? "comment\|string\|vimSynReg\|vimSet\|vimLetHereDoc\|vimVar"'
+ \ =~? "comment\|string\|vimSynReg\|vimSet\|vimLetHeredoc$\|vimVar"'
endif

let &cpo = s:cpo_save