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

Fix git-tools.kak highlighting

Browse Source
This commit is contained in:
Maxime Coste 2018-06-28 22:36:42 +10:00
parent 073b630e7a
commit 40211d1e3b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rc/extra/git-tools.kak
View File

@ -2,17 +2,17 @@ declare-option -docstring "name of the client in which documentation is to be di
str docsclient str docsclient
hook -group git-log-highlight global WinSetOption filetype=git-log %{ hook -group git-log-highlight global WinSetOption filetype=git-log %{
add-highlighter window group git-log-highlight add-highlighter window/git-log-highlight group
add-highlighter window/git-log-highlight regex '^(commit) ([0-9a-f]+)$' 1:yellow 2:red add-highlighter window/git-log-highlight/ regex '^(commit) ([0-9a-f]+)$' 1:yellow 2:red
add-highlighter window/git-log-highlight regex '^([a-zA-Z_-]+:) (.*?)$' 1:green 2:magenta add-highlighter window/git-log-highlight/ regex '^([a-zA-Z_-]+:) (.*?)$' 1:green 2:magenta
add-highlighter window/git-log-highlight ref diff # highlight potential diffs from the -p option add-highlighter window/git-log-highlight/ ref diff # highlight potential diffs from the -p option
} }
hook -group git-log-highlight global WinSetOption filetype=(?!git-log).* %{ remove-highlighter window/git-log-highlight } hook -group git-log-highlight global WinSetOption filetype=(?!git-log).* %{ remove-highlighter window/git-log-highlight }
hook -group git-status-highlight global WinSetOption filetype=git-status %{ hook -group git-status-highlight global WinSetOption filetype=git-status %{
add-highlighter window group git-status-highlight add-highlighter window/git-status-highlight group
add-highlighter window/git-status-highlight regex '^\h+(?:((?:both )?modified:)|(added:|new file:)|(deleted(?: by \w+)?:)|(renamed:)|(copied:))(?:.*?)$' 1:yellow 2:green 3:red 4:cyan 5:blue 6:magenta add-highlighter window/git-status-highlight/ regex '^\h+(?:((?:both )?modified:)|(added:|new file:)|(deleted(?: by \w+)?:)|(renamed:)|(copied:))(?:.*?)$' 1:yellow 2:green 3:red 4:cyan 5:blue 6:magenta
} }
hook -group git-status-highlight global WinSetOption filetype=(?!git-status).* %{ remove-highlighter window/git-status-highlight } hook -group git-status-highlight global WinSetOption filetype=(?!git-status).* %{ remove-highlighter window/git-status-highlight }
@ -63,7 +63,7 @@ Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-
run_git_blame() { run_git_blame() {
( (
printf %s "evaluate-commands -client '$kak_client' %{ printf %s "evaluate-commands -client '$kak_client' %{
try %{ add-highlighter window flag_lines GitBlame git_blame_flags } try %{ add-highlighter window/git-blame flag_lines GitBlame git_blame_flags }
set-option buffer=$kak_bufname git_blame_flags '$kak_timestamp' set-option buffer=$kak_bufname git_blame_flags '$kak_timestamp'
}" | kak -p ${kak_session} }" | kak -p ${kak_session}
git blame "$@" --incremental ${kak_buffile} | awk ' git blame "$@" --incremental ${kak_buffile} | awk '
@ -181,7 +181,7 @@ Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-
hide-blame) hide-blame)
printf %s "try %{ printf %s "try %{
set-option buffer=$kak_bufname git_blame_flags '' set-option buffer=$kak_bufname git_blame_flags ''
remove-highlighter window/hlflags_git_blame_flags remove-highlighter window/git-blame
}" }"
;; ;;
show-diff) show-diff)