Add end columns on php linter #538
This commit is contained in:
parent
6299da7bd3
commit
05970e1b28
@ -4,17 +4,23 @@
|
|||||||
function! ale_linters#php#php#Handle(buffer, lines) abort
|
function! ale_linters#php#php#Handle(buffer, lines) abort
|
||||||
" Matches patterns like the following:
|
" Matches patterns like the following:
|
||||||
"
|
"
|
||||||
" PHP Parse error: syntax error, unexpected ';', expecting ']' in - on line 15
|
" Parse error: syntax error, unexpected ';', expecting ']' in - on line 15
|
||||||
let l:pattern = '\v^%(Fatal|Parse) error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in - on line (\d+)'
|
let l:pattern = '\v^%(Fatal|Parse) error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in - on line (\d+)'
|
||||||
|
|
||||||
let l:output = []
|
let l:output = []
|
||||||
|
|
||||||
for l:match in ale#util#GetMatches(a:lines, l:pattern)
|
for l:match in ale#util#GetMatches(a:lines, l:pattern)
|
||||||
call add(l:output, {
|
let l:col = empty(l:match[2]) ? 0 : stridx(getline(l:match[3]), l:match[2]) + 1
|
||||||
|
let l:obj = {
|
||||||
\ 'lnum': l:match[3] + 0,
|
\ 'lnum': l:match[3] + 0,
|
||||||
\ 'col': empty(l:match[2]) ? 0 : stridx(getline(l:match[3]), l:match[2]) + 1,
|
\ 'col': l:col,
|
||||||
\ 'text': l:match[1],
|
\ 'text': l:match[1],
|
||||||
\})
|
\}
|
||||||
|
|
||||||
|
if l:col != 0
|
||||||
|
let l:obj.end_col = l:col + strlen(l:match[2]) - 1
|
||||||
|
endif
|
||||||
|
|
||||||
|
call add(l:output, l:obj)
|
||||||
endfor
|
endfor
|
||||||
|
|
||||||
return l:output
|
return l:output
|
||||||
|
@ -14,21 +14,25 @@ Execute(The php handler should calculate column numbers):
|
|||||||
\ {
|
\ {
|
||||||
\ 'lnum': 1,
|
\ 'lnum': 1,
|
||||||
\ 'col': 5,
|
\ 'col': 5,
|
||||||
|
\ 'end_col': 5,
|
||||||
\ 'text': "syntax error, unexpected ';', expecting ']'",
|
\ 'text': "syntax error, unexpected ';', expecting ']'",
|
||||||
\ },
|
\ },
|
||||||
\ {
|
\ {
|
||||||
\ 'lnum': 2,
|
\ 'lnum': 2,
|
||||||
\ 'col': 13,
|
\ 'col': 13,
|
||||||
|
\ 'end_col': 13,
|
||||||
\ 'text': "syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST)",
|
\ 'text': "syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST)",
|
||||||
\ },
|
\ },
|
||||||
\ {
|
\ {
|
||||||
\ 'lnum': 3,
|
\ 'lnum': 3,
|
||||||
\ 'col': 5,
|
\ 'col': 5,
|
||||||
|
\ 'end_col': 5,
|
||||||
\ 'text': "syntax error, unexpected ')'",
|
\ 'text': "syntax error, unexpected ')'",
|
||||||
\ },
|
\ },
|
||||||
\ {
|
\ {
|
||||||
\ 'lnum': 4,
|
\ 'lnum': 4,
|
||||||
\ 'col': 8,
|
\ 'col': 8,
|
||||||
|
\ 'end_col': 12,
|
||||||
\ 'text': "syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']'",
|
\ 'text': "syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']'",
|
||||||
\ },
|
\ },
|
||||||
\ ],
|
\ ],
|
||||||
|
Loading…
Reference in New Issue
Block a user