Update tree-sitter-git-rebase (#6030)

pull/6058/head
Skyler Hawthorne 2 years ago committed by GitHub
parent c5c1b5af34
commit 71220da139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,11 +1,36 @@
(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)
; 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)$"))
(option) @operator
(label) @string.special.symbol
(commit) @constant
"#" @punctuation.delimiter
(comment) @comment
(ERROR) @error
(comment) @comment

@ -1,4 +1,5 @@
((operation
operator: ["x" "exec"]
(command) @injection.content)
(#set! injection.language "bash"))
(((command) @attribute
(message)? @injection.content)
(#match? @attribute "^(x|exec)$")
(#set! injection.language "bash")
)

Loading…
Cancel
Save