marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

prolog/swipl: address linter feedback

Browse source 
This actually caught a bug where I forgot to rename the function
This commit is contained in:
D. Ben Knoble 2020-10-01 13:10:28 -04:00
parent abe1440268
commit e32d5fc03d
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ale_linters/prolog/swipl.vim
View file

@ -35,6 +35,7 @@ function! s:Subst(format, vars) abort
endfunction endfunction
let s:pattern = '\v^(ERROR|Warning)+%(:\s*[^:]+:(\d+)%(:(\d+))?)?:\s*(.*)$' let s:pattern = '\v^(ERROR|Warning)+%(:\s*[^:]+:(\d+)%(:(\d+))?)?:\s*(.*)$'
function! ale_linters#prolog#swipl#Handle(buffer, lines) abort function! ale_linters#prolog#swipl#Handle(buffer, lines) abort
let l:output = [] let l:output = []
let l:i = 0 let l:i = 0
@ -65,11 +66,13 @@ endfunction
" This returns [<next line number>, <error message string>] " This returns [<next line number>, <error message string>]
function! s:GetErrMsg(i, lines, text) abort function! s:GetErrMsg(i, lines, text) abort
let next_line = get(a:lines, a:i+1, '') let l:next_line = get(a:lines, a:i+1, '')
let matches = matchlist(next_line, s:pattern) let l:matches = matchlist(l:next_line, s:pattern)
if !empty(matchlist) && empty(matches[2])
if !empty(l:matches) && empty(l:matches[2])
return s:GetContErrMsg(a:i+1, a:lines, a:text.matches[4]) return s:GetContErrMsg(a:i+1, a:lines, a:text.matches[4])
endif endif
if a:text !~# '^\s*$' if a:text !~# '^\s*$'
return [a:i + 1, a:text] return [a:i + 1, a:text]
endif endif
@ -85,7 +88,7 @@ function! s:GetErrMsg(i, lines, text) abort
return [l:i, join(l:text, '. ')] return [l:i, join(l:text, '. ')]
endfunction endfunction
function! s:GetErrMsg(i, lines, text) abort function! s:GetContErrMsg(i, lines, text) abort
if a:text !~# '^\s*$' if a:text !~# '^\s*$'
return [a:i + 1, a:text] return [a:i + 1, a:text]
endif endif
@ -94,11 +97,12 @@ function! s:GetErrMsg(i, lines, text) abort
let l:text = [] let l:text = []
while l:i < len(a:lines) && a:lines[l:i] =~# s:pattern while l:i < len(a:lines) && a:lines[l:i] =~# s:pattern
let matches = matchlist(a:lines[l:i], s:pattern) let l:matches = matchlist(a:lines[l:i], s:pattern)
if !empty(matches[2])
if !empty(l:matches[2])
break break
end endif
call add(l:text, s:Trim(matches[4])) call add(l:text, s:Trim(l:matches[4]))
let l:i += 1 let l:i += 1
endwhile endwhile