diff options
| author | w0rp <w0rp@users.noreply.github.com> | 2020-11-21 15:36:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 15:36:22 +0000 |
| commit | df3163223f26830782400c453d387394ef561682 (patch) | |
| tree | cb258735f44fe35c65dd423f36f64003a4572822 | |
| parent | 9f2215d69b7c178e4b873d0a7f404962f61e1b77 (diff) | |
| parent | e08996940468ce90616a9704a439652f1ab73e31 (diff) | |
| download | ale-df3163223f26830782400c453d387394ef561682.zip | |
Merge pull request #3282 from zanona/master
fix(ale_linters/phpcs): add support for multiline error messages
| -rw-r--r-- | ale_linters/php/phpcs.vim | 2 | ||||
| -rw-r--r-- | test/handler/test_phpcs_handler.vader | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ale_linters/php/phpcs.vim b/ale_linters/php/phpcs.vim index 11b81e84..c5a3faa9 100644 --- a/ale_linters/php/phpcs.vim +++ b/ale_linters/php/phpcs.vim @@ -23,7 +23,7 @@ function! ale_linters#php#phpcs#Handle(buffer, lines) abort " Matches against lines like the following: " " /path/to/some-filename.php:18:3: error - Line indented incorrectly; expected 4 spaces, found 2 (Generic.WhiteSpace.ScopeIndent.IncorrectExact) - let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\) - \(.\+\) (\(.\+\))$' + let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\) - \(.\+\) (\(.\+\)).*$' let l:output = [] for l:match in ale#util#GetMatches(a:lines, l:pattern) diff --git a/test/handler/test_phpcs_handler.vader b/test/handler/test_phpcs_handler.vader index 18accece..26d35cb8 100644 --- a/test/handler/test_phpcs_handler.vader +++ b/test/handler/test_phpcs_handler.vader @@ -13,7 +13,16 @@ Execute(phpcs errors should be handled): \ 'type': 'E', \ 'sub_type': 'style', \ 'text': 'Line indented incorrectly; expected 4 spaces, found 2 (Generic.WhiteSpace.ScopeIndent.IncorrectExact)', - \ }], + \ }, + \ { + \ 'lnum': 22, + \ 'col': 3, + \ 'type': 'E', + \ 'sub_type': 'style', + \ 'text': 'All output should be run through an escaping function (see the Security sections in the WordPress Developer Handbooks)', + \ }, + \ ], \ ale_linters#php#phpcs#Handle(bufnr(''), [ \ '/path/to/some-filename.php:18:3: error - Line indented incorrectly; expected 4 spaces, found 2 (Generic.WhiteSpace.ScopeIndent.IncorrectExact)', + \ "/path/to/some-filename.php:22:3: error - All output should be run through an escaping function (see the Security sections in the WordPress Developer Handbooks), found '\"\n'.", \ ]) |