vim/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a function for getting matches, and use it to simplify a lot of code

Browse Source
This commit is contained in:
w0rp 2017-04-18 00:35:53 +01:00
parent e237add9fd
commit bdad25eefd
53 changed files with 224 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ale_linters/asm/gcc.vim
View File

@ -13,21 +13,11 @@ function! ale_linters#asm#gcc#Handle(buffer, lines) abort
let l:pattern = '^.\+:\(\d\+\): \([^:]\+\): \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'vcol': 0,
\ 'col': 0,
\ 'text': l:match[3],
\ 'type': l:match[2] =~? 'error' ? 'E' : 'W',
\ 'nr': -1,
\ 'text': l:match[3],
\})
endfor

10
ale_linters/chef/foodcritic.vim
View File

@ -13,19 +13,11 @@ function! ale_linters#chef#foodcritic#Handle(buffer, lines) abort
let l:pattern = '^\(.\+:\s.\+\):\s\(.\+\):\(\d\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:text = l:match[1]
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[3] + 0,
\ 'col': 0,
\ 'text': l:text,
\ 'type': 'W',
\})

19
ale_linters/coffee/coffeelint.vim
View File

@ -24,22 +24,11 @@ function! ale_linters#coffee#coffeelint#Handle(buffer, lines) abort
let l:pattern = 'stdin,\(\d\+\),\(\d*\),\(.\{-1,}\),\(.\+\)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
let l:line = l:match[1] + 0
let l:type = l:match[3] ==# 'error' ? 'E' : 'W'
let l:text = l:match[4]
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'text': l:text,
\ 'type': l:type,
\ 'lnum': str2nr(l:match[1]),
\ 'type': l:match[3] ==# 'error' ? 'E' : 'W',
\ 'text': l:match[4],
\})
endfor

9
ale_linters/cs/mcs.vim
View File

@ -11,15 +11,8 @@ function! ale_linters#cs#mcs#Handle(buffer, lines) abort
let l:pattern = '^.\+.cs(\(\d\+\),\(\d\+\)): \(.\+\): \(.\+\)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,
\ 'text': l:match[3] . ': ' . l:match[4],

22
ale_linters/d/dmd.vim
View File

@ -56,24 +56,12 @@ function! ale_linters#d#dmd#Handle(buffer, lines) abort
let l:pattern = '^[^(]\+(\([0-9]\+\)\,\?\([0-9]*\)): \([^:]\+\): \(.\+\)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
break
endif
let l:line = l:match[1] + 0
let l:column = l:match[2] + 0
let l:type = l:match[3]
let l:text = l:match[4]
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': bufnr('%'),
\ 'lnum': l:line,
\ 'col': l:column,
\ 'text': l:text,
\ 'type': l:type ==# 'Warning' ? 'W' : 'E',
\ 'lnum': l:match[1],
\ 'col': l:match[2],
\ 'type': l:match[3] ==# 'Warning' ? 'W' : 'E',
\ 'text': l:match[4],
\})
endfor

8
ale_linters/dockerfile/hadolint.vim
View File

@ -7,13 +7,7 @@ function! ale_linters#dockerfile#hadolint#Handle(buffer, lines) abort
let l:pattern = '\v^/dev/stdin:?(\d+)? (\S+) (.+)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:lnum = 0
if l:match[1] !=# ''

8
ale_linters/elixir/credo.vim
View File

@ -7,13 +7,7 @@ function! ale_linters#elixir#credo#Handle(buffer, lines) abort
let l:pattern = '\v:(\d+):?(\d+)?: (.): (.+)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:type = l:match[3]
let l:text = l:match[4]

8
ale_linters/elixir/dogma.vim
View File

@ -7,13 +7,7 @@ function! ale_linters#elixir#dogma#Handle(buffer, lines) abort
let l:pattern = '\v:(\d+):?(\d+)?: (.): (.+)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:type = l:match[3]
let l:text = l:match[4]

9
ale_linters/haml/hamllint.vim
View File

