From bf1aa8876c5e9e7ccf6ab4ae66997c45ac3c4b95 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Tue, 28 Jun 2022 20:59:03 -0500 Subject: [PATCH] git-commit: fix highlight edge cases * branch message with current branch and diverged branch has been added to the parser * scissors used in verbose commits are marked as a punctuation delimiter * we could use comment instead since they're visually the same but IMO this works better --- languages.toml | 2 +- runtime/queries/git-commit/highlights.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/languages.toml b/languages.toml index b8581080a..122cadfe8 100644 --- a/languages.toml +++ b/languages.toml @@ -908,7 +908,7 @@ indent = { tab-width = 2, unit = " " } [[grammar]] name = "git-commit" -source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev = "7ae23de633de41f8f5b802f6f05b6596df6d00c1" } +source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev = "318dd72abfaa7b8044c1d1fbeabcd06deaaf038f" } [[language]] name = "git-diff" diff --git a/runtime/queries/git-commit/highlights.scm b/runtime/queries/git-commit/highlights.scm index 0b50d4190..bdb776d6d 100644 --- a/runtime/queries/git-commit/highlights.scm +++ b/runtime/queries/git-commit/highlights.scm @@ -10,5 +10,5 @@ (change kind: "modified" @diff.delta) (change kind: "renamed" @diff.delta.moved) -[":" "->"] @punctuation.delimeter +[":" "->" (scissors)] @punctuation.delimeter (comment) @comment