Use govet handler for gosimple, gotype, staticcheck

4 files changed, 4 insertions, 21 deletions

diff --git a/ale_linters/go/gosimple.vim b/ale_linters/go/gosimple.vim
index 12ef3b94..dbdc3fcf 100644
--- a/ale_linters/go/gosimple.vim
+++ b/ale_linters/go/gosimple.vim
@@ -9,7 +9,7 @@ call ale#linter#Define('go', {
 \   'name': 'gosimple',
 \   'executable': 'gosimple',
 \   'command_callback': 'ale_linters#go#gosimple#GetCommand',
-\   'callback': 'ale#handlers#unix#HandleAsWarning',
+\   'callback': 'ale#handlers#go#Handler',
 \   'output_stream': 'both',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/go/gotype.vim b/ale_linters/go/gotype.vim
index 82737e28..f4bb274e 100644
--- a/ale_linters/go/gotype.vim
+++ b/ale_linters/go/gotype.vim
@@ -15,6 +15,6 @@ call ale#linter#Define('go', {
 \   'output_stream': 'stderr',
 \   'executable': 'gotype',
 \   'command_callback': 'ale_linters#go#gotype#GetCommand',
-\   'callback': 'ale#handlers#unix#HandleAsError',
+\   'callback': 'ale#handlers#go#Handler',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/go/govet.vim b/ale_linters/go/govet.vim
index aae5969d..edf9eb66 100644
--- a/ale_linters/go/govet.vim
+++ b/ale_linters/go/govet.vim
@@ -8,28 +8,11 @@ function! ale_linters#go#govet#GetCommand(buffer) abort
     return ale#path#BufferCdString(a:buffer) . ' go vet .'
 endfunction
 
-function! ale_linters#go#govet#Handler(buffer, lines) abort
-    let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?:? ?(.+)$'
-    let l:output = []
-    let l:dir = expand('#' . a:buffer . ':p:h')
-
-    for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        call add(l:output, {
-        \   'filename': ale#path#GetAbsPath(l:dir, l:match[1]),
-        \   'lnum': l:match[2] + 0,
-        \   'col': l:match[3] + 0,
-        \   'text': l:match[4],
-        \   'type': 'E',
-        \})
-    endfor
-    return l:output
-endfunction
-
 call ale#linter#Define('go', {
 \   'name': 'go vet',
 \   'output_stream': 'stderr',
 \   'executable': 'go',
 \   'command_callback': 'ale_linters#go#govet#GetCommand',
-\   'callback': 'ale_linters#go#govet#Handler',
+\   'callback': 'ale#handlers#go#Handler',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/go/staticcheck.vim b/ale_linters/go/staticcheck.vim
index ce9e6e38..a3464015 100644
--- a/ale_linters/go/staticcheck.vim
+++ b/ale_linters/go/staticcheck.vim
@@ -27,7 +27,7 @@ call ale#linter#Define('go', {
 \   'name': 'staticcheck',
 \   'executable': 'staticcheck',
 \   'command_callback': 'ale_linters#go#staticcheck#GetCommand',
-\   'callback': 'ale#handlers#unix#HandleAsWarning',
+\   'callback': 'ale#handlers#go#Handler',
 \   'output_stream': 'both',
 \   'lint_file': 1,
 \})