Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle powershell unexpected token with newline #2588

Merged
merged 6 commits into from
Jun 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions ale_linters/powershell/powershell.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 changes: 47 additions & 0 deletions test/handler/test_powershell_handler.vader
Original file line number Diff line number Diff line change
Expand Up @@ -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'
\ ])