averello/vim-lsp-settings-mirror
1
0
Fork 0
mirror of https://github.com/mattn/vim-lsp-settings.git synced 2025-12-12 20:35:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not use shellescape for escaping strings in execute-commands.

Browse Source
This commit is contained in:
Yasuhiro Matsumoto
2021-12-23 18:00:05 +09:00
committed by mattn
parent d965f232e5
commit c99252b814
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/lsp_settings.vim
View File

@@ -400,10 +400,10 @@ function! s:vim_lsp_install_server(ft, command, bang) abort
call lsp_settings#utils#msg('Installing ' . l:entry[0]) call lsp_settings#utils#msg('Installing ' . l:entry[0])
if has('nvim') if has('nvim')
split new split new
call termopen(shellescape(l:entry[1]), {'cwd': l:server_install_dir, 'on_exit': function('s:vim_lsp_install_server_post', [l:entry[0]])}) | startinsert call termopen(lsp_settings#utils#shellescape(l:entry[1]), {'cwd': l:server_install_dir, 'on_exit': function('s:vim_lsp_install_server_post', [l:entry[0]])}) | startinsert
else else
if has('win32') if has('win32')
let l:bufnr = term_start(shellescape(l:entry[1]), {'cwd': l:server_install_dir}) let l:bufnr = term_start(lsp_settings#utils#shellescape(l:entry[1]), {'cwd': l:server_install_dir})
else else
let l:bufnr = term_start(l:entry[1], {'cwd': l:server_install_dir}) let l:bufnr = term_start(l:entry[1], {'cwd': l:server_install_dir})
endif endif

5
autoload/lsp_settings/utils.vim
View File

@@ -154,3 +154,8 @@ endfunction
function! lsp_settings#utils#extend(lhs, rhs) abort function! lsp_settings#utils#extend(lhs, rhs) abort
return s:extend(a:lhs, a:rhs) return s:extend(a:lhs, a:rhs)
endfunction endfunction
function! lsp_settings#utils#shellescape(path) abort
let l:quote = &shellxquote == '"' ? "'" : '"'
return l:quote .. a:path .. l:quote
endfunction

2
settings/pyls-ms.vim
View File

@@ -13,7 +13,7 @@ augroup vim_lsp_settings_pyls_ms
\ 'InterpreterPath': lsp_settings#get('pyls-ms', 'python-path', {key, name->exepath('python')}), \ 'InterpreterPath': lsp_settings#get('pyls-ms', 'python-path', {key, name->exepath('python')}),
\ 'UseDefaultDatabase': v:true, \ 'UseDefaultDatabase': v:true,
\ 'Version': lsp_settings#get('pyls-ms', 'python-ver', {key, name->trim(matchstr(system( \ 'Version': lsp_settings#get('pyls-ms', 'python-ver', {key, name->trim(matchstr(system(
\ shellescape(lsp_settings#get('pyls-ms', 'python-path', {key, name->exepath('python')})) . ' -V' \ lsp_settings#utils#shellescape(lsp_settings#get('pyls-ms', 'python-path', {key, name->exepath('python')})) . ' -V'
\ ), '\s\zs\S\+'))}), \ ), '\s\zs\S\+'))}),
\ }, \ },
\ }, \ },