diff options
| author | D. Ben Knoble <ben.knoble+github@gmail.com> | 2020-10-01 13:10:28 -0400 |
|---|---|---|
| committer | D. Ben Knoble <ben.knoble+github@gmail.com> | 2020-10-01 13:12:18 -0400 |
| commit | e32d5fc03d159c659e8294bbe1656fafa77bfdda (patch) | |
| tree | 6634b11d18b54c84dd23a2d4b357133486315b52 /ale_linters/prolog | |
| parent | abe1440268799fd9fba38c71b8423f988523678e (diff) | |
| download | ale-e32d5fc03d159c659e8294bbe1656fafa77bfdda.zip | |
prolog/swipl: address linter feedback
This actually caught a bug where I forgot to rename the function
Diffstat (limited to 'ale_linters/prolog')
| -rw-r--r-- | ale_linters/prolog/swipl.vim | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ale_linters/prolog/swipl.vim b/ale_linters/prolog/swipl.vim index 70d967f7..5c5388d3 100644 --- a/ale_linters/prolog/swipl.vim +++ b/ale_linters/prolog/swipl.vim @@ -35,6 +35,7 @@ function! s:Subst(format, vars) abort endfunction let s:pattern = '\v^(ERROR|Warning)+%(:\s*[^:]+:(\d+)%(:(\d+))?)?:\s*(.*)$' + function! ale_linters#prolog#swipl#Handle(buffer, lines) abort let l:output = [] let l:i = 0 @@ -65,11 +66,13 @@ endfunction " This returns [<next line number>, <error message string>] function! s:GetErrMsg(i, lines, text) abort - let next_line = get(a:lines, a:i+1, '') - let matches = matchlist(next_line, s:pattern) - if !empty(matchlist) && empty(matches[2]) + let l:next_line = get(a:lines, a:i+1, '') + let l:matches = matchlist(l:next_line, s:pattern) + + if !empty(l:matches) && empty(l:matches[2]) return s:GetContErrMsg(a:i+1, a:lines, a:text.matches[4]) endif + if a:text !~# '^\s*$' return [a:i + 1, a:text] endif @@ -85,7 +88,7 @@ function! s:GetErrMsg(i, lines, text) abort return [l:i, join(l:text, '. ')] endfunction -function! s:GetErrMsg(i, lines, text) abort +function! s:GetContErrMsg(i, lines, text) abort if a:text !~# '^\s*$' return [a:i + 1, a:text] endif @@ -94,11 +97,12 @@ function! s:GetErrMsg(i, lines, text) abort let l:text = [] while l:i < len(a:lines) && a:lines[l:i] =~# s:pattern - let matches = matchlist(a:lines[l:i], s:pattern) - if !empty(matches[2]) + let l:matches = matchlist(a:lines[l:i], s:pattern) + + if !empty(l:matches[2]) break - end - call add(l:text, s:Trim(matches[4])) + endif + call add(l:text, s:Trim(l:matches[4])) let l:i += 1 endwhile |