aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0735: filetype: salt files are not recognized

Browse Source 
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>
This commit is contained in:
Gregory Anders 2024-09-17 20:16:37 +02:00 committed by Christian Brabandt
parent 202c467bb3
commit 89b9bb4ac8
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/MAINTAINERS vendored
View File

@ -551,6 +551,7 @@ runtime/syntax/rng.vim @jhradilek
runtime/syntax/routeros.vim @zainin runtime/syntax/routeros.vim @zainin
runtime/syntax/rst.vim @marshallward runtime/syntax/rst.vim @marshallward
runtime/syntax/ruby.vim @dkearns runtime/syntax/ruby.vim @dkearns
runtime/syntax/salt.vim @gpanders
runtime/syntax/sass.vim @tpope runtime/syntax/sass.vim @tpope
runtime/syntax/scala.vim @derekwyatt runtime/syntax/scala.vim @derekwyatt
runtime/syntax/scheme.vim @evhan runtime/syntax/scheme.vim @evhan

3
runtime/filetype.vim
View File

@ -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 .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump,.zsh_history setf zsh
au BufNewFile,BufRead *.zsh,*.zsh-theme,*.zunit 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) " Scheme ("racket" patterns are now separate, see above)
au BufNewFile,BufRead *.scm,*.ss,*.sld setf scheme au BufNewFile,BufRead *.scm,*.ss,*.sld setf scheme

16
runtime/syntax/salt.vim Normal file
View File

@ -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'

1
src/testdir/test_filetype.vim
View File

@ -635,6 +635,7 @@ def s:GetFilenameChecks(): dict<list<string>>
rtf: ['file.rtf'], 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'], 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'], rust: ['file.rs'],
salt: ['file.sls'],
samba: ['smb.conf'], samba: ['smb.conf'],
sas: ['file.sas'], sas: ['file.sas'],
sass: ['file.sass'], sass: ['file.sass'],

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
735,
/**/ /**/
734, 734,
/**/ /**/