diff options
Diffstat (limited to 'ftdetect')
| -rw-r--r-- | ftdetect/arduino.vim | 1 | ||||
| -rw-r--r-- | ftdetect/clojure.vim | 1 | ||||
| -rw-r--r-- | ftdetect/coffee.vim | 17 | ||||
| -rw-r--r-- | ftdetect/csv.vim | 3 | ||||
| -rw-r--r-- | ftdetect/cucumber.vim | 2 | ||||
| -rw-r--r-- | ftdetect/elixir.vim | 2 | ||||
| -rw-r--r-- | ftdetect/git.vim | 20 | ||||
| -rw-r--r-- | ftdetect/gofiletype.vim | 23 | ||||
| -rw-r--r-- | ftdetect/haml.vim | 3 | ||||
| -rw-r--r-- | ftdetect/handlebars.vim | 3 | ||||
| -rw-r--r-- | ftdetect/jade.vim | 2 | ||||
| -rw-r--r-- | ftdetect/javascript.vim | 11 | ||||
| -rw-r--r-- | ftdetect/json.vim | 8 | ||||
| -rw-r--r-- | ftdetect/jst.vim | 3 | ||||
| -rw-r--r-- | ftdetect/less.vim | 1 | ||||
| -rw-r--r-- | ftdetect/markdown.vim | 6 | ||||
| -rw-r--r-- | ftdetect/nginx.vim | 1 | ||||
| -rw-r--r-- | ftdetect/polyglot.vim | 121 | ||||
| -rw-r--r-- | ftdetect/proto.vim | 1 | ||||
| -rw-r--r-- | ftdetect/puppet.vim | 2 | ||||
| -rw-r--r-- | ftdetect/ruby.vim | 62 | ||||
| -rw-r--r-- | ftdetect/sbt.vim | 6 | ||||
| -rw-r--r-- | ftdetect/scala.vim | 8 | ||||
| -rw-r--r-- | ftdetect/slim.vim | 1 | ||||
| -rw-r--r-- | ftdetect/stylus.vim | 3 | ||||
| -rw-r--r-- | ftdetect/textile.vim | 8 | ||||
| -rw-r--r-- | ftdetect/tmux.vim | 1 | ||||
| -rw-r--r-- | ftdetect/twig.vim | 5 |
28 files changed, 121 insertions, 204 deletions
diff --git a/ftdetect/arduino.vim b/ftdetect/arduino.vim deleted file mode 100644 index 59bf48ce..00000000 --- a/ftdetect/arduino.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *.ino,*.pde set filetype=arduino diff --git a/ftdetect/clojure.vim b/ftdetect/clojure.vim deleted file mode 100644 index 346308d9..00000000 --- a/ftdetect/clojure.vim +++ /dev/null @@ -1 +0,0 @@ -au BufNewFile,BufRead *.clj,*.cljs,*.edn setf clojure diff --git a/ftdetect/coffee.vim b/ftdetect/coffee.vim deleted file mode 100644 index 50569298..00000000 --- a/ftdetect/coffee.vim +++ /dev/null @@ -1,17 +0,0 @@ -" Language: CoffeeScript -" Maintainer: Mick Koch <kchmck@gmail.com> -" URL: http://github.com/kchmck/vim-coffee-script -" License: WTFPL - -autocmd BufNewFile,BufRead *.coffee set filetype=coffee -autocmd BufNewFile,BufRead *Cakefile set filetype=coffee -autocmd BufNewFile,BufRead *.coffeekup,*.ck set filetype=coffee -autocmd BufNewFile,BufRead *._coffee set filetype=coffee - -function! s:DetectCoffee() - if getline(1) =~ '^#!.*\<coffee\>' - set filetype=coffee - endif -endfunction - -autocmd BufNewFile,BufRead * call s:DetectCoffee() diff --git a/ftdetect/csv.vim b/ftdetect/csv.vim deleted file mode 100644 index 4a8b0ccc..00000000 --- a/ftdetect/csv.vim +++ /dev/null @@ -1,3 +0,0 @@ -" Install Filetype detection for CSV files -au BufRead,BufNewFile *.csv,*.dat,*.tsv,*.tab set filetype=csv - diff --git a/ftdetect/cucumber.vim b/ftdetect/cucumber.vim deleted file mode 100644 index f00f9e2f..00000000 --- a/ftdetect/cucumber.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Cucumber -autocmd BufNewFile,BufReadPost *.feature,*.story set filetype=cucumber diff --git a/ftdetect/elixir.vim b/ftdetect/elixir.vim deleted file mode 100644 index df413e18..00000000 --- a/ftdetect/elixir.vim +++ /dev/null @@ -1,2 +0,0 @@ -au BufRead,BufNewFile *.ex,*.exs set filetype=elixir -au FileType elixir setl sw=2 sts=2 et iskeyword+=!,? diff --git a/ftdetect/git.vim b/ftdetect/git.vim deleted file mode 100644 index b1b14e0d..00000000 --- a/ftdetect/git.vim +++ /dev/null @@ -1,20 +0,0 @@ -" Git -autocmd BufNewFile,BufRead *.git/{,modules/**/}{COMMIT_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 -autocmd BufNewFile,BufRead git-rebase-todo set ft=gitrebase -autocmd BufNewFile,BufRead .msg.[0-9]* - \ if getline(1) =~ '^From.*# This line is ignored.$' | - \ set ft=gitsendemail | - \ endif -autocmd BufNewFile,BufRead *.git/** - \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' | - \ set ft=git | - \ endif - -" This logic really belongs in scripts.vim -autocmd BufNewFile,BufRead,StdinReadPost * - \ if getline(1) =~ '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$' | - \ set ft=git | - \ endif diff --git a/ftdetect/gofiletype.vim b/ftdetect/gofiletype.vim deleted file mode 100644 index b658f6b0..00000000 --- a/ftdetect/gofiletype.vim +++ /dev/null @@ -1,23 +0,0 @@ -" We take care to preserve the user's fileencodings and fileformats, -" because those settings are global (not buffer local), yet we want -" to override them for loading Go files, which are defined to be UTF-8. -let s:current_fileformats = '' -let s:current_fileencodings = '' - -" define fileencodings to open as utf-8 encoding even if it's ascii. -function! s:gofiletype_pre() - let s:current_fileformats = &g:fileformats - let s:current_fileencodings = &g:fileencodings - set fileencodings=utf-8 fileformats=unix - setlocal filetype=go -endfunction - -" restore fileencodings as others -function! s:gofiletype_post() - let &g:fileformats = s:current_fileformats - let &g:fileencodings = s:current_fileencodings -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() diff --git a/ftdetect/haml.vim b/ftdetect/haml.vim deleted file mode 100644 index bf1de754..00000000 --- a/ftdetect/haml.vim +++ /dev/null @@ -1,3 +0,0 @@ -autocmd BufNewFile,BufRead *.haml,*.hamlbars setf haml -autocmd BufNewFile,BufRead *.sass setf sass -autocmd BufNewFile,BufRead *.scss setf scss diff --git a/ftdetect/handlebars.vim b/ftdetect/handlebars.vim deleted file mode 100644 index 45198d66..00000000 --- a/ftdetect/handlebars.vim +++ /dev/null @@ -1,3 +0,0 @@ -if has("autocmd") - au BufNewFile,BufRead *.{handlebars,hb,hbs,hbt}{,.erb} set ft=html syntax=handlebars | runtime! ftplugin/handlebars.vim ftplugin/handlebars*.vim ftplugin/handlebars/*.vim -endif diff --git a/ftdetect/jade.vim b/ftdetect/jade.vim deleted file mode 100644 index c21dcff7..00000000 --- a/ftdetect/jade.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Jade -autocmd BufNewFile,BufReadPost *.jade set filetype=jade diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim deleted file mode 100644 index 805e1978..00000000 --- a/ftdetect/javascript.vim +++ /dev/null @@ -1,11 +0,0 @@ -au BufNewFile,BufRead *.js setf javascript -au BufNewFile,BufRead *.jsm setf javascript -au BufNewFile,BufRead *.json setf javascript -au BufNewFile,BufRead Jakefile setf javascript - -fun! s:SelectJavascript() - if getline(1) =~# '^#!.*/bin/env\s\+node\>' - set ft=javascript - endif -endfun -au BufNewFile,BufRead * call s:SelectJavascript() diff --git a/ftdetect/json.vim b/ftdetect/json.vim deleted file mode 100644 index 5f6757de..00000000 --- a/ftdetect/json.vim +++ /dev/null @@ -1,8 +0,0 @@ -autocmd BufNewFile,BufRead *.json set filetype=json - -augroup json_autocmd - autocmd! - autocmd FileType json setlocal autoindent - autocmd FileType json setlocal formatoptions=tcq2l - autocmd FileType json setlocal foldmethod=syntax -augroup END diff --git a/ftdetect/jst.vim b/ftdetect/jst.vim deleted file mode 100644 index 2ec59364..00000000 --- a/ftdetect/jst.vim +++ /dev/null @@ -1,3 +0,0 @@ -au BufNewFile,BufRead *.ejs set filetype=jst -au BufNewFile,BufRead *.jst set filetype=jst -au BufNewFile,BufRead *.hamljs set filetype=jst diff --git a/ftdetect/less.vim b/ftdetect/less.vim deleted file mode 100644 index f1cb1d7e..00000000 --- a/ftdetect/less.vim +++ /dev/null @@ -1 +0,0 @@ -autocmd BufNewFile,BufRead *.less setf less diff --git a/ftdetect/markdown.vim b/ftdetect/markdown.vim deleted file mode 100644 index 1c5a36a2..00000000 --- a/ftdetect/markdown.vim +++ /dev/null @@ -1,6 +0,0 @@ -autocmd BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mkd,*.mkdn - \ if &ft =~# '^\%(conf\|modula2\)$' | - \ set ft=markdown | - \ else | - \ setf markdown | - \ endif diff --git a/ftdetect/nginx.vim b/ftdetect/nginx.vim deleted file mode 100644 index 45bb1c15..00000000 --- a/ftdetect/nginx.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile /etc/nginx/*,/usr/local/nginx/*,*/nginx/vhosts.d/*,nginx.conf if &ft == '' | setfiletype nginx | endif diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim new file mode 100644 index 00000000..7ca5abb1 --- /dev/null +++ b/ftdetect/polyglot.vim @@ -0,0 +1,121 @@ +au BufRead,BufNewFile *.ino,*.pde set filetype=arduino +au BufNewFile,BufRead *.clj,*.cljs,*.edn setf clojure +autocmd BufNewFile,BufRead *.coffee set filetype=coffee +autocmd BufNewFile,BufRead *Cakefile set filetype=coffee +autocmd BufNewFile,BufRead *.coffeekup,*.ck set filetype=coffee +autocmd BufNewFile,BufRead *._coffee set filetype=coffee +function! s:DetectCoffee() + if getline(1) =~ '^#!.*\<coffee\>' + set filetype=coffee + endif +endfunction +autocmd BufNewFile,BufRead * call s:DetectCoffee() +au BufRead,BufNewFile *.csv,*.dat,*.tsv,*.tab set filetype=csv +autocmd BufNewFile,BufReadPost *.feature,*.story set filetype=cucumber +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/config,.gitconfig,.gitmodules set ft=gitconfig +autocmd BufNewFile,BufRead */.config/git/config set ft=gitconfig +autocmd BufNewFile,BufRead *.git/modules/**/config set ft=gitconfig +autocmd BufNewFile,BufRead git-rebase-todo set ft=gitrebase +autocmd BufNewFile,BufRead .msg.[0-9]* + \ if getline(1) =~ '^From.*# This line is ignored.$' | + \ set ft=gitsendemail | + \ endif +autocmd BufNewFile,BufRead *.git/** + \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' | + \ set ft=git | + \ endif +autocmd BufNewFile,BufRead,StdinReadPost * + \ if getline(1) =~ '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$' | + \ set ft=git | + \ endif +let s:current_fileformats = '' +let s:current_fileencodings = '' +function! s:gofiletype_pre() + let s:current_fileformats = &g:fileformats + let s:current_fileencodings = &g:fileencodings + set fileencodings=utf-8 fileformats=unix + setlocal filetype=go +endfunction +function! s:gofiletype_post() + let &g:fileformats = s:current_fileformats + let &g:fileencodings = s:current_fileencodings +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 *.sass setf sass +autocmd BufNewFile,BufRead *.scss setf scss +if has("autocmd") + au BufNewFile,BufRead *.{handlebars,hb,hbs,hbt}{,.erb} set ft=html syntax=handlebars | runtime! ftplugin/handlebars.vim ftplugin/handlebars*.vim ftplugin/handlebars/*.vim +endif +autocmd BufNewFile,BufReadPost *.jade set filetype=jade +au BufNewFile,BufRead *.js setf javascript +au BufNewFile,BufRead *.jsm setf javascript +au BufNewFile,BufRead *.json setf javascript +au BufNewFile,BufRead Jakefile setf javascript +fun! s:SelectJavascript() + if getline(1) =~# '^#!.*/bin/env\s\+node\>' + set ft=javascript + endif +endfun +au BufNewFile,BufRead * call s:SelectJavascript() +autocmd BufNewFile,BufRead *.json set filetype=json +augroup json_autocmd + autocmd! + autocmd FileType json setlocal autoindent + autocmd FileType json setlocal formatoptions=tcq2l + autocmd FileType json setlocal foldmethod=syntax +augroup END +au BufNewFile,BufRead *.ejs set filetype=jst +au BufNewFile,BufRead *.jst set filetype=jst +au BufNewFile,BufRead *.hamljs set filetype=jst +autocmd BufNewFile,BufRead *.less setf less +autocmd BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mkd,*.mkdn + \ if &ft =~# '^\%(conf\|modula2\)$' | + \ set ft=markdown | + \ else | + \ setf markdown | + \ endif +au BufRead,BufNewFile /etc/nginx/*,/usr/local/nginx/*,*/nginx/vhosts.d/*,nginx.conf if &ft == '' | setfiletype nginx | endif +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 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 BufRead,BufNewFile *.sbt set filetype=sbt +fun! s:DetectScala() + if getline(1) == '#!/usr/bin/env scala' + set filetype=scala + endif +endfun +au BufRead,BufNewFile *.scala,*.sbt set filetype=scala +au BufRead,BufNewFile * call s:DetectScala() +autocmd BufNewFile,BufRead *.slim setf slim +autocmd BufNewFile,BufReadPost *.styl set filetype=stylus +autocmd BufNewFile,BufReadPost *.stylus set filetype=stylus +au BufRead,BufNewFile *.textile set filetype=textile +autocmd BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux +autocmd BufNewFile,BufRead *.twig set filetype=twig +autocmd BufNewFile,BufRead *.html.twig set filetype=html.twig diff --git a/ftdetect/proto.vim b/ftdetect/proto.vim deleted file mode 100644 index 39746600..00000000 --- a/ftdetect/proto.vim +++ /dev/null @@ -1 +0,0 @@ -autocmd BufNewFile,BufRead *.proto setfiletype proto diff --git a/ftdetect/puppet.vim b/ftdetect/puppet.vim deleted file mode 100644 index c9d15ea5..00000000 --- a/ftdetect/puppet.vim +++ /dev/null @@ -1,2 +0,0 @@ -" detect puppet filetype -au BufRead,BufNewFile *.pp set filetype=puppet diff --git a/ftdetect/ruby.vim b/ftdetect/ruby.vim deleted file mode 100644 index a4e9a6d9..00000000 --- a/ftdetect/ruby.vim +++ /dev/null @@ -1,62 +0,0 @@ -" Ruby -au BufNewFile,BufRead *.rb,*.rbw,*.gemspec set filetype=ruby - -" Ruby on Rails -au BufNewFile,BufRead *.builder,*.rxml,*.rjs set filetype=ruby - -" Rakefile -au BufNewFile,BufRead [rR]akefile,*.rake set filetype=ruby - -" Rantfile -au BufNewFile,BufRead [rR]antfile,*.rant set filetype=ruby - -" IRB config -au BufNewFile,BufRead .irbrc,irbrc set filetype=ruby - -" Pry config -au BufNewFile,BufRead .pryrc set filetype=ruby - -" Rackup -au BufNewFile,BufRead *.ru set filetype=ruby - -" Capistrano -au BufNewFile,BufRead Capfile set filetype=ruby - -" Bundler -au BufNewFile,BufRead Gemfile set filetype=ruby - -" Guard -au BufNewFile,BufRead Guardfile,.Guardfile set filetype=ruby - -" Chef -au BufNewFile,BufRead Cheffile set filetype=ruby -au BufNewFile,BufRead Berksfile set filetype=ruby - -" Vagrant -au BufNewFile,BufRead [vV]agrantfile set filetype=ruby - -" Autotest -au BufNewFile,BufRead .autotest set filetype=ruby - -" eRuby -au BufNewFile,BufRead *.erb,*.rhtml set filetype=eruby - -" Thor -au BufNewFile,BufRead [tT]horfile,*.thor set filetype=ruby - -" Rabl -au BufNewFile,BufRead *.rabl set filetype=ruby - -" Jbuilder -au BufNewFile,BufRead *.jbuilder set filetype=ruby - -" Puppet librarian -au BufNewFile,BufRead Puppetfile set filetype=ruby -" -" Buildr Buildfile -au BufNewFile,BufRead [Bb]uildfile set filetype=ruby - -" Appraisal -au BufNewFile,BufRead Appraisals set filetype=ruby - -" vim: nowrap sw=2 sts=2 ts=8 noet: diff --git a/ftdetect/sbt.vim b/ftdetect/sbt.vim deleted file mode 100644 index a508530c..00000000 --- a/ftdetect/sbt.vim +++ /dev/null @@ -1,6 +0,0 @@ -" Vim detect file -" Language: sbt -" Maintainer: Derek Wyatt <derek@{myfirstname}{mylastname}.org> -" Last Change: 2012 Jan 19 - -au BufRead,BufNewFile *.sbt set filetype=sbt diff --git a/ftdetect/scala.vim b/ftdetect/scala.vim deleted file mode 100644 index 997a701e..00000000 --- a/ftdetect/scala.vim +++ /dev/null @@ -1,8 +0,0 @@ -fun! s:DetectScala() - if getline(1) == '#!/usr/bin/env scala' - set filetype=scala - endif -endfun - -au BufRead,BufNewFile *.scala,*.sbt set filetype=scala -au BufRead,BufNewFile * call s:DetectScala() diff --git a/ftdetect/slim.vim b/ftdetect/slim.vim deleted file mode 100644 index b3415ced..00000000 --- a/ftdetect/slim.vim +++ /dev/null @@ -1 +0,0 @@ -autocmd BufNewFile,BufRead *.slim setf slim diff --git a/ftdetect/stylus.vim b/ftdetect/stylus.vim deleted file mode 100644 index 49e04ecc..00000000 --- a/ftdetect/stylus.vim +++ /dev/null @@ -1,3 +0,0 @@ -" Stylus -autocmd BufNewFile,BufReadPost *.styl set filetype=stylus -autocmd BufNewFile,BufReadPost *.stylus set filetype=stylus diff --git a/ftdetect/textile.vim b/ftdetect/textile.vim deleted file mode 100644 index d02f9425..00000000 --- a/ftdetect/textile.vim +++ /dev/null @@ -1,8 +0,0 @@ -" textile.vim -" -" Tim Harper (tim.theenchanter.com) - -" Force filetype to be textile even if already set -" This will override the system ftplugin/changelog -" set on some distros -au BufRead,BufNewFile *.textile set filetype=textile diff --git a/ftdetect/tmux.vim b/ftdetect/tmux.vim deleted file mode 100644 index 62cad9da..00000000 --- a/ftdetect/tmux.vim +++ /dev/null @@ -1 +0,0 @@ -autocmd BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux diff --git a/ftdetect/twig.vim b/ftdetect/twig.vim deleted file mode 100644 index 06b70e2c..00000000 --- a/ftdetect/twig.vim +++ /dev/null @@ -1,5 +0,0 @@ -" Twig -autocmd BufNewFile,BufRead *.twig set filetype=twig - -" HTML Twig -autocmd BufNewFile,BufRead *.html.twig set filetype=html.twig |