wesbos/cobalt2-vscode

Git merge/rebase conflict resolution does not highlight #180

Open

#168 opened on Nov 10, 2020

View on GitHubContributor guide
 (3 comments) (0 reactions) (0 assignees) (248 forks)github user discovery
good first issuehelp wanted

Repository metrics

Stars
 (804 stars)
PR merge metrics
 (No merged PRs in 30d)

Description

In Cobalt 2, git conflicts are not highlighted. See the screenshot below: Screen Shot 2020-11-10 at 10 03 15 AM

In other themes, conflicts are highlighted and easily recognizable. See the screenshot below, this was taken with the theme Monakai. Screen Shot 2020-11-10 at 10 03 52 AM

Contributor guide

Research direction
Examine the theme's TextMate grammar or semantic token settings for merge conflict regions in the Cobalt2 VS Code theme. Compare with themes that highlight conflicts correctly to identify missing colors or scope selectors.
Tech stack
None
Domain
frontenddeveloper experience
Issue type
Bug
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
2
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-3 hours
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Mostly clear
Prerequisites
VS Codebasic theme development
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
70