diff options
Diffstat (limited to 'ftdetect')
| -rw-r--r-- | ftdetect/polyglot.vim | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index d33aa8e6..6fd81d68 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -15,7 +15,7 @@ autocmd BufNewFile,BufReadPost *.feature,*.story set filetype=cucumber au BufNewFile,BufRead Dockerfile set filetype=dockerfile au BufRead,BufNewFile *.ex,*.exs set filetype=elixir au FileType elixir setl sw=2 sts=2 et iskeyword+=!,? -autocmd BufNewFile,BufRead *.git/{,modules/**/}{COMMIT_EDIT,MERGE_}MSG set ft=gitcommit +autocmd BufNewFile,BufRead *.git/{,modules/**/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG set ft=gitcommit autocmd BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules set ft=gitconfig autocmd BufNewFile,BufRead */.config/git/config set ft=gitconfig autocmd BufNewFile,BufRead *.git/modules/**/config set ft=gitconfig @@ -44,7 +44,7 @@ endfunction au BufNewFile *.go setlocal filetype=go fileencoding=utf-8 fileformat=unix au BufRead *.go call s:gofiletype_pre() au BufReadPost *.go call s:gofiletype_post() -autocmd BufNewFile,BufRead *.haml,*.hamlbars setf haml +autocmd BufNewFile,BufRead *.haml,*.hamlbars,*.hamlc setf haml autocmd BufNewFile,BufRead *.sass setf sass autocmd BufNewFile,BufRead *.scss setf scss autocmd BufNewFile,BufReadPost *.jade set filetype=jade @@ -85,28 +85,33 @@ au BufRead,BufNewFile /etc/nginx/*,/usr/local/nginx/*,*/nginx/vhosts.d/*,nginx.c au BufRead,BufNewFile *.cl set filetype=opencl autocmd BufNewFile,BufRead *.proto setfiletype proto au BufRead,BufNewFile *.pp set filetype=puppet -au BufNewFile,BufRead *.rb,*.rbw,*.gemspec set filetype=ruby -au BufNewFile,BufRead *.builder,*.rxml,*.rjs,*.ruby set filetype=ruby -au BufNewFile,BufRead [rR]akefile,*.rake set filetype=ruby -au BufNewFile,BufRead [rR]antfile,*.rant set filetype=ruby -au BufNewFile,BufRead .irbrc,irbrc set filetype=ruby -au BufNewFile,BufRead .pryrc set filetype=ruby -au BufNewFile,BufRead *.ru set filetype=ruby -au BufNewFile,BufRead Capfile set filetype=ruby -au BufNewFile,BufRead Gemfile set filetype=ruby -au BufNewFile,BufRead Guardfile,.Guardfile set filetype=ruby -au BufNewFile,BufRead Cheffile set filetype=ruby -au BufNewFile,BufRead Berksfile set filetype=ruby -au BufNewFile,BufRead [vV]agrantfile set filetype=ruby -au BufNewFile,BufRead .autotest set filetype=ruby -au BufNewFile,BufRead *.erb,*.rhtml set filetype=eruby -au BufNewFile,BufRead [tT]horfile,*.thor set filetype=ruby -au BufNewFile,BufRead *.rabl set filetype=ruby -au BufNewFile,BufRead *.jbuilder set filetype=ruby -au BufNewFile,BufRead Puppetfile set filetype=ruby -au BufNewFile,BufRead [Bb]uildfile set filetype=ruby -au BufNewFile,BufRead Appraisals set filetype=ruby -au BufNewFile,BufRead Podfile,*.podspec set filetype=ruby +function! s:setf(filetype) abort + if &filetype !=# a:filetype + let &filetype = a:filetype + endif +endfunction +au BufNewFile,BufRead *.rb,*.rbw,*.gemspec call s:setf('ruby') +au BufNewFile,BufRead *.builder,*.rxml,*.rjs,*.ruby call s:setf('ruby') +au BufNewFile,BufRead [rR]akefile,*.rake call s:setf('ruby') +au BufNewFile,BufRead [rR]antfile,*.rant call s:setf('ruby') +au BufNewFile,BufRead .irbrc,irbrc call s:setf('ruby') +au BufNewFile,BufRead .pryrc call s:setf('ruby') +au BufNewFile,BufRead *.ru call s:setf('ruby') +au BufNewFile,BufRead Capfile call s:setf('ruby') +au BufNewFile,BufRead Gemfile call s:setf('ruby') +au BufNewFile,BufRead Guardfile,.Guardfile call s:setf('ruby') +au BufNewFile,BufRead Cheffile call s:setf('ruby') +au BufNewFile,BufRead Berksfile call s:setf('ruby') +au BufNewFile,BufRead [vV]agrantfile call s:setf('ruby') +au BufNewFile,BufRead .autotest call s:setf('ruby') +au BufNewFile,BufRead *.erb,*.rhtml call s:setf('eruby') +au BufNewFile,BufRead [tT]horfile,*.thor call s:setf('ruby') +au BufNewFile,BufRead *.rabl call s:setf('ruby') +au BufNewFile,BufRead *.jbuilder call s:setf('ruby') +au BufNewFile,BufRead Puppetfile call s:setf('ruby') +au BufNewFile,BufRead [Bb]uildfile call s:setf('ruby') +au BufNewFile,BufRead Appraisals call s:setf('ruby') +au BufNewFile,BufRead Podfile,*.podspec call s:setf('ruby') au BufRead,BufNewFile *.rs set filetype=rust au BufRead,BufNewFile *.sbt set filetype=sbt fun! s:DetectScala() |