@ -7,15 +7,8 @@ function! ale_linters#haml#hamllint#Handle(buffer, lines) abort
let l:pattern = '\v^.*:(\d+) \[([EW])\] (.+)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'type': l:match[2],
\ 'text': l:match[3]

9
ale_linters/html/tidy.vim
View File

@ -43,20 +43,13 @@ function! ale_linters#html#tidy#Handle(buffer, lines) abort
let l:pattern = '^line \(\d\+\) column \(\d\+\) - \(Warning\|Error\): \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:line = l:match[1] + 0
let l:col = l:match[2] + 0
let l:type = l:match[3] ==# 'Error' ? 'E' : 'W'
let l:text = l:match[4]
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'col': l:col,
\ 'text': l:text,

9
ale_linters/java/javac.vim
View File

@ -28,15 +28,8 @@ function! ale_linters#java#javac#Handle(buffer, lines) abort
let l:pattern = '^.*\:\(\d\+\):\ \(.*\):\(.*\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'text': l:match[2] . ':' . l:match[3],
\ 'type': l:match[2] ==# 'error' ? 'E' : 'W',

13
ale_linters/javascript/eslint.vim
View File

@ -66,18 +66,7 @@ function! ale_linters#javascript#eslint#Handle(buffer, lines) abort
let l:parsing_pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
" Try the parsing pattern for parsing errors.
let l:match = matchlist(l:line, l:parsing_pattern)
endif
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, [l:pattern, l:parsing_pattern])
let l:type = 'Error'
let l:text = l:match[3]

8
ale_linters/javascript/standard.vim
View File

@ -37,13 +37,7 @@ function! ale_linters#javascript#standard#Handle(buffer, lines) abort
let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:type = 'Error'
let l:text = l:match[3]

10
ale_linters/json/jsonlint.vim
View File

@ -7,19 +7,11 @@ function! ale_linters#json#jsonlint#Handle(buffer, lines) abort
let l:pattern = '^line \(\d\+\), col \(\d*\), \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,
\ 'text': l:match[3],
\ 'type': 'E',
\})
endfor

9
ale_linters/lua/luacheck.vim
View File

@ -21,15 +21,8 @@ function! ale_linters#lua#luacheck#Handle(buffer, lines) abort
let l:pattern = '^.*:\(\d\+\):\(\d\+\): (\([WE]\)\d\+) \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,
\ 'text': l:match[4],

10
ale_linters/markdown/mdl.vim
View File

@ -6,17 +6,9 @@ function! ale_linters#markdown#mdl#Handle(buffer, lines) abort
let l:pattern = ':\(\d*\): \(.*\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': 0,
\ 'text': l:match[2],
\ 'type': 'W',
\})

8
ale_linters/matlab/mlint.vim
View File

@ -22,13 +22,7 @@ function! ale_linters#matlab#mlint#Handle(buffer, lines) abort
let l:pattern = '^L \(\d\+\) (C \([0-9-]\+\)): \([A-Z]\+\): \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:lnum = l:match[1] + 0
let l:col = l:match[2] + 0
let l:code = l:match[3]

8
ale_linters/nim/nimcheck.vim
View File

@ -6,13 +6,7 @@ function! ale_linters#nim#nimcheck#Handle(buffer, lines) abort
let l:pattern = '^\(.\+\.nim\)(\(\d\+\), \(\d\+\)) \(.\+\)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
" Only show errors of the current buffer
" NOTE: Checking filename only is OK because nim enforces unique
" module names.

9
ale_linters/nix/nix.vim
View File

@ -5,15 +5,8 @@ function! ale_linters#nix#nix#Handle(buffer, lines) abort
let l:pattern = '^\(.\+\): \(.\+\), at .*:\(\d\+\):\(\d\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[3] + 0,
\ 'col': l:match[4] + 0,
\ 'text': l:match[1] . ': ' . l:match[2],

9
ale_linters/perl/perl.vim
View File

@ -21,19 +21,12 @@ function! ale_linters#perl#perl#Handle(buffer, lines) abort
let l:pattern = '\(.\+\) at \(.\+\) line \(\d\+\)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:line = l:match[3]
let l:text = l:match[1]
let l:type = 'E'
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'text': l:text,
\ 'type': l:type,

