Merge pull request #741 from zenzike/master

Detangle ghc-mod and hlint

syntax_checkers/haskell/ghc-mod.vim

@@ -32,23 +32,14 @@ function! SyntaxCheckers_haskell_ghc_mod_GetLocList()
 
     let makeprg = syntastic#makeprg#build({
         \ 'exe': 'ghc-mod check',
-        \ 'args': '--hlintOpt="--language=XmlSyntax"',
         \ 'filetype': 'haskell',
         \ 'subchecker': 'ghc_mod' })
-    let loclist1 = SyntasticMake({
+
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat })
 
-    let makeprg = syntastic#makeprg#build({
+    return loclist
-        \ 'exe': 'ghc-mod lint',
-        \ 'args': '--hlintOpt="--language=XmlSyntax"',
-        \ 'filetype': 'haskell',
-        \ 'subchecker': 'ghc_mod' })
-    let loclist2 = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-
-    return loclist1 + loclist2
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

syntax_checkers/haskell/hlint.vim

@@ -0,0 +1,38 @@
+"============================================================================
+"File:        hlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Nicolas Wu <nicolas.wu at gmail dot com>
+"License:     BSD
+"============================================================================
+
+if exists("g:loaded_syntastic_haskell_hlint_checker")
+    finish
+endif
+let g:loaded_syntastic_haskell_hlint_checker=1
+
+function! SyntaxCheckers_haskell_hlint_IsAvailable()
+    return executable('hlint')
+endfunction
+
+function! SyntaxCheckers_haskell_hlint_GetLocList()
+    let errorformat =
+        \ '%E%f:%l:%c: Error: %m,' .
+        \ '%W%f:%l:%c: Warning: %m,' .
+        \ '%C%m'
+
+    let makeprg = syntastic#makeprg#build({
+        \ 'exe': 'hlint',
+        \ 'filetype': 'haskell',
+        \ 'subchecker': 'hlint' })
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'] })
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haskell',
+    \ 'name': 'hlint'})