all color themes: treat comment docstrings as comments too (microsoft#182162)

ElectricRCAircraftGuy · aeschli · web-flow · commit b4368691e928 · 2023-05-15T14:38:43.000+02:00
* 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: microsoft#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>
diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json
@@ -17,8 +17,11 @@
 			}
 		},
 		{
-			"name": "Comment",
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#384887"
 			}
diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json
@@ -57,7 +57,11 @@
 			}
 		},
 		{
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#6A9955"
 			}
diff --git a/extensions/theme-defaults/themes/hc_black.json b/extensions/theme-defaults/themes/hc_black.json
@@ -43,7 +43,11 @@
 			}
 		},
 		{
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#7ca668"
 			}
diff --git a/extensions/theme-defaults/themes/hc_light.json b/extensions/theme-defaults/themes/hc_light.json
@@ -27,7 +27,11 @@
 			}
 		},
 		{
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#515151"
 			}
diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json
@@ -62,7 +62,11 @@
 			}
 		},
 		{
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#008000"
 			}
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -81,7 +81,8 @@
 			"name": "Comments",
 			"scope": [
 				"comment",
-				"punctuation.definition.comment"
+				"punctuation.definition.comment",
+				"string.quoted.docstring"
 			],
 			"settings": {
 				"foreground": "#a57a4c"
diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
@@ -78,8 +78,11 @@
 			}
 		},
 		{
-			"name": "Comment",
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"fontStyle": "",
 				"foreground": "#9A9B99"
diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json
@@ -118,8 +118,11 @@
 			}
 		},
 		{
-			"name": "Comment",
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#88846f"
 			}
diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json
@@ -20,7 +20,8 @@
 			"name": "Comments",
 			"scope": [
 				"comment",
-				"punctuation.definition.comment"
+				"punctuation.definition.comment",
+				"string.quoted.docstring"
 			],
 			"settings": {
 				"fontStyle": "italic",
diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json
@@ -77,8 +77,11 @@
 			}
 		},
 		{
-			"name": "Comment",
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"fontStyle": "italic",
 				"foreground": "#e7c0c0ff"
diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
@@ -17,8 +17,11 @@
 			}
 		},
 		{
-			"name": "Comment",
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"fontStyle": "italic",
 				"foreground": "#586E75"
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -17,8 +17,11 @@
 			}
 		},
 		{
-			"name": "Comment",
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"fontStyle": "italic",
 				"foreground": "#93A1A1"
diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
@@ -78,8 +78,11 @@
 			}
 		},
 		{
-			"name": "Comment",
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#7285B7"
 			}
diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test-freeze-56377.py b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-freeze-56377.py
diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.py b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.py
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_py.json b/extensions/vscode-colorize-tests/test/colorize-results/test_py.json

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,11 @@`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`	`{`
`20`		`- "name": "Comment",`
`21`		`- "scope": "comment",`
	`20`	`+ "name": "Comments",`
	`21`	`+ "scope": [`
	`22`	`+ "comment",`
	`23`	`+ "string.quoted.docstring"`
	`24`	`+ ],`
`22`	`25`	`"settings": {`
`23`	`26`	`"foreground": "#384887"`
`24`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,11 @@`
`57`	`57`	`}`
`58`	`58`	`},`
`59`	`59`	`{`
`60`		`- "scope": "comment",`
	`60`	`+ "name": "Comments",`
	`61`	`+ "scope": [`
	`62`	`+ "comment",`
	`63`	`+ "string.quoted.docstring"`
	`64`	`+ ],`
`61`	`65`	`"settings": {`
`62`	`66`	`"foreground": "#6A9955"`
`63`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,11 @@`
`43`	`43`	`}`
`44`	`44`	`},`
`45`	`45`	`{`
`46`		`- "scope": "comment",`
	`46`	`+ "name": "Comments",`
	`47`	`+ "scope": [`
	`48`	`+ "comment",`
	`49`	`+ "string.quoted.docstring"`
	`50`	`+ ],`
`47`	`51`	`"settings": {`
`48`	`52`	`"foreground": "#7ca668"`
`49`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,11 @@`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`{`
`30`		`- "scope": "comment",`
	`30`	`+ "name": "Comments",`
	`31`	`+ "scope": [`
	`32`	`+ "comment",`
	`33`	`+ "string.quoted.docstring"`
	`34`	`+ ],`
`31`	`35`	`"settings": {`
`32`	`36`	`"foreground": "#515151"`
`33`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,11 @@`
`62`	`62`	`}`
`63`	`63`	`},`
`64`	`64`	`{`
`65`		`- "scope": "comment",`
	`65`	`+ "name": "Comments",`
	`66`	`+ "scope": [`
	`67`	`+ "comment",`
	`68`	`+ "string.quoted.docstring"`
	`69`	`+ ],`
`66`	`70`	`"settings": {`
`67`	`71`	`"foreground": "#008000"`
`68`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,11 @@`
`78`	`78`	`}`
`79`	`79`	`},`
`80`	`80`	`{`
`81`		`- "name": "Comment",`
`82`		`- "scope": "comment",`
	`81`	`+ "name": "Comments",`
	`82`	`+ "scope": [`
	`83`	`+ "comment",`
	`84`	`+ "string.quoted.docstring"`
	`85`	`+ ],`
`83`	`86`	`"settings": {`
`84`	`87`	`"fontStyle": "",`
`85`	`88`	`"foreground": "#9A9B99"`
Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,11 @@`
`118`	`118`	`}`
`119`	`119`	`},`
`120`	`120`	`{`
`121`		`- "name": "Comment",`
`122`		`- "scope": "comment",`
	`121`	`+ "name": "Comments",`
	`122`	`+ "scope": [`
	`123`	`+ "comment",`
	`124`	`+ "string.quoted.docstring"`
	`125`	`+ ],`
`123`	`126`	`"settings": {`
`124`	`127`	`"foreground": "#88846f"`
`125`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,11 @@`
`77`	`77`	`}`
`78`	`78`	`},`
`79`	`79`	`{`
`80`		`- "name": "Comment",`
`81`		`- "scope": "comment",`
	`80`	`+ "name": "Comments",`
	`81`	`+ "scope": [`
	`82`	`+ "comment",`
	`83`	`+ "string.quoted.docstring"`
	`84`	`+ ],`
`82`	`85`	`"settings": {`
`83`	`86`	`"fontStyle": "italic",`
`84`	`87`	`"foreground": "#e7c0c0ff"`