summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <w0rp@users.noreply.github.com>2017-10-26 17:49:46 +0100
committerGitHub <noreply@github.com>2017-10-26 17:49:46 +0100
commit6ed456f99c46ad6853fdd893344e94060ce9f6c3 (patch)
tree7d4bc930968ea10715bdf722279ddb7a39a43885
parentf15c8f41279b8b8d9e397e55021d31ca983da3b0 (diff)
parent40f5e541984f7520aab6f627620ed4823ab8943b (diff)
downloadale-6ed456f99c46ad6853fdd893344e94060ce9f6c3.zip
Merge pull request #1009 from sirbrillig/add/phpcs-include-code-option
phpcs: include sniff code in message
-rw-r--r--ale_linters/php/phpcs.vim5
-rw-r--r--test/test_phpcs_include_code.vader7
2 files changed, 10 insertions, 2 deletions
diff --git a/ale_linters/php/phpcs.vim b/ale_linters/php/phpcs.vim
index ddaf171e..399fbd23 100644
--- a/ale_linters/php/phpcs.vim
+++ b/ale_linters/php/phpcs.vim
@@ -29,11 +29,12 @@ 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)
- let l:text = l:match[4]
+ let l:code = l:match[5]
+ let l:text = l:match[4] . ' (' . l:code . ')'
let l:type = l:match[3]
call add(l:output, {
diff --git a/test/test_phpcs_include_code.vader b/test/test_phpcs_include_code.vader
new file mode 100644
index 00000000..1cff1916
--- /dev/null
+++ b/test/test_phpcs_include_code.vader
@@ -0,0 +1,7 @@
+Execute(errors should include code):
+ AssertEqual
+ \ [{'lnum': 18, 'col': 3, 'type': 'E', 'text': 'Line indented incorrectly; expected 4 spaces, found 2 (Generic.WhiteSpace.ScopeIndent.IncorrectExact)'}],
+ \ 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)',
+ \ ])
+