Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'runtime/queries/git-rebase/highlights.scm')
| -rw-r--r-- | runtime/queries/git-rebase/highlights.scm | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/runtime/queries/git-rebase/highlights.scm b/runtime/queries/git-rebase/highlights.scm index 5a03dadf..4f007037 100644 --- a/runtime/queries/git-rebase/highlights.scm +++ b/runtime/queries/git-rebase/highlights.scm @@ -1,36 +1,11 @@ -; a rough translation: -; * constant.builtin - git hash -; * constant - a git label -; * keyword - command that acts on commits commits -; * function - command that acts only on labels -; * comment - discarded commentary on a command, has no effect on the rebase -; * string - text used in the rebase operation -; * operator - a 'switch' (used in fixup and merge), either -c or -C at time of writing - -(((command) @keyword - (label) @constant.builtin - (message)? @comment) - (#match? @keyword "^(p|pick|r|reword|e|edit|s|squash|d|drop)$")) - -(((command) @function - (label) @constant - (message)? @comment) - (#match? @function "^(l|label|t|reset|u|update-ref)$")) - -((command) @keyword - (#match? @keyword "^(x|exec|b|break)$")) - -(((command) @attribute - (label) @constant.builtin - (message)? @comment) - (#match? @attribute "^(f|fixup)$")) - -(((command) @keyword - (label) @constant.builtin - (label) @constant - (message) @string) - (#match? @keyword "^(m|merge)$")) +(operation operator: ["p" "pick" "r" "reword" "e" "edit" "s" "squash" "m" "merge" "d" "drop" "b" "break" "x" "exec"] @keyword) +(operation operator: ["l" "label" "t" "reset"] @function) +(operation operator: ["f" "fixup"] @function.special) (option) @operator - +(label) @string.special.symbol +(commit) @constant +"#" @punctuation.delimiter (comment) @comment + +(ERROR) @error |