diff options
| author | Dan Reif <dan.reif@collectivehealth.com> | 2018-04-30 12:00:42 -0700 |
|---|---|---|
| committer | Dan Reif <dan.reif@collectivehealth.com> | 2018-04-30 12:00:42 -0700 |
| commit | 3e0c887365bc1ebd55b91dd69ab73f2dee1f00ed (patch) | |
| tree | ce76003a08274cb805df101a44be8d37af1a4c4b /ftplugin | |
| parent | b4d7993e7ea554153025c5072749f415e69e0323 (diff) | |
| download | vim-polyglot-3e0c887365bc1ebd55b91dd69ab73f2dee1f00ed.tar.gz vim-polyglot-3e0c887365bc1ebd55b91dd69ab73f2dee1f00ed.zip | |
Update (periodic rebuild)
I originally meant to run this before adding haproxy, but accidentally
pushed that into my branch. If you'd like to see that content, it's at
https://github.com/CH-DanReif/vim-polyglot/commit/414ad25c3ad1ab9c4b6a99fe4f08d6c30b7e0f57.
Diffstat (limited to '')
| -rw-r--r-- | ftplugin/ansible.vim | 1 | ||||
| -rw-r--r-- | ftplugin/cabal.vim | 9 | ||||
| -rw-r--r-- | ftplugin/elixir.vim | 6 | ||||
| -rw-r--r-- | ftplugin/haskell.vim | 20 | ||||
| -rw-r--r-- | ftplugin/nix.vim | 9 | ||||
| -rw-r--r-- | ftplugin/purescript.vim | 2 |
6 files changed, 10 insertions, 37 deletions
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim index e068dd3a..5f2f3f74 100644 --- a/ftplugin/ansible.vim +++ b/ftplugin/ansible.vim @@ -4,6 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1 if exists('+regexpengine') && ('®expengine' == 0) setlocal regexpengine=1 endif +set isfname+=@-@ set path+=./../templates,./../files,templates,files endif diff --git a/ftplugin/cabal.vim b/ftplugin/cabal.vim deleted file mode 100644 index 5c041bd3..00000000 --- a/ftplugin/cabal.vim +++ /dev/null @@ -1,9 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1 - -if exists("g:loaded_haskellvim_cabal") - finish -endif - -let g:loaded_haskellvim_cabal = 1 - -endif diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim index c02bff35..debaa10a 100644 --- a/ftplugin/elixir.vim +++ b/ftplugin/elixir.vim @@ -32,11 +32,7 @@ let &l:path = setlocal includeexpr=elixir#util#get_filename(v:fname) setlocal suffixesadd=.ex,.exs,.eex,.erl,.yrl,.hrl -if empty(&formatprg) - setlocal formatprg=mix\ format\ - -endif - -let &l:define = 'def\(macro|guard|delegate\)p' +let &l:define = 'def\(macro\|guard\|delegate\)\=p\=' silent! setlocal formatoptions-=t formatoptions+=croqlj diff --git a/ftplugin/haskell.vim b/ftplugin/haskell.vim deleted file mode 100644 index b1028620..00000000 --- a/ftplugin/haskell.vim +++ /dev/null @@ -1,20 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1 - -if exists("g:loaded_haskellvim_haskell") - finish -endif - -let g:loaded_haskellvim_haskell = 1 - -function! haskell#sortImports(line1, line2) - exe a:line1 . "," . a:line2 . "sort /import\\s\\+\\(qualified\\s\\+\\)\\?/" -endfunction - -function! haskell#formatImport(line1, line2) - exec a:line1 . ",". a:line2 . "s/import\\s\\+\\([A-Z].*\\)/import \\1" -endfunction - -command! -buffer -range HaskellSortImports call haskell#sortImports(<line1>, <line2>) -command! -buffer -range HaskellFormatImport call haskell#formatImport(<line1>, <line2>) - -endif diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim index 8f3cf812..52c0ee69 100644 --- a/ftplugin/nix.vim +++ b/ftplugin/nix.vim @@ -11,7 +11,12 @@ endif let b:did_ftplugin = 1 -setlocal comments=:# -setlocal commentstring=#\ %s +setlocal + \ comments=:# + \ commentstring=#\ %s + \ shiftwidth=2 + \ softtabstop=2 + \ expandtab + \ iskeyword+=- endif diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim index 695a4108..37951f44 100644 --- a/ftplugin/purescript.vim +++ b/ftplugin/purescript.vim @@ -1,6 +1,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1 -setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:-- +setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:-- setlocal include=^import setlocal includeexpr=printf('%s.purs',substitute(v:fname,'\\.','/','g')) |