Skip to content

Commit

Permalink
all color themes: treat comment docstrings as comments too (#182162)
Browse files Browse the repository at this point in the history 
* monokai-color-theme.json: treat Python comment string blocks

...as comments too

* Update *all* themes to consider Python block string comments as comments

	modified:   extensions/theme-abyss/themes/abyss-color-theme.json
	modified:   extensions/theme-defaults/themes/dark_vs.json
	modified:   extensions/theme-defaults/themes/hc_black.json
	modified:   extensions/theme-defaults/themes/hc_light.json
	modified:   extensions/theme-defaults/themes/light_vs.json
	modified:   extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
	modified:   extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
	modified:   extensions/theme-monokai/themes/monokai-color-theme.json
	modified:   extensions/theme-quietlight/themes/quietlight-color-theme.json
	modified:   extensions/theme-red/themes/Red-color-theme.json
	modified:   extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
	modified:   extensions/theme-solarized-light/themes/solarized-light-color-theme.json
	modified:   extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json

* Update all changes to use "string.quoted.docstring"

...instead of "string.quoted.docstring.multi.python", per
@aeschli's request here:
#182162 (comment)

This way the comment formatting applies to *all* language quoted
docstrings, instead of just to Python.

* bring back python colorize tests

---------

Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
  • Loading branch information
@ElectricRCAircraftGuy @aeschli
ElectricRCAircraftGuy and aeschli committed May 15, 2023
1 parent 8c6f7df commit b436869
Show file tree
Hide file tree
Showing 17 changed files with 2,616 additions and 1,568 deletions.
7 changes: 5 additions & 2 deletions extensions/theme-abyss/themes/abyss-color-theme.json
View file
Expand Up @@ -17,8 +17,11 @@
}
},
{
"name": "Comment",
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"foreground": "#384887"
}
Expand Down
6 changes: 5 additions & 1 deletion extensions/theme-defaults/themes/dark_vs.json
View file
Expand Up @@ -57,7 +57,11 @@
}
},
{
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"foreground": "#6A9955"
}
Expand Down
6 changes: 5 additions & 1 deletion extensions/theme-defaults/themes/hc_black.json
View file
Expand Up @@ -43,7 +43,11 @@
}
},
{
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"foreground": "#7ca668"
}
Expand Down
6 changes: 5 additions & 1 deletion extensions/theme-defaults/themes/hc_light.json
View file
Expand Up @@ -27,7 +27,11 @@
}
},
{
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"foreground": "#515151"
}
Expand Down
6 changes: 5 additions & 1 deletion extensions/theme-defaults/themes/light_vs.json
View file
Expand Up @@ -62,7 +62,11 @@
}
},
{
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"foreground": "#008000"
}
Expand Down
3 changes: 2 additions & 1 deletion extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
View file
Expand Up @@ -81,7 +81,8 @@
"name": "Comments",
"scope": [
"comment",
"punctuation.definition.comment"
"punctuation.definition.comment",
"string.quoted.docstring"
],
"settings": {
"foreground": "#a57a4c"
Expand Down
7 changes: 5 additions & 2 deletions extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
View file
Expand Up @@ -78,8 +78,11 @@
}
},
{
"name": "Comment",
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"fontStyle": "",
"foreground": "#9A9B99"
Expand Down
7 changes: 5 additions & 2 deletions extensions/theme-monokai/themes/monokai-color-theme.json
View file
Expand Up @@ -118,8 +118,11 @@
}
},
{
"name": "Comment",
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"foreground": "#88846f"
}
Expand Down
3 changes: 2 additions & 1 deletion extensions/theme-quietlight/themes/quietlight-color-theme.json
View file
Expand Up @@ -20,7 +20,8 @@
"name": "Comments",
"scope": [
"comment",
"punctuation.definition.comment"
"punctuation.definition.comment",
"string.quoted.docstring"
],
"settings": {
"fontStyle": "italic",
Expand Down
7 changes: 5 additions & 2 deletions extensions/theme-red/themes/Red-color-theme.json
View file
Expand Up @@ -77,8 +77,11 @@
}
},
{
"name": "Comment",
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"fontStyle": "italic",
"foreground": "#e7c0c0ff"
Expand Down
7 changes: 5 additions & 2 deletions extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
View file
Expand Up @@ -17,8 +17,11 @@
}
},
{
"name": "Comment",
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"fontStyle": "italic",
"foreground": "#586E75"
Expand Down
7 changes: 5 additions & 2 deletions extensions/theme-solarized-light/themes/solarized-light-color-theme.json
View file
Expand Up @@ -17,8 +17,11 @@
}
},
{
"name": "Comment",
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"fontStyle": "italic",
"foreground": "#93A1A1"
Expand Down
7 changes: 5 additions & 2 deletions extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
View file
Expand Up @@ -78,8 +78,11 @@
}
},
{
"name": "Comment",
"scope": "comment",
"name": "Comments",
"scope": [
"comment",
"string.quoted.docstring"
],
"settings": {
"foreground": "#7285B7"
}
Expand Down
0 ...st/colorize-fixtures/test-freeze-56377.py → ...st/colorize-fixtures/test-freeze-56377.py
View file
File renamed without changes.
0 ...ons/python/test/colorize-fixtures/test.py → ...rize-tests/test/colorize-fixtures/test.py
View file
File renamed without changes.

0 comments on commit b436869

Please sign in to comment.