Skip to content

Highlight tags and branch names differently when they refer to the same commit#98

Open
BertrandSim wants to merge 4 commits intojunegunn:masterfrom
BertrandSim:syntax_meta_fix1
Open

Highlight tags and branch names differently when they refer to the same commit#98
BertrandSim wants to merge 4 commits intojunegunn:masterfrom
BertrandSim:syntax_meta_fix1

Conversation

@BertrandSim
Copy link

Hello! I noticed that when tags and head refs (such as branch names) are placed side by side on the same line, the tags and head refs are highlighted in the same way. They are either both highlighted with gvTag, or both with gvMeta.

For example, in

* 2021-07-23 f806b8a (tag: 0.0.0.9000, origin/master, origin/HEAD, master) msg (commiter)

both tag: 0.0.0.9000 and master match gvTag.

And in

* 2021-07-23 f806b8a (master, tag: 0.0.0.9000) msg (commiter)

both tag: 0.0.0.9000 and master match gvMeta.

This PR aims to fix this in the following way:

  • If a tag is placed with another ref, highlight tag: xxx with gvTag, and the parentheses and its other contents (...)with gvMeta,
  • If a tag is the only ref, highlight the parentheses and the tag (tag: xxx) with gvTag.

Bertrand Sim added 4 commits August 31, 2021 15:05
when tags and branch names are shown next to each other,
they are _both_ highlighted with gvTag, or with gvMeta
eg (tag: 0.0.0.9000, origin/master, origin/HEAD, master)
eg (origin/master, origin/HEAD, master, tag: 0.0.0.9000)

This commit fixes that: tags are highlighted with gvTag,
while branch names are highlighted with gvMeta
highlight opening ( and ) with gvMeta hl group
eg in (tag: 0.0.0.9000, origin/master, origin/HEAD, master)
the ( is highlighted with gvTag, but
) is highlighted with gvMeta

this commit highlights both ( and ) with gvMeta
In the previous commit,
lone tags such as (tag: feature)
have '(' and ')' highlighted with gvMeta,
while 'tag: feature' is highlighted with gvTag.
This looks odd.

Thus, the case of a single lone tag should be defined separately:
the '(' and ')' are included in the match, and
are highlighted with gvTag.
@BertrandSim
Copy link
Author

rebased on latest master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants