diff options
| author | Gregory Anders <greg@gpanders.com> | 2024-09-17 20:16:37 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-09-17 20:16:37 +0200 |
| commit | 89b9bb4ac8ceb701ebecb8c02aca3d047dff9991 (patch) | |
| tree | 120aa417a066d651a0c8276eaf61685f13ec9592 | |
| parent | 202c467bb37b894ada6377d3f2621c103f324757 (diff) | |
patch 9.1.0735: filetype: salt files are not recognizedv9.1.0735
Problem: filetype: salt files are not recognized
Solution: Detect '*.sls' files as filetype salt,
include a syntax script (Gregory Anders)
closes: #15689
Signed-off-by: Gregory Anders <greg@gpanders.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | .github/MAINTAINERS | 1 | ||||
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | runtime/syntax/salt.vim | 16 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 23 insertions, 0 deletions
diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS index b63735d019..bfce678842 100644 --- a/.github/MAINTAINERS +++ b/.github/MAINTAINERS @@ -551,6 +551,7 @@ runtime/syntax/rng.vim @jhradilek runtime/syntax/routeros.vim @zainin runtime/syntax/rst.vim @marshallward runtime/syntax/ruby.vim @dkearns +runtime/syntax/salt.vim @gpanders runtime/syntax/sass.vim @tpope runtime/syntax/scala.vim @derekwyatt runtime/syntax/scheme.vim @evhan diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 0f71bd74ae..8f611893c6 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2231,6 +2231,9 @@ au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks setf zsh au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump,.zsh_history setf zsh au BufNewFile,BufRead *.zsh,*.zsh-theme,*.zunit setf zsh +" Salt state files +au BufNewFile,BufRead *.sls setf salt + " Scheme ("racket" patterns are now separate, see above) au BufNewFile,BufRead *.scm,*.ss,*.sld setf scheme diff --git a/runtime/syntax/salt.vim b/runtime/syntax/salt.vim new file mode 100644 index 0000000000..fdbce2f677 --- /dev/null +++ b/runtime/syntax/salt.vim @@ -0,0 +1,16 @@ +" Vim syntax file +" Maintainer: Gregory Anders +" Last Changed: 2024-09-16 + +if exists('b:current_syntax') + finish +endif + +" Salt state files are just YAML with embedded Jinja +runtime! syntax/yaml.vim +unlet! b:current_syntax + +runtime! syntax/jinja.vim +unlet! b:current_syntax + +let b:current_syntax = 'salt' diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 938eec750e..d1588f3f68 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -635,6 +635,7 @@ def s:GetFilenameChecks(): dict<list<string>> rtf: ['file.rtf'], ruby: ['.irbrc', 'irbrc', '.irb_history', 'irb_history', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile', 'Vagrantfile'], rust: ['file.rs'], + salt: ['file.sls'], samba: ['smb.conf'], sas: ['file.sas'], sass: ['file.sass'], diff --git a/src/version.c b/src/version.c index 7558968a6d..dbcb6eb45b 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 735, +/**/ 734, /**/ 733, |