Support columns on php handler

Also added some tests for different error messages
This commit is contained in:
Adriaan Zonnenberg 2017-02-15 23:59:18 +01:00
parent 2e7050dbe2
commit b2241e991b
2 changed files with 64 additions and 4 deletions

View File

@ -4,8 +4,9 @@
function! ale_linters#php#php#Handle(buffer, lines) abort
" Matches patterns like the following:
"
" Parse error: parse error in - on line 7
let l:pattern = 'Parse error:\s\+\(.\+\) on line \(\d\+\)'
" PHP Parse error: syntax error, unexpected ';', expecting ']' in - on line 15
let l:pattern = ':\s\+\(.\+unexpected ''\(.\{-}\)''.*\) in - on line \(\d\+\)'
let l:output = []
for l:line in a:lines
@ -18,9 +19,9 @@ function! ale_linters#php#php#Handle(buffer, lines) abort
" vcol is needed to indicate that the column is a character.
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[2] + 0,
\ 'lnum': l:match[3] + 0,
\ 'vcol': 0,
\ 'col': 1,
\ 'col': match(getline(l:match[3]), l:match[2]) + 1,
\ 'text': l:match[1],
\ 'type': 'E',
\ 'nr': -1,

View File

@ -0,0 +1,59 @@
Execute(The php handler should parse lines correctly):
runtime ale_linters/php/php.vim
AssertEqual
\ [
\ {
\ 'bufnr': 347,
\ 'lnum': 47,
\ 'vcol': 0,
\ 'col': 0,
\ 'text': "syntax error, unexpected ';', expecting ']'",
\ 'type': 'E',
\ 'nr': -1,
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 56,
\ 'vcol': 0,
\ 'col': 0,
\ 'text': "syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST)",
\ 'type': 'E',
\ 'nr': -1,
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 13,
\ 'vcol': 0,
\ 'col': 0,
\ 'text': "syntax error, unexpected ')'",
\ 'type': 'E',
\ 'nr': -1,
\ },
\ ],
\ ale_linters#php#php#Handle(347, [
\ 'This line should be ignored completely',
\ "PHP Parse error: syntax error, unexpected ';', expecting ']' in - on line 47",
\ "PHP Parse error: syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST) in - on line 56",
\ 'This line should be ignored completely',
\ "PHP Parse error: syntax error, unexpected ')' in - on line 13",
\ ])
After:
call ale#linter#Reset()
Given php(A function call with missing argument delimiters):
<?php
unset($foo $bar)
Execute(The php handler should find columns correctly):
call ale#Lint()
call ale#engine#WaitForJobs(2000)
AssertEqual
\ [
\ {'group': 'ALEError', 'id': 4, 'pos1': [2, 12, 1], 'priority': 10},
\ {'group': 'ALEError', 'id': 5, 'pos1': [2, 12, 1], 'priority': 10}
\ ],
\ getmatches()