From ed04395d37f15fe9670df82959ccf78fda1ab844 Mon Sep 17 00:00:00 2001 From: demostanis Date: Sat, 17 Sep 2022 10:33:18 +0200 Subject: [PATCH] show preview even without query in kamp-grep --- scripts/kamp-grep | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) mode change 100755 => 100644 scripts/kamp-grep diff --git a/scripts/kamp-grep b/scripts/kamp-grep old mode 100755 new mode 100644 index 836bd6a..72ea2d3 --- a/scripts/kamp-grep +++ b/scripts/kamp-grep @@ -42,6 +42,11 @@ else export FZF_DEFAULT_COMMAND="$rg_cmd -- '$query'" fi +preview_cmd='bat \ + --terminal-width $FZF_PREVIEW_COLUMNS \ + --style=numbers \ + --color=always' + fzf \ --phony \ --query "${query:-}" \ @@ -51,12 +56,13 @@ fzf \ --bind 'enter:execute(kamp edit {1} +{2}:{3})+abort' \ --preview ' highlight_line={2} - line_range_begin=$((highlight_line - (FZF_PREVIEW_LINES / 2))) - bat \ - --terminal-width $FZF_PREVIEW_COLUMNS \ - --style=numbers \ - --color=always \ - --line-range "$((line_range_begin < 0 ? 1 : line_range_begin)):+$FZF_PREVIEW_LINES" \ - --highlight-line {2} {1} 2> /dev/null' \ + if [ ! -z "${highlight_line##*[!0-9]*}" ]; then + line_range_begin=$((highlight_line - (FZF_PREVIEW_LINES / 2))) + '"$preview_cmd"' \ + --line-range "$((line_range_begin < 0 ? 1 : line_range_begin)):+$FZF_PREVIEW_LINES" \ + --highlight-line {2} {1} 2>/dev/null + else + '"$preview_cmd"' {1} 2>/dev/null + fi' \ --header 'type to grep' \ --prompt 'grep> '