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

Merge remote-tracking branch 'adamchristiansen/gitignore-highlighting'

Browse Source
This commit is contained in:
Maxime Coste 2022-05-10 22:36:44 +10:00
commit a28dd16b2e
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rc/filetype/git.kak
View File

@ -10,11 +10,15 @@ hook global BufCreate .*(\.git(config|modules)|git/config) %{
set-option buffer filetype ini set-option buffer filetype ini
} }
hook global BufCreate .*\.gitignore %{
set-option buffer filetype git-ignore
}
hook global BufCreate .*git-rebase-todo %{ hook global BufCreate .*git-rebase-todo %{
set-option buffer filetype git-rebase set-option buffer filetype git-rebase
} }
hook global WinSetOption filetype=git-(commit|notes|rebase) %{ hook global WinSetOption filetype=git-(commit|ignore|notes|rebase) %{
require-module "git-%val{hook_param_capture_1}" require-module "git-%val{hook_param_capture_1}"
} }
@ -23,6 +27,11 @@ hook -group git-commit-highlight global WinSetOption filetype=git-commit %{
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-commit } hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-commit }
} }
hook -group git-ignore-highlight global WinSetOption filetype=git-ignore %{
add-highlighter window/git-ignore ref git-ignore
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-ignore }
}
hook -group git-notes-highlight global WinSetOption filetype=git-notes %{ hook -group git-notes-highlight global WinSetOption filetype=git-notes %{
add-highlighter window/git-notes ref git-notes add-highlighter window/git-notes ref git-notes
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-notes } hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-notes }
@ -33,7 +42,6 @@ hook -group git-rebase-highlight global WinSetOption filetype=git-rebase %{
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-rebase } hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-rebase }
} }
provide-module git-commit %{ provide-module git-commit %{
require-module diff require-module diff
add-highlighter shared/git-commit regions add-highlighter shared/git-commit regions
@ -43,6 +51,13 @@ add-highlighter shared/git-commit/comments/ fill comment
add-highlighter shared/git-commit/comments/ regex "\b(?:(modified)|(deleted)|(new file)|(renamed|copied)):([^\n]*)$" 1:yellow 2:red 3:green 4:blue 5:magenta add-highlighter shared/git-commit/comments/ regex "\b(?:(modified)|(deleted)|(new file)|(renamed|copied)):([^\n]*)$" 1:yellow 2:red 3:green 4:blue 5:magenta
} }
provide-module git-ignore %{
add-highlighter shared/git-ignore group
add-highlighter shared/git-ignore/glob regex '(?<!\\)(?:\\\\)*\K(\*\*?|\?|\[.*?(?<!\\)(?:\\\\)*\])' 0:operator
add-highlighter shared/git-ignore/negate regex '^!' 0:operator
add-highlighter shared/git-ignore/comments regex '^#.*?$' 0:comment
}
provide-module git-notes %{ provide-module git-notes %{
add-highlighter shared/git-notes regex ^#[^\n]*$ 0:comment add-highlighter shared/git-notes regex ^#[^\n]*$ 0:comment
} }