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

change ripgrep to native fzf #279

Merged
merged 5 commits into from
Sep 30, 2024
Merged

change ripgrep to native fzf #279

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19bdd11
Fix `Invoke-PsFzfRipgrep` throws `unknown action: change-prompt` afte…
kelleyma49 Sep 23, 2024
bb987d1
Fix debug output
kelleyma49 Sep 23, 2024
744287b
Use fzf directly instead of PowerShell function
kelleyma49 Sep 30, 2024
b6faa3b
Properly detect if git is installed using scoop regardless of scope (…
kborowinski Sep 26, 2024
bbd4292
Merge branch 'master' into change-ripgrep-to-native-fzf
kelleyma49 Sep 30, 2024
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
24 changes: 13 additions & 11 deletions PSFzf.Functions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,23 +337,25 @@ function Invoke-PsFzfRipgrep() {
$env:FZF_DEFAULT_COMMAND = '{0} $(printf %q "{1}")' -f $RG_PREFIX, $INITIAL_QUERY
}
$fzfArguments = @{
Ansi = $true
Disabled = $true
Color = "hl:-1:underline,hl+:-1:underline:reverse"
Query = $INITIAL_QUERY
Prompt = 'ripgrep> '
Delimiter = ':'
Header = '? CTRL-R (Ripgrep mode) ? CTRL -F (fzf mode) ?'
Preview = 'bat --color=always {1} --highlight-line {2}'
PreviewWindow = 'up,60%,border-bottom,+{2}+3/3,~3'
color = "hl:-1:underline,hl+:-1:underline:reverse"
query = $INITIAL_QUERY
prompt = 'ripgrep> '
delimiter = ':'
header = '? CTRL-R (Ripgrep mode) ? CTRL -F (fzf mode) ?'
preview = 'bat --color=always {1} --highlight-line {2}'
'preview-window' = 'up,60%,border-bottom,+{2}+3/3,~3'
}

$fzfArgs = ($fzfArguments.GetEnumerator() | foreach-object { "--{0}=""{1}""" -f $_.Key, $_.Value }) -join ' '

$Bind = @(
'ctrl-r:unbind(change,ctrl-r)+change-prompt(ripgrep> )' + "+disable-search+reload($RG_PREFIX {q} || $trueCmd)+rebind(change,ctrl-f)"
'ctrl-r:unbind(change,ctrl-r)+change-prompt(ripgrep> )' + "+disable-search+reload($RG_PREFIX {q} || $trueCmd)+rebind(change,ctrl-f)"
)
$Bind += 'ctrl-f:unbind(change,ctrl-f)+change-prompt(fzf> )+enable-search+clear-query+rebind(ctrl-r)'
$Bind += "change:reload:$sleepCmd $RG_PREFIX {q} || $trueCmd"
$fzfArgs += ' --ansi --disabled ' + ($Bind | foreach-object { "--bind=""{0}""" -f $_ }) -join ' '

Invoke-Fzf @fzfArguments -Bind $Bind | ForEach-Object { $results += $_ }
Invoke-Expression -Command $('{0} {1}' -f $script:FzfLocation, $fzfArgs) | ForEach-Object { $results += $_ }

# we need this here to prevent the editor launch from inherting FZF_DEFAULT_COMMAND from being overwritten (see #267):
if ($script:OverrideFzfDefaultCommand) {
Expand Down