Merge pull request #348 from rob-b/add-hdevtools-linter

Add hdevtools linter for haskell

4 files changed, 107 insertions, 57 deletions

diff --git a/ale_linters/haskell/ghc.vim b/ale_linters/haskell/ghc.vim
index c14274f4..270f8ab1 100644
--- a/ale_linters/haskell/ghc.vim
+++ b/ale_linters/haskell/ghc.vim
@@ -1,67 +1,12 @@
 " Author: w0rp <devw0rp@gmail.com>
 " Description: ghc for Haskell files
 
-if exists('g:loaded_ale_linters_haskell_ghc')
-    finish
-endif
-
-let g:loaded_ale_linters_haskell_ghc = 1
-
-function! ale_linters#haskell#ghc#Handle(buffer, lines) abort
-    " Look for lines like the following.
-    "
-    " /dev/stdin:28:26: Not in scope: `>>>>>'
-    let l:pattern = '^[^:]\+:\(\d\+\):\(\d\+\): \(.\+\)$'
-    let l:output = []
-
-    " For some reason the output coming out of the GHC through the wrapper
-    " script breaks the lines up in strange ways. So we have to join some
-    " lines back together again.
-    let l:corrected_lines = []
-
-    for l:line in a:lines
-        if len(matchlist(l:line, l:pattern)) > 0
-            call add(l:corrected_lines, l:line)
-            if l:line !~# ': error:$'
-                call add(l:corrected_lines, '')
-            endif
-        elseif l:line ==# ''
-            call add(l:corrected_lines, l:line)
-        else
-            if len(l:corrected_lines) > 0
-                let l:line = substitute(l:line, '\v\s+', ' ', '')
-                let l:corrected_lines[-1] .= l:line
-            endif
-        endif
-    endfor
-
-    for l:line in l:corrected_lines
-        let l:match = matchlist(l:line, l:pattern)
-
-        if len(l:match) == 0
-            continue
-        endif
-
-        call add(l:output, {
-        \   'bufnr': a:buffer,
-        \   'lnum': l:match[1] + 0,
-        \   'vcol': 0,
-        \   'col': l:match[2] + 0,
-        \   'text': l:match[3],
-        \   'type': 'E',
-        \   'nr': -1,
-        \})
-    endfor
-
-    return l:output
-endfunction
-
 call ale#linter#Define('haskell', {
 \   'name': 'ghc',
 \   'output_stream': 'stderr',
 \   'executable': 'ghc',
 \   'command': 'ghc -fno-code -v0 %t',
-\   'callback': 'ale_linters#haskell#ghc#Handle',
+\   'callback': 'ale#handlers#HandleGhcFormat',
 \})
 
 call ale#linter#Define('haskell', {
@@ -69,5 +14,5 @@ call ale#linter#Define('haskell', {
 \   'output_stream': 'stderr',
 \   'executable': 'stack',
 \   'command': 'stack ghc -- -fno-code -v0 %t',
-\   'callback': 'ale_linters#haskell#ghc#Handle',
+\   'callback': 'ale#handlers#HandleGhcFormat',
 \})
diff --git a/ale_linters/haskell/hdevtools.vim b/ale_linters/haskell/hdevtools.vim
new file mode 100644
index 00000000..92bb8279
--- /dev/null
+++ b/ale_linters/haskell/hdevtools.vim
@@ -0,0 +1,9 @@
+" Author: rob-b
+" Description: hdevtools for Haskell files
+
+call ale#linter#Define('haskell', {
+\   'name': 'hdevtools',
+\   'executable': 'hdevtools',
+\   'command': 'hdevtools check -g -Wall -p %s %t',
+\   'callback': 'ale#handlers#HandleGhcFormat',
+\})
diff --git a/autoload/ale/handlers.vim b/autoload/ale/handlers.vim
index 544c91de..93282a4b 100644
--- a/autoload/ale/handlers.vim
+++ b/autoload/ale/handlers.vim
@@ -220,3 +220,57 @@ function! ale#handlers#HandleStyleLintFormat(buffer, lines) abort
 
     return l:output
 endfunction
