xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Anfid/hunk-seek-wrap'

Browse Source
This commit is contained in:
Maxime Coste 2020-03-15 12:35:50 +11:00
commit 329f291ae0
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
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,10 +229,26 @@ define-command -params 1.. \
fi fi
done done
if [ "$direction" = "next" ] && [ -n "$next_hunk" ]; then if [ "$direction" = "next" ]; then
echo "select $next_hunk.1,$next_hunk.1" if [ -z "$next_hunk" ]; then
elif [ "$direction" = "prev" ] && [ -n "$prev_hunk" ]; then next_hunk=${hunks%% *}
echo "select $prev_hunk.1,$prev_hunk.1" wrapped=true
fi
if [ -n "$next_hunk" ]; then
echo "select $next_hunk.1,$next_hunk.1"
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"
fi
fi
if [ "$wrapped" = true ]; then
echo "echo -markup '{Information}git hunk search wrapped around buffer'"
fi fi
} }