Skip to content

Quiet Light theme diff syntax highlighting#107926

Merged
aeschli merged 2 commits intomicrosoft:masterfrom
alisonnoyes:master
Nov 27, 2020
Merged

Quiet Light theme diff syntax highlighting#107926
aeschli merged 2 commits intomicrosoft:masterfrom
alisonnoyes:master

Conversation

@alisonnoyes
Copy link
Contributor

@alisonnoyes alisonnoyes commented Oct 1, 2020

This PR fixes #106707. Added colors for diff deletions, insertions, and changes in the Quiet Light theme.

@ghost
Copy link

ghost commented Oct 1, 2020 •
edited by ghost
Loading

CLA assistant check
All CLA requirements met.

@jspenguin2017
Copy link

jspenguin2017 commented Oct 1, 2020

Hi @alisonnoyes and @aeschli , thank you for looking into this (I'm the reporter of the issue, thanks for making the PR, I didn't have time), I think there are a few other scopes that need override (header and the + and - punctuations). For reference, this is what I have in my personal settings.json:

  "editor.tokenColorCustomizations": {
    "[Quiet Light]": {
      "textMateRules": [
        {
          "name": "Diff: Header (Color From Solarized Light)",
          "scope": [
            "meta.diff.header",
            "meta.diff.header.from-file",
            "meta.diff.header.to-file",
            "meta.diff.range",
            "punctuation.definition.from-file.diff",
            "punctuation.definition.range.diff",
            "punctuation.definition.to-file.diff"
          ],
          "settings": {
            "fontStyle": "italic",
            "foreground": "#268bd2"
          }
        },
        {
          "name": "Diff: Only In (Color From Solarized Light)",
          "scope": "meta.diff.only-in",
          "settings": {
            "foreground": "#268bd2"
          }
        },
        {
          "name": "Diff: Deleted (Color From Solarized Light)",
          "scope": [
            "markup.deleted",
            "punctuation.definition.deleted.diff"
          ],
          "settings": {
            "foreground": "#dc322f"
          }
        },
        {
          "name": "Diff: Inserted (Color From Solarized Light)",
          "scope": [
            "markup.inserted",
            "punctuation.definition.inserted.diff"
          ],
          "settings": {
            "foreground": "#219186"
          }
        }
      ]
    }
  },

@aeschli aeschli requested a review from miguelsolorio October 2, 2020 06:21
miguelsolorio
miguelsolorio suggested changes Oct 5, 2020
View reviewed changes
Copy link
Contributor

@miguelsolorio miguelsolorio left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd just add punctuation.definition.from-file.diff and punctuation.definition.to-file.diff and use one of the existing blue colors like #4B69C6:

image

Sample:

		{
			"name": "Extra: Diff From",
			"scope": ["meta.diff.header.from-file", "punctuation.definition.from-file.diff"],
			"settings": {
				"foreground": "#4B69C6"
			}
		},
		{
			"name": "Extra: Diff To",
			"scope": ["meta.diff.header.to-file", "punctuation.definition.to-file.diff"],
			"settings": {
				"foreground": "#4B69C6"
			}
		},

Besides that this looks good 👍

@aeschli aeschli added this to the November 2020 milestone Nov 27, 2020
@aeschli aeschli merged commit e24ea5e into microsoft:master Nov 27, 2020
@aeschli
Copy link
Contributor

aeschli commented Nov 27, 2020

Pushed the PR and I will also commit the changes as suggested by @misolori

aeschli added a commit that referenced this pull request Nov 27, 2020
@aeschli
Improve quiet light diff syntax highlighting. For #107926
444f79c
@github-actions github-actions bot locked and limited conversation to collaborators Jan 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@miguelsolorio miguelsolorio miguelsolorio requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

@aeschli aeschli

Labels

None yet

Projects

None yet

Milestone

November 2020

Development

Successfully merging this pull request may close these issues.

[themes] Diff highlighting breaks with Quiet Light theme

4 participants

@alisonnoyes @jspenguin2017 @aeschli @miguelsolorio