Skip to content

Commit

Permalink
Merge pull request spf13#377 from victoredwardocallaghan/3.0
Browse files Browse the repository at this point in the history
initial Haskell support.
  • Loading branch information
spf13 committed Jun 24, 2013
2 parents 4148b13 + 86c946c commit f1aae50
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
autocmd FileType c,cpp,java,go,php,javascript,python,twig,xml,yml autocmd BufWritePre <buffer> call StripTrailingWhitespace()
autocmd FileType go autocmd BufWritePre <buffer> Fmt
autocmd BufNewFile,BufRead *.html.twig set filetype=html.twig
autocmd FileType haskell setlocal expandtab shiftwidth=2 softtabstop=2

" }

Expand Down Expand Up @@ -538,6 +539,7 @@
autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
autocmd FileType ruby setlocal omnifunc=rubycomplete#Complete
autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc

" Enable heavy omni completion.
if !exists('g:neocomplcache_omni_patterns')
Expand Down
14 changes: 13 additions & 1 deletion .vimrc.bundles
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
" In your .vimrc.bundles.local file"
" list only the plugin groups you will use
if !exists('g:spf13_bundle_groups')
let g:spf13_bundle_groups=['general', 'neocomplcache', 'programming', 'php', 'ruby', 'python', 'go', 'twig', 'javascript', 'html', 'misc', 'scala']
let g:spf13_bundle_groups=['general', 'neocomplcache', 'programming', 'php', 'ruby', 'python', 'go', 'twig', 'javascript', 'haskell', 'html', 'misc', 'scala']
endif

" To override all the included bundles, put
Expand Down Expand Up @@ -163,6 +163,18 @@
Bundle 'derekwyatt/vim-sbt'
endif

" Haskell
if count(g:spf13_bundle_groups, 'haskell')
Bundle 'dag/vim2hs'
Bundle 'Twinside/vim-haskellConceal'
Bundle 'lukerandall/haskellmode-vim'
Bundle 'ujihisa/neco-ghc'
Bundle 'eagletmt/ghcmod-vim'
Bundle 'Shougo/vimproc'
Bundle 'adinapoli/cumino'
Bundle 'bitc/vim-hdevtools'
endif

" HTML
if count(g:spf13_bundle_groups, 'html')
Bundle 'amirh/HTML-AutoCloseTag'
Expand Down

0 comments on commit f1aae50

Please sign in to comment.