From f1f42ec063795f9461d9744d62eaaa6cc978ea56 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 3 Jan 2025 10:42:40 +0100 Subject: [PATCH] vim-patch:bde76da: runtime(jj): Support diffs in jj syntax related: vim/vim#16364 https://github.com/vim/vim/commit/bde76da4d02d93d8ea9e523d1057d59a19de276a Co-authored-by: Gregory Anders --- runtime/syntax/jj.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runtime/syntax/jj.vim b/runtime/syntax/jj.vim index a2911a0268..0b2d29e878 100644 --- a/runtime/syntax/jj.vim +++ b/runtime/syntax/jj.vim @@ -6,7 +6,6 @@ if exists('b:current_syntax') finish endif -let b:current_syntax = 'jj' syn match jjAdded "A .*" contained syn match jjRemoved "D .*" contained @@ -14,7 +13,12 @@ syn match jjChanged "M .*" contained syn region jjComment start="^JJ: " end="$" contains=jjAdded,jjRemoved,jjChanged +syn include @jjCommitDiff syntax/diff.vim +syn region jjCommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|@@\@!\|[^[:alnum:]\ +-]\S\@!\)\@=/ fold contains=@jjCommitDiff + hi def link jjComment Comment hi def link jjAdded Added hi def link jjRemoved Removed hi def link jjChanged Changed + +let b:current_syntax = 'jj'