prolog/swipl: update error format for new version

A recent(?) update to swipl changed the error format from

  Warning: some.pl:2:
              Singleton variables: [Y]

to

  Warning: some.pl:2:
  Warning:    Singleton variables: [Y]

The old error handler doesn't report the correct line numbers and
messages on the old format.

I've chosen to add a function that covers the second case and detect it,
rather than rewrite the current function. This way, both versions should
be able to live together.

---

Example file that demonstrates the issue (some.pl above):
```
% vim: ft=prolog
ii(X, Y) :- X.
```

---
This commit is contained in:
D. Ben Knoble 2020-10-01 12:49:53 -04:00
parent 08295ce174
commit abe1440268
1 changed files with 27 additions and 2 deletions

View File

@ -34,13 +34,13 @@ function! s:Subst(format, vars) abort
return substitute(a:format, '%\(.\)', '\=get(l:vars, submatch(1), "")', 'g') return substitute(a:format, '%\(.\)', '\=get(l:vars, submatch(1), "")', 'g')
endfunction endfunction
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:pattern = '\v^(ERROR|Warning)+%(:\s*[^:]+:(\d+)%(:(\d+))?)?:\s*(.*)$'
let l:output = [] let l:output = []
let l:i = 0 let l:i = 0
while l:i < len(a:lines) while l:i < len(a:lines)
let l:match = matchlist(a:lines[l:i], l:pattern) let l:match = matchlist(a:lines[l:i], s:pattern)
if empty(l:match) if empty(l:match)
let l:i += 1 let l:i += 1
@ -65,6 +65,11 @@ 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 matches = matchlist(next_line, s:pattern)
if !empty(matchlist) && empty(matches[2])
return s:GetContErrMsg(a:i+1, a:lines, a:text.matches[4])
endif
if a:text !~# '^\s*$' if a:text !~# '^\s*$'
return [a:i + 1, a:text] return [a:i + 1, a:text]
endif endif
@ -80,6 +85,26 @@ 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
if a:text !~# '^\s*$'
return [a:i + 1, a:text]
endif
let l:i = a:i + 1
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])
break
end
call add(l:text, s:Trim(matches[4]))
let l:i += 1
endwhile
return [l:i, join(l:text, '. ')]
endfunction
function! s:Trim(str) abort function! s:Trim(str) abort
return substitute(a:str, '\v^\s+|\s+$', '', 'g') return substitute(a:str, '\v^\s+|\s+$', '', 'g')
endfunction endfunction