diff options
| author | Adriaan Zonnenberg <amz@adriaan.xyz> | 2017-02-18 00:51:33 +0100 |
|---|---|---|
| committer | Adriaan Zonnenberg <amz@adriaan.xyz> | 2017-02-18 00:51:33 +0100 |
| commit | cca0222cf1c54d14f4eaf24288cd8227fea78ffe (patch) | |
| tree | c708a51bd171348345a0e080ac941de30416014e | |
| parent | a18e172a96d2b311f423d370aba548a748e033c5 (diff) | |
| download | ale-cca0222cf1c54d14f4eaf24288cd8227fea78ffe.zip | |
PHP: Make parser work with more error messages
| -rw-r--r-- | ale_linters/php/php.vim | 4 | ||||
| -rw-r--r-- | test/test_php_handler.vader | 21 |
2 files changed, 22 insertions, 3 deletions
diff --git a/ale_linters/php/php.vim b/ale_linters/php/php.vim index 1127b94a..d95e28a8 100644 --- a/ale_linters/php/php.vim +++ b/ale_linters/php/php.vim @@ -5,7 +5,7 @@ function! ale_linters#php#php#Handle(buffer, lines) abort " Matches patterns like the following: " " PHP Parse error: syntax error, unexpected ';', expecting ']' in - on line 15 - let l:pattern = ':\s\+\(.\+unexpected ''\(.\{-}\)''.*\) in - on line \(\d\+\)' + let l:pattern = 'Parse error:\s\+\(.\{-}unexpected ''\(.\{-}\)''.\{-}\|.*\) in - on line \(\d\+\)' let l:output = [] @@ -21,7 +21,7 @@ function! ale_linters#php#php#Handle(buffer, lines) abort \ 'bufnr': a:buffer, \ 'lnum': l:match[3] + 0, \ 'vcol': 0, - \ 'col': match(getline(l:match[3]), l:match[2]) + 1, + \ 'col': empty(l:match[2]) ? 0 : stridx(getline(l:match[3]), l:match[2]) + 1, \ 'text': l:match[1], \ 'type': 'E', \ 'nr': -1, diff --git a/test/test_php_handler.vader b/test/test_php_handler.vader index dd2d4664..537f24b5 100644 --- a/test/test_php_handler.vader +++ b/test/test_php_handler.vader @@ -30,13 +30,32 @@ Execute(The php handler should parse lines correctly): \ '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", - \ 'This line should be ignored completely', \ "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: |