From b2241e991bee98e5a085384061bd5e2de4026afc Mon Sep 17 00:00:00 2001 From: Adriaan Zonnenberg Date: Wed, 15 Feb 2017 23:59:18 +0100 Subject: [PATCH 1/3] Support columns on php handler Also added some tests for different error messages --- ale_linters/php/php.vim | 9 +++--- test/test_php_handler.vader | 59 +++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 test/test_php_handler.vader diff --git a/ale_linters/php/php.vim b/ale_linters/php/php.vim index b807fee..1127b94 100644 --- a/ale_linters/php/php.vim +++ b/ale_linters/php/php.vim @@ -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, diff --git a/test/test_php_handler.vader b/test/test_php_handler.vader new file mode 100644 index 0000000..11bb2d5 --- /dev/null +++ b/test/test_php_handler.vader @@ -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): + Date: Sat, 18 Feb 2017 00:04:59 +0100 Subject: [PATCH 2/3] PHP: Fix test for column highlighting --- test/test_php_handler.vader | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_php_handler.vader b/test/test_php_handler.vader index 11bb2d5..dd2d466 100644 --- a/test/test_php_handler.vader +++ b/test/test_php_handler.vader @@ -53,7 +53,7 @@ Execute(The php handler should find columns correctly): AssertEqual \ [ - \ {'group': 'ALEError', 'id': 4, 'pos1': [2, 12, 1], 'priority': 10}, - \ {'group': 'ALEError', 'id': 5, 'pos1': [2, 12, 1], 'priority': 10} + \ {'group': 'ALEError', 'pos1': [2, 12, 1]}, + \ {'group': 'ALEError', 'pos1': [2, 12, 1]} \ ], - \ getmatches() + \ map(getmatches(), '{''group'': v:val.group, ''pos1'': v:val.pos1}') From cca0222cf1c54d14f4eaf24288cd8227fea78ffe Mon Sep 17 00:00:00 2001 From: Adriaan Zonnenberg Date: Sat, 18 Feb 2017 00:51:33 +0100 Subject: [PATCH 3/3] PHP: Make parser work with more error messages --- ale_linters/php/php.vim | 4 ++-- 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 1127b94..d95e28a 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 dd2d466..537f24b 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: