From bedd30ee11953bde13856c32a1b8b7a17ef5916a Mon Sep 17 00:00:00 2001 From: Nicolas Pauss Date: Mon, 25 Jun 2018 09:51:50 +0200 Subject: Improve pyrex cython linter. Like many other linters, use variables for the executable and options used by the linter. By default, the linter now report every warnings as errors with `--warning-errors`. Also add include directory and set working directory to file directory. --- ale_linters/pyrex/cython.vim | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'ale_linters') diff --git a/ale_linters/pyrex/cython.vim b/ale_linters/pyrex/cython.vim index bd5a447f..d5c6238e 100644 --- a/ale_linters/pyrex/cython.vim +++ b/ale_linters/pyrex/cython.vim @@ -1,10 +1,27 @@ -" Author: w0rp +" Author: w0rp , +" Nicolas Pauss " Description: cython syntax checking for cython files. +call ale#Set('pyrex_cython_executable', 'cython') +call ale#Set('pyrex_cython_options', '--warning-extra --warning-errors') + +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 + call ale#linter#Define('pyrex', { \ 'name': 'cython', \ 'output_stream': 'stderr', -\ 'executable': 'cython', -\ 'command': 'cython --warning-extra -o ' . g:ale#util#nul_file . ' %t', +\ 'executable_callback': 'ale_linters#pyrex#cython#GetExecutable', +\ 'command_callback': 'ale_linters#pyrex#cython#GetCommand', \ 'callback': 'ale#handlers#unix#HandleAsError', \}) -- cgit v1.2.3 From d05936a48919081cb274e412549a050e70207153 Mon Sep 17 00:00:00 2001 From: Nicolas Pauss Date: Mon, 25 Jun 2018 17:25:38 +0200 Subject: Handle cython warning with custom handle and remove '--warning-errors'. Add a custom handler to support cython warning format. Remove '--warning-errors' to keep previous behaviour. --- ale_linters/pyrex/cython.vim | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'ale_linters') diff --git a/ale_linters/pyrex/cython.vim b/ale_linters/pyrex/cython.vim index d5c6238e..9b6b39d7 100644 --- a/ale_linters/pyrex/cython.vim +++ b/ale_linters/pyrex/cython.vim @@ -3,7 +3,7 @@ " Description: cython syntax checking for cython files. call ale#Set('pyrex_cython_executable', 'cython') -call ale#Set('pyrex_cython_options', '--warning-extra --warning-errors') +call ale#Set('pyrex_cython_options', '--warning-extra') function! ale_linters#pyrex#cython#GetExecutable(buffer) abort return ale#Var(a:buffer, 'pyrex_cython_executable') @@ -18,10 +18,26 @@ function! ale_linters#pyrex#cython#GetCommand(buffer) abort \ . ' --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_callback': 'ale_linters#pyrex#cython#GetExecutable', \ 'command_callback': 'ale_linters#pyrex#cython#GetCommand', -\ 'callback': 'ale#handlers#unix#HandleAsError', +\ 'callback': 'ale_linters#pyrex#cython#Handle', \}) -- cgit v1.2.3