18
ale_linters/perl/perlcritic.vim
View File

@ -5,22 +5,10 @@ function! ale_linters#perl#perlcritic#Handle(buffer, lines) abort
let l:pattern = '\(.\+\) at \(.\+\) line \(\d\+\)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
let l:line = l:match[3]
let l:text = l:match[1]
let l:type = 'E'
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'text': l:text,
\ 'type': l:type,
\ 'text': l:match[1],
\ 'lnum': l:match[3],
\})
endfor

10
ale_linters/php/hack.vim
View File

@ -5,23 +5,15 @@ function! ale_linters#php#hack#Handle(buffer, lines) abort
let l:pattern = '^\(.*\):\(\d\+\):\(\d\+\),\(\d\+\): \(.\+])\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
if a:buffer != bufnr(l:match[1])
continue
endif
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[2] + 0,
\ 'col': l:match[3] + 0,
\ 'text': l:match[5],
\ 'type': 'E',
\})
endfor

10
ale_linters/php/php.vim
View File

@ -9,19 +9,11 @@ function! ale_linters#php#php#Handle(buffer, lines) abort
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[3] + 0,
\ 'col': empty(l:match[2]) ? 0 : stridx(getline(l:match[3]), l:match[2]) + 1,
\ 'text': l:match[1],
\ 'type': 'E',
\})
endfor

9
ale_linters/php/phpcs.vim
View File

@ -19,18 +19,11 @@ function! ale_linters#php#phpcs#Handle(buffer, lines) abort
let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\) - \(.\+\) \(\(.\+\)\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:text = l:match[4]
let l:type = l:match[3]
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,
\ 'text': l:text,

10
ale_linters/php/phpmd.vim
View File

@ -17,17 +17,9 @@ function! ale_linters#php#phpmd#Handle(buffer, lines) abort
let l:pattern = '^.*:\(\d\+\)\t\(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': 0,
\ 'text': l:match[2],
\ 'type': 'W',
\})

10
ale_linters/puppet/puppet.vim
View File

@ -7,19 +7,11 @@ function! ale_linters#puppet#puppet#Handle(buffer, lines) abort
let l:pattern = '^Error: .*: \(.\+\) at .\+:\(\d\+\):\(\d\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[2] + 0,
\ 'col': l:match[3] + 0,
\ 'text': l:match[1],
\ 'type': 'E',
\})
endfor

9
ale_linters/python/mypy.vim
View File

@ -28,13 +28,7 @@ function! ale_linters#python#mypy#Handle(buffer, lines) abort
let l:pattern = '^' . s:path_pattern . ':\(\d\+\):\?\(\d\+\)\?: \([^:]\+\): \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
if l:match[4] =~# 'Stub files are from'
" The lines telling us where to get stub files from make it so
" we can't read the actual errors, so exclude them.
@ -42,7 +36,6 @@ function! ale_linters#python#mypy#Handle(buffer, lines) abort
endif
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,
\ 'text': l:match[4],

9
ale_linters/ruby/rubocop.vim
View File

@ -9,18 +9,11 @@ function! ale_linters#ruby#rubocop#Handle(buffer, lines) abort
let l:pattern = '\v:(\d+):(\d+): (.): (.+)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:text = l:match[4]
let l:type = l:match[3]
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,
\ 'text': l:text,

1
ale_linters/ruby/ruby.vim
View File

@ -19,7 +19,6 @@ function! ale_linters#ruby#ruby#Handle(buffer, lines) abort
endif
else
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': 0,
\ 'text': l:match[2] . l:match[3],

1
ale_linters/scala/scalac.vim
View File

@ -26,7 +26,6 @@ function! ale_linters#scala#scalac#Handle(buffer, lines) abort
endif
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:col + 1,
\ 'text': l:text,

9
ale_linters/scss/scsslint.vim
View File

