summaryrefslogtreecommitdiff
path: root/ale_linters
diff options
context:
space:
mode:
Diffstat (limited to 'ale_linters')
-rw-r--r--ale_linters/ansible/ansible_lint.vim2
-rw-r--r--ale_linters/php/php.vim6
2 files changed, 5 insertions, 3 deletions
diff --git a/ale_linters/ansible/ansible_lint.vim b/ale_linters/ansible/ansible_lint.vim
index 27c96320..0b3b39c8 100644
--- a/ale_linters/ansible/ansible_lint.vim
+++ b/ale_linters/ansible/ansible_lint.vim
@@ -21,7 +21,7 @@ function! ale_linters#ansible#ansible_lint#Handle(buffer, lines) abort
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:code = l:match[4]
- if l:code is# 'EANSIBLE002'
+ if l:code is# 'EANSIBLE0002'
\&& !ale#Var(a:buffer, 'warn_about_trailing_whitespace')
" Skip warnings for trailing whitespace if the option is off.
continue
diff --git a/ale_linters/php/php.vim b/ale_linters/php/php.vim
index b263c5f3..6470383b 100644
--- a/ale_linters/php/php.vim
+++ b/ale_linters/php/php.vim
@@ -4,12 +4,14 @@
function! ale_linters#php#php#Handle(buffer, lines) abort
" Matches patterns like the following:
"
- " Parse error: syntax error, unexpected ';', expecting ']' in - on line 15
- let l:pattern = '\v^%(Fatal|Parse) error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in - on line (\d+)'
+ " PHP 7.1<= - Parse error: syntax error, unexpected ';', expecting ']' in - on line 15
+ " PHP 7.2>= - Parse error: syntax error, unexpected ';', expecting ']' in Standard input code on line 15
+ let l:pattern = '\v^%(Fatal|Parse) error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in %(-|Standard input code) on line (\d+)'
let l:output = []
for l:match in ale#util#GetMatches(a:lines, l:pattern)
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,
\ 'col': l:col,