Merge pull request #1675 from nicopauss/master

Improve pyrex cython linter.

1 files changed, 37 insertions, 4 deletions

diff --git a/ale_linters/pyrex/cython.vim b/ale_linters/pyrex/cython.vim
index bd5a447f..9b6b39d7 100644
--- a/ale_linters/pyrex/cython.vim
+++ b/ale_linters/pyrex/cython.vim
@@ -1,10 +1,43 @@
-" Author: w0rp <devw0rp@gmail.com>
+" Author: w0rp <devw0rp@gmail.com>,
+" Nicolas Pauss <https://github.com/nicopauss>
 " Description: cython syntax checking for cython files.
 
+call ale#Set('pyrex_cython_executable', 'cython')
+call ale#Set('pyrex_cython_options', '--warning-extra')
+
+function! ale_linters#pyrex#cython#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'pyrex_cython_executable')
+endfunction
+
+function! ale_linters#pyrex#cython#GetCommand(buffer) abort
+    let l:local_dir = ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
+
+    return ale#Escape(ale_linters#pyrex#cython#GetExecutable(a:buffer))
+    \   . ' --working ' . l:local_dir . ' --include-dir ' . l:local_dir
+    \   . ' ' . ale#Var(a:buffer, 'pyrex_cython_options')
+    \   . ' --output-file ' . g:ale#util#nul_file . ' %t'
+endfunction
+
+function! ale_linters#pyrex#cython#Handle(buffer, lines) abort
+    let l:pattern = '\v^(\w+: )?[^:]+:(\d+):?(\d+)?:? ?(.+)$'
+    let l:output = []
+
+    for l:match in ale#util#GetMatches(a:lines, l:pattern)
+        call add(l:output, {
+        \   'lnum': l:match[2] + 0,
+        \   'col': l:match[3] + 0,
+        \   'text': l:match[4],
+        \   'type': l:match[1][0] is# 'w' ? 'W' : 'E',
+        \})
+    endfor
+
+    return l:output
+endfunction
+
 call ale#linter#Define('pyrex', {
 \   'name': 'cython',
 \   'output_stream': 'stderr',
-\   'executable': 'cython',
-\   'command': 'cython --warning-extra -o ' . g:ale#util#nul_file . ' %t',
-\   'callback': 'ale#handlers#unix#HandleAsError',
+\   'executable_callback': 'ale_linters#pyrex#cython#GetExecutable',
+\   'command_callback': 'ale_linters#pyrex#cython#GetCommand',
+\   'callback': 'ale_linters#pyrex#cython#Handle',
 \})