Mercurial > vim
changeset 36159:40505c50ef2d v9.1.0735
patch 9.1.0735: filetype: salt files are not recognized
Commit: https://github.com/vim/vim/commit/89b9bb4ac8ceb701ebecb8c02aca3d047dff9991
Author: Gregory Anders <greg@gpanders.com>
Date: Tue Sep 17 20:16:37 2024 +0200
patch 9.1.0735: filetype: salt files are not recognized
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 17 Sep 2024 20:30:05 +0200 |
| parents | 862474fe6ba2 |
| children | 2a130d44c93d |
| files | .github/MAINTAINERS runtime/filetype.vim runtime/syntax/salt.vim src/testdir/test_filetype.vim src/version.c |
| diffstat | 5 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2231,6 +2231,9 @@ au BufNewFile,BufRead .zprofile,*/etc/zp 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
new file mode 100644 --- /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'
--- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -635,6 +635,7 @@ def s:GetFilenameChecks(): dict<list<str 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'],