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

Handle powershell unexpected token with newline (#2588)

Browse source 
* Newline in unexpected token broke parser
* fixed test to properly capture regressions
* removed deprecated linter options for powershell
This commit is contained in:
Jesse Harris 2019-06-20 08:35:10 +10:00 committed by w0rp
parent d2c3141f26
commit 9ad8fd6a1b
2 changed files with 62 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ale_linters/powershell/powershell.vim
View file

@ -49,11 +49,19 @@ function! ale_linters#powershell#powershell#Handle(buffer, lines) abort
let l:matchcount = 1
endif
let l:item = {
\ 'lnum': str2nr(l:match[1]),
\ 'col': str2nr(l:match[2]),
\ 'type': 'E',
\}
" If the match is 0, it was a failed match
" probably due to an unexpected token which
" contained a newline. Reset matchcount. to
" continue to the next match
if !empty(l:match[1])
let l:item = {
\ 'lnum': str2nr(l:match[1]),
\ 'col': str2nr(l:match[2]),
\ 'type': 'E',
\}
else
let l:matchcount = 0
endif
elseif l:matchcount == 2
" Second match[0] grabs the full line in order
" to handles the text
@ -84,8 +92,8 @@ endfunction
call ale#linter#Define('powershell', {
\ 'name': 'powershell',
\ 'executable_callback': 'ale_linters#powershell#powershell#GetExecutable',
\ 'command_callback': 'ale_linters#powershell#powershell#GetCommand',
\ 'executable': function('ale_linters#powershell#powershell#GetExecutable'),
\ 'command': function('ale_linters#powershell#powershell#GetCommand'),
\ 'output_stream': 'stdout',
\ 'callback': 'ale_linters#powershell#powershell#Handle',
\})

47
test/handler/test_powershell_handler.vader
View file

@ -60,3 +60,50 @@ Execute(The powershell handler should process multiple syntax errors from parsin
\ '+ CategoryInfo : NotSpecified: (:) [], ParseException',
\ '+ FullyQualifiedErrorId : ParseException'
\ ])
Execute(The powershell handler should process unexecpected token that contains a newline character):
AssertEqual
\ [
\ {
\ 'lnum': 2,
\ 'col': 8,
\ 'type': 'E',
\ 'text': 'The string is missing the terminator: ".',
\ 'code': 'ParseException'
\ },
\ {
\ 'lnum': 2,
\ 'col': 8,
\ 'type': 'E',
\ 'text': 'Unexpected token ''"',
\ 'code': 'ParseException'
\ },
\ {
\ 'lnum': 1,
\ 'col': 1,
\ 'type': 'E',
\ 'text': 'Missing closing ''}'' in statement block or type definition.',
\ 'code': 'ParseException'
\ }
\ ],
\ ale_linters#powershell#powershell#Handle(bufnr(''), [
\ 'At line:2 char:8',
\ '+ "" "',
\ '+ ~',
\ 'The string is missing the terminator: ".',
\ 'At line:2 char:8',
\ '+ "" "',
\ '+ ~',
\ 'Unexpected token ''"',
\ '',
\ ' }'' in expression or statement.',
\ '',
\ 'At line:1 char:1',
\ '+ {',
\ '+ ~',
\ 'Missing closing ''}'' in statement block or type definition.',
\ 'At C:\Users\jpharris\AppData\Local\Temp\VIAA777.tmp\script.ps1:1 char:150',
\ '+ ... ontents); [void]$ExecutionContext.InvokeCommand.NewScriptBlock($Con ...',
\ '+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~',
\ ' + CategoryInfo : NotSpecified: (:) [], ParseException',
\ ' + FullyQualifiedErrorId : ParseException'
\ ])