@ -8,20 +8,13 @@ function! ale_linters#scss#scsslint#Handle(buffer, lines) abort
let l:pattern = '^.*:\(\d\+\):\(\d*\) \[\([^\]]\+\)\] \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
if g:ale_warn_about_trailing_whitespace && l:match[4] =~# '^TrailingWhitespace'
" Skip trailing whitespace warnings if that option is on.
continue
endif
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,
\ 'text': l:match[4],

18
ale_linters/sh/shell.vim
View File

@ -41,22 +41,10 @@ function! ale_linters#sh#shell#Handle(buffer, lines) abort
let l:pattern = '\v(line |: ?)(\d+): (.+)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
let l:line = l:match[2] + 0
let l:text = l:match[3]
let l:type = 'E'
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'text': l:text,
\ 'type': l:type,
\ 'lnum': str2nr(l:match[2]),
\ 'text': l:match[3],
\})
endfor

9
ale_linters/slim/slimlint.vim
View File

@ -7,15 +7,8 @@ function! ale_linters#slim#slimlint#Handle(buffer, lines) abort
let l:pattern = '\v^.*:(\d+) \[([EW])\] (.+)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'type': l:match[2],
\ 'text': l:match[3]

8
ale_linters/sql/sqlint.vim
View File

@ -8,13 +8,7 @@ function! ale_linters#sql#sqlint#Handle(buffer, lines) abort
let l:pattern = '\v^[^:]+:(\d+):(\d+):(\u+) (.*)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if empty(l:match)
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,

9
ale_linters/tex/chktex.vim
View File

@ -34,15 +34,8 @@ function! ale_linters#tex#chktex#Handle(buffer, lines) abort
let l:pattern = '^stdin:\(\d\+\):\(\d\+\):\(\d\+\):\(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': l:match[2] + 0,
\ 'text': l:match[4] . ' (' . (l:match[3]+0) . ')',

10
ale_linters/tex/lacheck.vim
View File

@ -21,13 +21,7 @@ function! ale_linters#tex#lacheck#Handle(buffer, lines) abort
let l:pattern = '^".\+", line \(\d\+\): \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
" lacheck follows `\input{}` commands. If the cwd is not the same as the
" file in the buffer then it will fail to find the inputed items. We do not
" want warnings from those items anyway
@ -36,9 +30,7 @@ function! ale_linters#tex#lacheck#Handle(buffer, lines) abort
endif
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:match[1] + 0,
\ 'col': 0,
\ 'text': l:match[2],
\ 'type': 'W',
\})

11
ale_linters/typescript/tslint.vim
View File

@ -25,24 +25,15 @@ function! ale_linters#typescript#tslint#Handle(buffer, lines) abort
let l:pattern = '.\+' . l:ext . '\[\(\d\+\), \(\d\+\)\]: \(.\+\)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:line = l:match[1] + 0
let l:column = l:match[2] + 0
let l:type = 'E'
let l:text = l:match[3]
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'col': l:column,
\ 'text': l:text,
\ 'type': l:type,
\})
endfor

11
ale_linters/typescript/typecheck.vim
View File

@ -10,24 +10,15 @@ function! ale_linters#typescript#typecheck#Handle(buffer, lines) abort
let l:pattern = '.\+\.ts\[\(\d\+\), \(\d\+\)\]: \(.\+\)'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:line = l:match[1] + 0
let l:column = l:match[2] + 0
let l:type = 'E'
let l:text = l:match[3]
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'col': l:column,
\ 'text': l:text,
\ 'type': l:type,
\})
endfor

9
ale_linters/verilog/iverilog.vim
View File

@ -11,19 +11,12 @@ function! ale_linters#verilog#iverilog#Handle(buffer, lines) abort
let l:pattern = '^[^:]\+:\(\d\+\): \(warning\|error\|syntax error\)\(: \(.\+\)\)\?'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:line = l:match[1] + 0
let l:type = l:match[2] =~# 'error' ? 'E' : 'W'
let l:text = l:match[2] ==# 'syntax error' ? 'syntax error' : l:match[4]
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'text': l:text,
\ 'type': l:type,

9
ale_linters/verilog/verilator.vim
View File

