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.

Sign up for GitHub

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

Jump to bottom

Issues 1432 #3002

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Issues 1432 #3002

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
42f48ba
WIP: Fix :Buffers.
Adnn Oct 12, 2022
58a340c
Fix for git-bash by specially detecting it, fix regressiong on cmd.exe.
Adnn Oct 12, 2022
1c1fde6
Revert to the master state at the root of this branch.
Adnn Oct 19, 2022
25df6f3
Attempt the proposal to treat git-bash like a Unix shell environment.
Adnn Oct 19, 2022
ab0ba4f
Add missing parentheses in is_win condition.
Adnn Oct 19, 2022
f729a56
Previous attempts failed. Scope the change more tightly.
Adnn Oct 19, 2022
6aa4ed8
Revert shellescape behaviour, explicitly avoid escaping on :Buffers.
Adnn Oct 19, 2022
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
6 changes: 5 additions & 1 deletion plugin/fzf.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ endif
let g:loaded_fzf = 1

let s:is_win = has('win32') || has('win64')
" On Windows, cmd.exe does not define a `SHELL` env var, whereas git-bash does.
let s:is_win_cmd = s:is_win && !exists('$SHELL')
if s:is_win && &shellslash
set noshellslash
let s:base_dir = expand('<sfile>:h:h')
Expand Down Expand Up @@ -484,7 +486,9 @@ try
elseif type == 3
let temps.input = s:fzf_tempname()
call s:writefile(source, temps.input)
let source_command = (s:is_win ? 'type ' : 'cat ').fzf#shellescape(temps.input)
" Disable shell escape for git bash, as it breaks the command here
let source_command = (s:is_win_cmd ? 'type ' : 'cat ')
\.(!s:is_win || !exists('$SHELL') ? fzf#shellescape(temps.input) : substitute(temps.input, '\', '/', 'g'))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we still shellescape (not fzf#shellescape) temps.input for safety?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The expression is getting a bit too complicated. How about splitting it into if-else statements?

if !s:is_win
  let source_command = ...
elseif exists('$SHELL')
  " Git bash
  let source_command = ...
else
  " cmd.exe
  let source_command = ...
end

else
throw 'Invalid source type'
endif
Expand Down