mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-11-24 07:53:41 +03:00
Code Issues Projects Releases Wiki Activity

rc git: Make git next/prev-hunk behavior consistent with search command

Browse Source
This commit is contained in:
Mikhail Pogretskiy 2020-03-11 13:56:28 +07:00
parent 6766297623
commit 8c7bb10e56
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rc/tools/git.kak
View File

@ -196,6 +196,7 @@ define-command -params 1.. \
shift shift
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
echo "fail 'no git hunks found'"
exit exit
fi fi
@ -212,6 +213,7 @@ define-command -params 1.. \
prev_line="$line" prev_line="$line"
done done
echo "set-option buffer git_hunk_list $hunks" echo "set-option buffer git_hunk_list $hunks"
hunks=${hunks#* }
else else
hunks=${kak_opt_git_hunk_list#* } hunks=${kak_opt_git_hunk_list#* }
fi fi
@ -227,11 +229,27 @@ define-command -params 1.. \
fi fi
done done
if [ "$direction" = "next" ] && [ -n "$next_hunk" ]; then if [ "$direction" = "next" ]; then
if [ -z "$next_hunk" ]; then
next_hunk=${hunks%% *}
wrapped=true
fi
if [ -n "$next_hunk" ]; then
echo "select $next_hunk.1,$next_hunk.1" echo "select $next_hunk.1,$next_hunk.1"
elif [ "$direction" = "prev" ] && [ -n "$prev_hunk" ]; then fi
elif [ "$direction" = "prev" ]; then
if [ -z "$prev_hunk" ]; then
wrapped=true
prev_hunk=${hunks##* }
fi
if [ -n "$prev_hunk" ]; then
echo "select $prev_hunk.1,$prev_hunk.1" echo "select $prev_hunk.1,$prev_hunk.1"
fi fi
fi
if [ "$wrapped" = true ]; then
echo "echo -markup '{Information}git hunk search wrapped around buffer'"
fi
} }
commit() { commit() {