From 1904e5060edca066aa7ea0a9c470f5842a38d541 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 9 Aug 2023 22:34:54 +0200 Subject: vim-patch:8967f6c4b9e2 (#24626) feat(heex): borrow matchit support from html (vim/vim#12717) * feat(heex): borrow matchit support from html Makes % support behave the same in heex as in html. For example, quickly moving the cursor between opening and closing tags. * Remove unnecessary line; define b:undo_ftplugin first * Remove b:html_set_match_words https://github.com/vim/vim/commit/8967f6c4b9e2071dea9a63dbbbb93f6b9119ae99 Co-authored-by: Chris Vincent --- runtime/ftplugin/heex.vim | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'runtime/ftplugin/heex.vim') diff --git a/runtime/ftplugin/heex.vim b/runtime/ftplugin/heex.vim index 5274d59fbf..f79c69d2aa 100644 --- a/runtime/ftplugin/heex.vim +++ b/runtime/ftplugin/heex.vim @@ -14,3 +14,14 @@ setlocal comments=:<%!-- setlocal commentstring=<%!--\ %s\ --%> let b:undo_ftplugin = 'set sw< sts< et< com< cms<' + +" HTML: thanks to Johannes Zellner and Benji Fisher. +if exists("loaded_matchit") && !exists("b:match_words") + let b:match_ignorecase = 1 + let b:match_words = ',' .. + \ '<:>,' .. + \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .. + \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .. + \ '<\@<=\([^/!][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>' + let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words" +endif -- cgit From 88bf4204ef33a842f2cbdc66590dadda8bf4e1ef Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Tue, 29 Aug 2023 22:19:06 +0200 Subject: vim-patch:3ac2d3da5fdf runtime(heex): Add HEEX comments to match_words in ftplugin (vim/vim#12957) https://github.com/vim/vim/commit/3ac2d3da5fdf20dfddb450a49502ef47b1f581d4 Co-authored-by: Jason King --- runtime/ftplugin/heex.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/ftplugin/heex.vim') diff --git a/runtime/ftplugin/heex.vim b/runtime/ftplugin/heex.vim index f79c69d2aa..becc071c37 100644 --- a/runtime/ftplugin/heex.vim +++ b/runtime/ftplugin/heex.vim @@ -18,7 +18,7 @@ let b:undo_ftplugin = 'set sw< sts< et< com< cms<' " HTML: thanks to Johannes Zellner and Benji Fisher. if exists("loaded_matchit") && !exists("b:match_words") let b:match_ignorecase = 1 - let b:match_words = ',' .. + let b:match_words = '<%\{-}!--:--%\{-}>,' .. \ '<:>,' .. \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .. \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .. -- cgit