diff options
| -rw-r--r-- | ale_linters/javascript/jscs.vim | 14 | ||||
| -rw-r--r-- | test/handler/test_jscs_handler.vader | 15 |
2 files changed, 21 insertions, 8 deletions
diff --git a/ale_linters/javascript/jscs.vim b/ale_linters/javascript/jscs.vim index b3f826cf..bcf3ee3a 100644 --- a/ale_linters/javascript/jscs.vim +++ b/ale_linters/javascript/jscs.vim @@ -35,19 +35,23 @@ function! ale_linters#javascript#jscs#Handle(buffer, lines) abort " " foobar.js: line 2, col 1, Expected indentation of 1 characters " - let l:pattern = '^.*:\s\+line \(\d\+\),\s\+col\s\+\(\d\+\),\s\+\(.*\)$' + let l:pattern = '\v^.*:\s+line (\d+),\s+col\s+(\d+),\s+(.*)$' let l:output = [] - let l:m = ale#util#GetMatches(a:lines, [l:pattern]) - - for l:match in l:m - let l:text = l:match[3] + for l:match in ale#util#GetMatches(a:lines, l:pattern) let l:obj = { \ 'lnum': l:match[1] + 0, \ 'col': l:match[2] + 0, \ 'text': l:match[3] \} + let l:code_match = matchlist(l:match[3], '\v([^ :]+): (.+)$') + + if !empty(l:code_match) + let l:obj.code = l:code_match[1] + let l:obj.text = l:code_match[2] + endif + call add(l:output, l:obj) endfor diff --git a/test/handler/test_jscs_handler.vader b/test/handler/test_jscs_handler.vader index 6247307e..5566116f 100644 --- a/test/handler/test_jscs_handler.vader +++ b/test/handler/test_jscs_handler.vader @@ -10,21 +10,30 @@ Execute(jscs should parse lines correctly): \ { \ 'lnum': 1, \ 'col': 7, - \ 'text': 'disallowVar: Variable declarations should use `let` or `const` not `var`', + \ 'text': 'Variable declarations should use `let` or `const` not `var`', + \ 'code': 'disallowVar', \ }, \ { \ 'lnum': 3, \ 'col': 21, - \ 'text': 'disallowTrailingWhitespace: Illegal trailing whitespace', + \ 'text': 'Illegal trailing whitespace', + \ 'code': 'disallowTrailingWhitespace', \ }, \ { \ 'lnum': 5, \ 'col': 9, - \ 'text': 'disallowUnusedVariables: Variable `hello` is not used', + \ 'text': 'Variable `hello` is not used', + \ 'code': 'disallowUnusedVariables', + \ }, + \ { + \ 'lnum': 2, + \ 'col': 1, + \ 'text': 'Expected indentation of 1 characters', \ }, \ ], \ ale_linters#javascript#jscs#Handle(347, [ \ 'foobar.js: line 1, col 7, disallowVar: Variable declarations should use `let` or `const` not `var`', \ 'foobar.js: line 3, col 21, disallowTrailingWhitespace: Illegal trailing whitespace', \ 'foobar.js: line 5, col 9, disallowUnusedVariables: Variable `hello` is not used', + \ 'foobar.js: line 2, col 1, Expected indentation of 1 characters', \ ]) |