+
+function! ale#handlers#HandleGhcFormat(buffer, lines) abort
+    " Look for lines like the following.
+    "
+    "Appoint/Lib.hs:8:1: warning:
+    "Appoint/Lib.hs:8:1:
+    let l:pattern = '^[^:]\+:\(\d\+\):\(\d\+\):\(.*\)\?$'
+    let l:output = []
+
+    let l:corrected_lines = []
+    for l:line in a:lines
+        if len(matchlist(l:line, l:pattern)) > 0
+            call add(l:corrected_lines, l:line)
+        elseif l:line ==# ''
+            call add(l:corrected_lines, l:line)
+        else
+            if len(l:corrected_lines) > 0
+                let l:line = substitute(l:line, '\v^\s+', ' ', '')
+                let l:corrected_lines[-1] .= l:line
+            endif
+        endif
+    endfor
+
+    for l:line in l:corrected_lines
+        let l:match = matchlist(l:line, l:pattern)
+
+        if len(l:match) == 0
+            continue
+        endif
+
+        let l:errors = matchlist(l:match[3], '\(warning:\|error:\)\(.*\)')
+
+        if len(l:errors) > 0
+          let l:type = l:errors[1]
+          let l:text = l:errors[2]
+        else
+          let l:type = ''
+          let l:text = l:match[3]
+        end
+        let l:type = l:type ==# '' ? 'E' : toupper(l:type[0])
+
+        call add(l:output, {
+        \   'bufnr': a:buffer,
+        \   'lnum': l:match[1] + 0,
+        \   'vcol': 0,
+        \   'col': l:match[2] + 0,
+        \   'text': l:text,
+        \   'type': l:type,
+        \   'nr': -1,
+        \})
+    endfor
+
+    return l:output
+endfunction
diff --git a/test/test_ghc_handler.vader b/test/test_ghc_handler.vader
new file mode 100644
index 00000000..2350d9e5
--- /dev/null
+++ b/test/test_ghc_handler.vader
@@ -0,0 +1,42 @@
+Execute(The ghc handler should handle hdevtools output):
+
+  AssertEqual
+  \ [
+  \   {'lnum': 147, 'bufnr': 12, 'vcol': 0, 'nr': -1, 'type': 'W', 'col': 62, 'text': '• Couldnt match type ‘a -> T.Text’ with ‘T.Text’ Expected type: [T.Text]'},
+  \ ],
+  \ ale#handlers#HandleGhcFormat(12, [
+  \ '/path/to/foo.hs:147:62: warning:',
+  \ '• Couldnt match type ‘a -> T.Text’ with ‘T.Text’',
+  \ '  Expected type: [T.Text]',
+  \ ])
+
+
+Execute(The ghc handler should handle ghc 8 output):
+
+  AssertEqual
+  \ [
+  \   {'lnum': 6, 'bufnr': 47, 'vcol': 0, 'nr': -1, 'type': 'E', 'col': 1, 'text': ' Failed to load interface for ‘GitHub.Data’ Use -v to see a list of the files searched for.'},
+  \   {'lnum': 7, 'bufnr': 47, 'vcol': 0, 'nr': -1, 'type': 'W', 'col': 1, 'text': ' Failed to load interface for ‘GitHub.Endpoints.PullRequests’ Use -v to see a list of the files searched for.'},
+  \ ],
+  \ ale#handlers#HandleGhcFormat(47, [
+  \ '',
+  \ 'src/Appoint/Lib.hs:6:1: error:',
+  \ '    Failed to load interface for ‘GitHub.Data’',
+  \ '    Use -v to see a list of the files searched for.',
+  \ '',
+  \ 'src/Appoint/Lib.hs:7:1: warning:',
+  \ '    Failed to load interface for ‘GitHub.Endpoints.PullRequests’',
+  \ '    Use -v to see a list of the files searched for.',
+  \ ])
+
+
+Execute(The ghc handler should handle ghc 7 output):
+
+  AssertEqual
+  \ [
+  \   {'lnum': 168, 'bufnr': 47, 'vcol': 0, 'nr': -1, 'type': 'E', 'col': 1, 'text': ' parse error (possibly incorrect indentation or mismatched brackets)'},
+  \ ],
+  \ ale#handlers#HandleGhcFormat(47, [
+  \ 'src/Main.hs:168:1:',
+  \ '    parse error (possibly incorrect indentation or mismatched brackets)',
+  \ ])