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

Merge remote-tracking branch 'maximbaz/fix-highlighters'

Browse Source
This commit is contained in:
Maxime Coste 2018-07-08 15:57:10 +10:00
commit b3f9f533eb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rc/base/lint.kak
View File

@ -87,13 +87,13 @@ define-command -hidden lint-show-counters %{
}
define-command lint-enable -docstring "Activate automatic diagnostics of the code" %{
add-highlighter window flag_lines default lint_flags
add-highlighter window/lint flag_lines default lint_flags
hook window -group lint-diagnostics NormalIdle .* %{ lint-show }
hook window -group lint-diagnostics WinSetOption lint_flags=.* %{ info; lint-show }
}
define-command lint-disable -docstring "Disable automatic diagnostics of the code" %{
remove-highlighter window/hlflags_lint_flags
remove-highlighter window/lint
remove-hooks window lint-diagnostics
}

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

@ -2,20 +2,20 @@ declare-option -docstring "name of the client in which documentation is to be di
str docsclient
hook -group git-log-highlight global WinSetOption filetype=git-log %{
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 '^([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 group
add-highlighter window/git-log/ regex '^(commit) ([0-9a-f]+)$' 1:yellow 2:red
add-highlighter window/git-log/ regex '^([a-zA-Z_-]+:) (.*?)$' 1:green 2:magenta
add-highlighter window/git-log/ 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 }
hook -group git-status-highlight global WinSetOption filetype=git-status %{
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 group
add-highlighter window/git-status/ 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 }
declare-option -hidden line-specs git_blame_flags
declare-option -hidden line-specs git_diff_flags
@ -185,7 +185,7 @@ Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-
}"
;;
show-diff)
echo 'try %{ add-highlighter window flag_lines GitDiffFlags git_diff_flags }'
echo 'try %{ add-highlighter window/git-diff flag_lines GitDiffFlags git_diff_flags }'
update_diff
;;
update-diff) update_diff ;;