@ -23,13 +23,7 @@ function! ale_linters#verilog#verilator#Handle(buffer, lines) abort
let l:pattern = '^%\(Warning\|Error\)[^:]*:\([^:]\+\):\(\d\+\): \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:line = l:match[3] + 0
let l:type = l:match[1] ==# 'Error' ? 'E' : 'W'
let l:text = l:match[4]
@ -37,7 +31,6 @@ function! ale_linters#verilog#verilator#Handle(buffer, lines) abort
if l:file =~# '_verilator_linted.v'
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'text': l:text,
\ 'type': l:type,

9
ale_linters/yaml/yamllint.vim
View File

@ -23,20 +23,13 @@ function! ale_linters#yaml#yamllint#Handle(buffer, lines) abort
let l:pattern = '^.*:\(\d\+\):\(\d\+\): \[\(error\|warning\)\] \(.\+\)$'
let l:output = []
for l:line in a:lines
let l:match = matchlist(l:line, l:pattern)
if len(l:match) == 0
continue
endif
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:line = l:match[1] + 0
let l:col = l:match[2] + 0
let l:type = l:match[3]
let l:text = l:match[4]
call add(l:output, {
\ 'bufnr': a:buffer,
\ 'lnum': l:line,
\ 'col': l:col,
\ 'text': l:text,

24
autoload/ale/util.vim
View File

@ -101,3 +101,27 @@ endfunction
function! ale#util#ClockMilliseconds() abort
return float2nr(reltimefloat(reltime()) * 1000)
endfunction
" Given a single line, or a List of lines, and a single pattern, or a List
" of patterns, return all of the matches for the lines(s) from the given
" patterns, using matchlist().
"
" Only the first pattern which matches a line will be returned.
function! ale#util#GetMatches(lines, patterns) abort
let l:matches = []
let l:lines = type(a:lines) == type([]) ? a:lines : [a:lines]
let l:patterns = type(a:patterns) == type([]) ? a:patterns : [a:patterns]
for l:line in l:lines
for l:pattern in l:patterns
let l:match = matchlist(l:line, l:pattern)
if !empty(l:match)
call add(l:matches, l:match)
break
endif
endfor
endfor
return l:matches
endfunction

8
test/handler/test_asm_handler.vader
View File

@ -4,22 +4,14 @@ Execute(The asm GCC handler should parse lines from GCC 6.3.1 correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 357,
\ 'lnum': 38,
\ 'vcol': 0,
\ 'col': 0,
\ 'text': "too many memory references for `mov'",
\ 'type': 'E',
\ 'nr': -1,
\ },
\ {
\ 'bufnr': 357,
\ 'lnum': 42,
\ 'vcol': 0,
\ 'col': 0,
\ 'text': "incorrect register `%ax' used with `l' suffix",
\ 'type': 'E',
\ 'nr': -1,
\ },
\ ],
\ ale_linters#asm#gcc#Handle(357, [

1
test/handler/test_coffeelint_handler.vader
View File

@ -4,7 +4,6 @@ Execute(The coffeelint handler should parse lines correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 347,
\ 'lnum': 125,
\ 'text': "Line exceeds maximum allowed length Length is 122, max is 120.",
\ 'type': 'E',

2
test/handler/test_mypy_handler.vader
View File

@ -4,14 +4,12 @@ Execute(The mypy handler should parse lines correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 347,
\ 'lnum': 4,
\ 'col': 0,
\ 'text': "No library stub file for module 'django.db'",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 40,
\ 'col': 5,
\ 'text': "Some other problem",

2
test/handler/test_nix_handler.vader
View File

@ -4,14 +4,12 @@ Execute(The nix handler should parse nix-instantiate error messages correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 47,
\ 'lnum': 23,
\ 'col': 14,
\ 'text': 'error: syntax error, unexpected IN',
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 47,
\ 'lnum': 3,
\ 'col': 12,
\ 'text': 'error: syntax error, unexpected ''='', expecting '';''',

14
test/handler/test_php_handler.vader
View File

@ -11,53 +11,39 @@ Execute(The php handler should parse lines correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 347,
\ 'lnum': 1,
\ 'col': 5,
\ 'text': "syntax error, unexpected ';', expecting ']'",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 2,
\ 'col': 13,
\ 'text': "syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST)",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 3,
\ 'col': 5,
\ 'text': "syntax error, unexpected ')'",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 4,
\ 'col': 8,
\ 'text': "syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']'",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 5,
\ 'col': 0,
\ 'text': "Cannot redeclare count()",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 21,
\ 'col': 0,
\ 'text': "syntax error, unexpected end of file",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 47,
\ 'col': 0,
\ 'text': "Invalid numeric literal",
\ 'type': 'E',
\ },
\ ],
\ ale_linters#php#php#Handle(347, [

4
test/handler/test_rubocop_handler.vader
View File

@ -4,28 +4,24 @@ Execute(The rubocop handler should parse lines correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 347,
\ 'lnum': 83,
\ 'col': 29,
\ 'text': 'Prefer single-quoted strings...',
\ 'type': 'W',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 12,
\ 'col': 2,
\ 'text': 'Some error',
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 10,
\ 'col': 5,
\ 'text': 'Regular warning',
\ 'type': 'W',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 11,
\ 'col': 1,
\ 'text': 'Another error',

3
test/handler/test_ruby_handler.vader
View File

@ -7,21 +7,18 @@ Execute(The ruby handler should parse lines correctly and add the column if it c
\ [
\ {
\ 'lnum': 6,
\ 'bufnr': 255,
\ 'col': 13,
\ 'type': 'E',
\ 'text': 'syntax error, unexpected '';'''
\ },
\ {
\ 'lnum': 9,
\ 'bufnr': 255,
\ 'col': 0,
\ 'type': 'W',
\ 'text': 'warning: statement not reached'
\ },
\ {
\ 'lnum': 12,
\ 'bufnr': 255,
\ 'col': 0,
\ 'type': 'E',
\ 'text': 'syntax error, unexpected end-of-input, expecting keyword_end'

12
test/handler/test_shell_handler.vader
View File

@ -7,40 +7,28 @@ Execute(The shell handler should parse lines correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 347,
\ 'lnum': 13,
\ 'text': 'syntax error near unexpected token d',
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 7,
\ 'text': 'line 42: line 36:',
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 11,
\ 'text': 'Syntax error: "(" unexpected',
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 95,
\ 'text': 'parse error near `out=$(( $1 / 1024. )...',
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 22,
\ 'text': ':11: :33: :44:',
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 9,
\ 'text': '`done'' unexpected',
\ 'type': 'E',
\ },
\ ],
\ ale_linters#sh#shell#Handle(347, [

3
test/handler/test_slim_handler.vader
View File

@ -6,19 +6,16 @@ Execute(The slim handler should parse lines correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 347,
\ 'lnum': 1,
\ 'text': 'RedundantDiv: `div` is redundant when class attribute shortcut is present',
\ 'type': 'W',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 2,
\ 'text': 'LineLength: Line is too long. [136/80]',
\ 'type': 'W',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 3,
\ 'text': 'Invalid syntax',
\ 'type': 'E',

4
test/handler/test_typecheck_handler.vader
View File

@ -4,18 +4,14 @@ Execute(The typecheck handler should parse lines correctly):
AssertEqual
\ [
\ {
\ 'bufnr': 347,
\ 'lnum': 16,
\ 'col': 7,
\ 'text': "Type 'A' is not assignable to type 'B'",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 7,
\ 'col': 41,
\ 'text': "Property 'a' does not exist on type 'A'",
\ 'type': 'E',
\ },
\ ],
\ ale_linters#typescript#typecheck#Handle(347, [

148
test/test_getmatches.vader Normal file
View File

@ -0,0 +1,148 @@
Execute (ale#util#GetMatches should return matches for many lines):
AssertEqual
\ [
\ [
\ '/path/to/some-filename.js:47:14: Missing trailing comma. [Warning/comma-dangle]',
\ '47',
\ '14',
\ 'Missing trailing comma.',
\ 'Warning/comma-dangle',
\ '',
\ '',
\ '',
\ '',
\ '',
\ ],
\ [
\ '/path/to/some-filename.js:56:41: Missing semicolon. [Error/semi]',
\ '56',
\ '41',
\ 'Missing semicolon.',
\ 'Error/semi',
\ '',
\ '',
\ '',
\ '',
\ '',
\ ],
\ ],
\ ale#util#GetMatches(
\ [
\ '/path/to/some-filename.js:47:14: Missing trailing comma. [Warning/comma-dangle]',
\ '/path/to/some-filename.js:56:41: Missing semicolon. [Error/semi]',
\ ],
\ [
\ '^.*:\(\d\+\):\(\d\+\): \(.\+\) \[\(.\+\)\]$',
\ ]
\ )
Execute (ale#util#GetMatches should accept a string for a single pattern):
AssertEqual
\ [
\ [
\ '/path/to/some-filename.js:47:14: Missing trailing comma. [Warning/comma-dangle]',
\ '47',
\ '14',
\ 'Missing trailing comma.',
\ 'Warning/comma-dangle',
\ '',
\ '',
\ '',
\ '',
\ '',
\ ],
\ [
\ '/path/to/some-filename.js:56:41: Missing semicolon. [Error/semi]',
\ '56',
\ '41',
\ 'Missing semicolon.',
\ 'Error/semi',
\ '',
\ '',
\ '',
\ '',
\ '',
\ ],
\ ],
\ ale#util#GetMatches(
\ [
\ '/path/to/some-filename.js:47:14: Missing trailing comma. [Warning/comma-dangle]',
\ '/path/to/some-filename.js:56:41: Missing semicolon. [Error/semi]',
\ ],
\ '^.*:\(\d\+\):\(\d\+\): \(.\+\) \[\(.\+\)\]$'
\ )
Execute (ale#util#GetMatches should accept a single line as a string):
AssertEqual
\ [
\ [
\ '/path/to/some-filename.js:47:14: Missing trailing comma. [Warning/comma-dangle]',
\ '47',
\ '14',
\ 'Missing trailing comma.',
\ 'Warning/comma-dangle',
\ '',
\ '',
\ '',
\ '',
\ '',
\ ],
\ ],
\ ale#util#GetMatches(
\ '/path/to/some-filename.js:47:14: Missing trailing comma. [Warning/comma-dangle]',
\ [
\ '^.*:\(\d\+\):\(\d\+\): \(.\+\) \[\(.\+\)\]$',
\ ]
\ )
Execute (ale#util#GetMatches should match multiple patterns correctly):
AssertEqual
\ [
\ [
\ '/path/to/some-filename.js:47:14: Missing trailing comma. [Warning/comma-dangle]',
\ '47',
\ '14',
\ 'Missing trailing comma.',
\ 'Warning/comma-dangle',
\ '',
\ '',
\ '',
\ '',
\ '',
\ ],
\ [
\ '/path/to/some-filename.js:56:41: Missing semicolon. [Error/semi]',
\ '56',
\ '41',
\ 'Missing semicolon.',
\ 'Error/semi',
\ '',
\ '',
\ '',
\ '',
\ '',
\ ],
\ [
\ '/path/to/some-filename.js:13:3: Parsing error: Unexpected token',
\ '13',
\ '3',
\ 'Parsing error: Unexpected token',
\ '',
\ '',
\ '',
\ '',
\ '',
\ '',
\ ],
\ ],
\ ale#util#GetMatches(
\ [
\ '/path/to/some-filename.js:47:14: Missing trailing comma. [Warning/comma-dangle]',
\ '/path/to/some-filename.js:56:41: Missing semicolon. [Error/semi]',
\ '/path/to/some-filename.js:13:3: Parsing error: Unexpected token',
\ ],
\ [
\ '^.*:\(\d\+\):\(\d\+\): \(.\+\) \[\(.\+\)\]$',
\ '^.*:\(\d\+\):\(\d\+\): \(.\+\)$',
\ ]
\ )