hasufell/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'adriaanzon/php-columns'

Browse Source
This commit is contained in:
w0rp 2017-02-21 11:34:39 +00:00
commit 3786322cf0
2 changed files with 83 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ale_linters/php/php.vim
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 = 'Parse error:\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': empty(l:match[2]) ? 0 : stridx(getline(l:match[3]), l:match[2]) + 1,
\ 'text': l:match[1],
\ 'type': 'E',
\ 'nr': -1,

78
test/test_php_handler.vader Normal file
View File

@ -0,0 +1,78 @@
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,
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 5,
\ 'vcol': 0,
\ 'col': 0,
\ 'text': "Invalid numeric literal",
\ 'type': 'E',
\ 'nr': -1,
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 21,
\ 'vcol': 0,
\ 'col': 0,
\ 'text': "syntax error, unexpected end of file",
\ '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",
\ "PHP Parse error: syntax error, unexpected ')' in - on line 13",
\ 'PHP Parse error: Invalid numeric literal in - on line 5',
\ 'PHP Parse error: syntax error, unexpected end of file in - on line 21',
\ ])
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', 'pos1': [2, 12, 1]},
\ {'group': 'ALEError', 'pos1': [2, 12, 1]}
\ ],
\ map(getmatches(), '{''group'': v:val.group, ''pos1'': v:val.pos1}')