Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion PSFzf.Functions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ function Invoke-PsFzfRipgrep() {
prompt = 'ripgrep> '
delimiter = ':'
header = '? CTRL-R (Ripgrep mode) ? CTRL -F (fzf mode) ?'
preview = 'bat --color=always {1} --highlight-line {2}'
preview = 'bat --no-config --color=always {1} --highlight-line {2}'
'preview-window' = 'up,60%,border-bottom,+{2}+3/3,~3'
}

Expand Down
2 changes: 1 addition & 1 deletion helpers/PsFzfTabExpansion-Parameter.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if ([System.Management.Automation.Cmdlet]::CommonParameters.Contains($parameter)
}
else {
if ($ansiCompatible -and $(Get-Command bat -ErrorAction Ignore)) {
Get-Help -Name $Command -Parameter $parameter | bat --language=markdown --color always --style=plain
Get-Help -Name $Command -Parameter $parameter | bat --no-config --language=markdown --color always --style=plain
}
else {
Get-Help -Name $Command -Parameter $parameter
Expand Down
6 changes: 3 additions & 3 deletions helpers/PsFzfTabExpansion-Preview.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (Test-Path $path -PathType Container) {
Write-Output "" # extra separator before git status
Push-Location $path
if ($ansiCompatible -and $(Get-Command bat -ErrorAction Ignore)) {
git log -1 2> $null | bat "--style=changes" --color always
git log -1 2> $null | bat --no-config "--style=changes" --color always
}
else {
git log -1 2> $null
Expand All @@ -35,7 +35,7 @@ if (Test-Path $path -PathType Container) {
elseif (Test-Path $path -PathType leaf) {
# use bat (https://github.com/sharkdp/bat) if it's available:
if ($ansiCompatible -and $(Get-Command bat -ErrorAction Ignore)) {
bat "--style=numbers,changes" --color always $path
bat --no-config "--style=numbers,changes" --color always $path
}
else {
Get-Content $path
Expand All @@ -46,7 +46,7 @@ elseif (($cmdResults = Get-Command $Item -ErrorAction Ignore)) {
if ($cmdResults) {
if ($cmdResults.CommandType -ne 'Application') {
if ($ansiCompatible -and $(Get-Command bat -ErrorAction Ignore)) {
Get-Help $Item | bat --language=markdown --color always --style=plain
Get-Help $Item | bat --no-config --language=markdown --color always --style=plain
}
else {

Expand Down