diff options
| author | mattn | 2026-04-05 20:37:26 +0900 |
|---|---|---|
| committer | GitHub | 2026-04-05 20:37:26 +0900 |
| commit | 3739dcd638f457559d5a1ae1e398276175694e4b (patch) | |
| tree | b6a79e1c95ac15e7a9bb0d1e9e272a97cb6f3e83 | |
| parent | 86872f021c4e245e3c583054fda82fb820a2faee (diff) | |
| parent | 14a7c60f02b34d8ac2cd2de53a8765d08e362c5d (diff) | |
| download | ctrlp.vim-3739dcd638f457559d5a1ae1e398276175694e4b.tar.gz | |
fix: paths containing parentheses are not shown in powershell
| -rw-r--r-- | autoload/ctrlp.vim | 11 | ||||
| -rw-r--r-- | autoload/ctrlp/buffertag.vim | 2 | ||||
| -rw-r--r-- | autoload/ctrlp/utils.vim | 7 |
3 files changed, 17 insertions, 3 deletions
diff --git a/autoload/ctrlp.vim b/autoload/ctrlp.vim index 80dc9e4..3903edb 100644 --- a/autoload/ctrlp.vim +++ b/autoload/ctrlp.vim @@ -442,7 +442,7 @@ if has('patch-8.2-0995') && get(g:, 'ctrlp_use_readdir', 1) endt endfo let [dnf, depth] = [ctrlp#dirnfile(entries), a:depth + 1] - if &wig != '' | cal filter(dnf[1], 'glob(v:val) != ""') | en + if &wig != '' | cal filter(dnf[1], 'glob(ctrlp#utils#fnesc(v:val, "g")) != ""') | en let g:ctrlp_allfiles += dnf[1] if !empty(dnf[0]) && !s:maxf(len(g:ctrlp_allfiles)) && depth <= s:maxdepth sil! cal ctrlp#progress(len(g:ctrlp_allfiles), 1) @@ -540,10 +540,15 @@ fu! s:UserCmd(lscmd) if (has('win32') || has('win64')) && match(&shellcmdflag, "/") != -1 let lscmd = substitute(lscmd, '\v(^|\&\&\s*)\zscd (/d)@!', 'cd /d ', '') en - let path = exists('*shellescape') ? shellescape(path) : path + if (has('win32') || has('win64')) && &shell =~? '\vpowershell|pwsh' + let path = "'".substitute(path, "'", "''", 'g')."'" + el + let path = exists('*shellescape') ? shellescape(path) : path + en if (has('win32') || has('win64')) && match(&shell, 'sh') != -1 let path = tr(path, '\', '/') en + if s:usrcmdasync && (v:version >= 800 || has('nvim')) && (exists('*job_start') || exists('*jobstart')) cal s:stop_job_if_exists() let g:ctrlp_allfiles = [] @@ -581,7 +586,7 @@ fu! s:UserCmd(lscmd) let g:ctrlp_allfiles = ctrlp#dirnfile(g:ctrlp_allfiles)[1] en if &wig != '' - cal filter(g:ctrlp_allfiles, 'glob(v:val) != ""') + cal filter(g:ctrlp_allfiles, 'glob(ctrlp#utils#fnesc(v:val, "g")) != ""') en en endf diff --git a/autoload/ctrlp/buffertag.vim b/autoload/ctrlp/buffertag.vim index 4f75e6d..3eecddc 100644 --- a/autoload/ctrlp/buffertag.vim +++ b/autoload/ctrlp/buffertag.vim @@ -167,6 +167,8 @@ fu! s:esctagscmd(bin, args, ...) endif if &sh =~ 'cmd\.exe' let cmd = substitute(cmd, '[&()@^<>|]', '^\0', 'g') + elsei &sh =~? '\vpowershell\|pwsh' + let cmd = substitute(cmd, '[()]', '`\0', 'g') en if exists('+ssl') let &ssl = ssl diff --git a/autoload/ctrlp/utils.vim b/autoload/ctrlp/utils.vim index cfc9e6c..c238694 100644 --- a/autoload/ctrlp/utils.vim +++ b/autoload/ctrlp/utils.vim @@ -86,6 +86,13 @@ if exists('*fnameescape') let path = escape(a:path, '?*') en let path = substitute(path, '[', '[[]', 'g') + if (has('win32') || has('win64')) + if a:type == 'g' + let path = substitute(path, '(', '[(]', 'g') + elsei a:type == 'f' + let path = substitute(path, '\\(', '\\\\(', 'g') + en + en retu a:0 ? escape(path, a:1) : path endf el |