From b365036ab3f5e91439a5397ed0f32b651d60f08c Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 3 Jan 2025 10:42:52 +0100 Subject: vim-patch:9.1.0986: filetype: 'jj' filetype is a bit imprecise Problem: filetype: 'jj' filetype is a bit imprecise Solution: rename 'jj' filetype to 'jjdescription' (Gregory Anders) closes: vim/vim#16364 https://github.com/vim/vim/commit/58c44e8833365e1a777330491c2799ae324ed893 Co-authored-by: Gregory Anders --- runtime/syntax/jj.vim | 24 ------------------------ runtime/syntax/jjdescription.vim | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 runtime/syntax/jj.vim create mode 100644 runtime/syntax/jjdescription.vim (limited to 'runtime/syntax') diff --git a/runtime/syntax/jj.vim b/runtime/syntax/jj.vim deleted file mode 100644 index 0b2d29e878..0000000000 --- a/runtime/syntax/jj.vim +++ /dev/null @@ -1,24 +0,0 @@ -" Vim syntax file -" Language: jj description -" Maintainer: Gregory Anders -" Last Change: 2024 May 8 - -if exists('b:current_syntax') - finish -endif - -syn match jjAdded "A .*" contained -syn match jjRemoved "D .*" contained -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' diff --git a/runtime/syntax/jjdescription.vim b/runtime/syntax/jjdescription.vim new file mode 100644 index 0000000000..04848bcb3b --- /dev/null +++ b/runtime/syntax/jjdescription.vim @@ -0,0 +1,24 @@ +" Vim syntax file +" Language: jj description +" Maintainer: Gregory Anders +" Last Change: 2024 May 8 + +if exists('b:current_syntax') + finish +endif + +syn match jjAdded "A .*" contained +syn match jjRemoved "D .*" contained +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 = 'jjdescription' -- cgit