vim/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #549 - escape strings more appropriately for use with cmd /c

Browse Source
This commit is contained in:
w0rp 2017-05-26 00:06:16 +01:00
parent fb07971290
commit c89587785b
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
autoload/ale.vim
View File

@ -135,14 +135,26 @@ function! ale#Set(variable_name, default) abort
return l:value return l:value
endfunction endfunction
function! s:EscapePercents(str) abort
return substitute(a:str, '%', '%%', 'g')
endfunction
" Escape a string suitably for each platform. " Escape a string suitably for each platform.
" shellescape does not work on Windows. " shellescape does not work on Windows.
function! ale#Escape(str) abort function! ale#Escape(str) abort
if fnamemodify(&shell, ':t') ==? 'cmd.exe' if fnamemodify(&shell, ':t') ==? 'cmd.exe'
" FIXME: Fix shell escaping for Windows. if a:str =~# '\v^[a-zA-Z0-9-_\\/:%]+$'
return fnameescape(a:str) return s:EscapePercents(a:str)
else endif
" An extra space is used here to disable the custom-checks.
return shellescape (a:str) if a:str =~# ' '
return '"'
\ . substitute(s:EscapePercents(a:str), '"', '""', 'g')
\ . '"'
endif
return s:EscapePercents(substitute(a:str, '\v([&|<>^])', '^\1', 'g'))
endif endif
return shellescape (a:str)
endfunction endfunction

42
test/test_windows_escaping.vader Normal file
View File

@ -0,0 +1,42 @@
Before:
Save &shell
let &shell = 'cmd.exe'
After:
Restore
Execute(ale#Escape for cmd.exe should allow not escape paths without special characters):
AssertEqual 'C:', ale#Escape('C:')
AssertEqual 'C:\', ale#Escape('C:\')
AssertEqual 'python', ale#Escape('python')
AssertEqual 'C:\foo\bar', ale#Escape('C:\foo\bar')
AssertEqual '/bar/baz', ale#Escape('/bar/baz')
AssertEqual 'nul', ale#Escape('nul')
AssertEqual '''foo''', ale#Escape('''foo''')
Execute(ale#Escape for cmd.exe should escape Windows paths with spaces appropriately):
AssertEqual '"C:\foo bar\baz"', ale#Escape('C:\foo bar\baz')
AssertEqual '"^foo bar^"', ale#Escape('^foo bar^')
AssertEqual '"&foo bar&"', ale#Escape('&foo bar&')
AssertEqual '"|foo bar|"', ale#Escape('|foo bar|')
AssertEqual '"<foo bar<"', ale#Escape('<foo bar<')
AssertEqual '">foo bar>"', ale#Escape('>foo bar>')
AssertEqual '"^foo bar^"', ale#Escape('^foo bar^')
AssertEqual '"''foo'' ''bar''"', ale#Escape('''foo'' ''bar''')
Execute(ale#Escape for cmd.exe should use caret escapes on special characters):
AssertEqual '^^foo^^', ale#Escape('^foo^')
AssertEqual '^&foo^&', ale#Escape('&foo&')
AssertEqual '^|foo^|', ale#Escape('|foo|')
AssertEqual '^<foo^<', ale#Escape('<foo<')
AssertEqual '^>foo^>', ale#Escape('>foo>')
AssertEqual '^^foo^^', ale#Escape('^foo^')
AssertEqual '''foo''^^''bar''', ale#Escape('''foo''^''bar''')
Execute(ale#Escape for cmd.exe should escape percent characters):
AssertEqual '%%foo%%', ale#Escape('%foo%')
AssertEqual 'C:\foo%%\bar\baz%%', ale#Escape('C:\foo%\bar\baz%')
AssertEqual '"C:\foo bar%%\baz%%"', ale#Escape('C:\foo bar%\baz%')
AssertEqual '^^%%foo%%', ale#Escape('^%foo%')
AssertEqual '"^%%foo%% %%bar%%"', ale#Escape('^%foo% %bar%')
AssertEqual '"^%%foo%% %%bar%% """""', ale#Escape('^%foo% %bar% ""')