[theme] storage.type is used for types

extensions/theme-colorful-defaults/package.json

@@ -3,7 +3,7 @@
 	"displayName": "Colorful Default Themes - Please provide feedback in issue 1849",
 	"description": "The default VS Code Light and Dark themes with a touch of color. We are considering adding these to the default themes in the January release. Please provide feedback in issue 1849.",
 	"categories": [ "Themes" ],
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"publisher": "aeschli",
 	"engines": { "vscode": "*" },
 	"contributes": {

extensions/theme-colorful-defaults/themes/dark_plus.tmTheme

@@ -21,13 +21,24 @@
 			<key>name</key>
 			<string>Types declaration and references</string>
 			<key>scope</key>
-			<string>meta.parameter.type, name.class, storage.type.cs, return-type, new.storage.type, meta.cast, cast.storage.type, heritage.storage.type, annotation.storage.type, var.annotation.storage.type</string>
+			<string>meta.parameter.type, name.class, storage.type, return-type, meta.cast, new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.storage.type.ts</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#4EC9B0</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>name</key>
+			<string>TS storage type workaround</string>
+			<key>scope</key>
+			<string>storage.type.ts</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#569CD6</string>
+			</dict>
+		</dict>
 		<dict>
 			<key>name</key>
 			<string>Control flow keywords</string>
@@ -43,7 +54,7 @@
 			<key>name</key>
 			<string>Parameter name</string>
 			<key>scope</key>
-			<string>meta.parameter.type.variable, variable.parameter</string>
+			<string>meta.parameter.type.variable, variable.parameter, meta.variable</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>

extensions/theme-colorful-defaults/themes/light_plus.tmTheme

@@ -21,13 +21,24 @@
 			<key>name</key>
 			<string>Types declaration and references</string>
 			<key>scope</key>
-			<string>meta.parameter.type, name.class, storage.type.cs, return-type, new.storage.type, meta.cast, cast.storage.type, heritage.storage.type, annotation.storage.type, var.annotation.storage.type</string>			<key>settings</key>
+			<string>meta.parameter.type, name.class, storage.type, return-type, meta.cast, new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.storage.type.ts</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
 				<string>#2B91AF</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>name</key>
+			<string>TS storage type workaround</string>
+			<key>scope</key>
+			<string>storage.type.ts</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#0000FF</string>
+			</dict>
+		</dict>
 		<dict>
 			<key>name</key>
 			<string>Control flow keywords</string>
@@ -43,7 +54,7 @@
 			<key>name</key>
 			<string>Parameter name</string>
 			<key>scope</key>
-			<string>meta.parameter.type.variable, variable.parameter</string>
+			<string>meta.parameter.type.variable, variable.parameter, meta.variable</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>

src/vs/editor/browser/widget/media/tokens.css

@@ -10,6 +10,8 @@
 .monaco-editor.vs .token.terminal					{ color: #e00000; }
 .monaco-editor.vs .token.terminal.code1				{ font-weight: bold; }
 .monaco-editor.vs .token.variable					{ color: #001188; }
+.monaco-editor.vs .token.variable.name				{ color: #001188; }
+
 .monaco-editor.vs .token.variable.predefined		{ color: #4864AA; }
 .monaco-editor.vs .token.constant					{ color: #dd0000; }
 .monaco-editor.vs .token.string						{ color: #A31515; }
@@ -50,10 +52,6 @@
 /* YAML */
 .monaco-editor.vs .token.string.yaml				{ color: #0451A5; }
 
-/* C# */
-.monaco-editor.vs .token.type						{ color: #008080; }
-.monaco-editor.vs .token.identifier.method			{ color: #000000; }
-
 /* SQL */
 .monaco-editor.vs .token.string.sql					{ color: #FF0000; }
 .monaco-editor.vs .token.predefined.sql				{ color: #FF00FF; }
@@ -100,6 +98,7 @@
 .monaco-editor.vs-dark .token.terminal					{ color: #BD5050; }
 .monaco-editor.vs-dark .token.terminal.code1			{ font-weight: bold; }
 .monaco-editor.vs-dark .token.variable					{ color: #74B0DF; }
+.monaco-editor.vs-dark .token.variable.name				{ color: #74B0DF; }
 .monaco-editor.vs-dark .token.variable.predefined		{ color: #4864AA; }
 
 .monaco-editor.vs-dark .token.constant					{ color: #dd0000; }
@@ -142,10 +141,6 @@
 /* YAML */
 .monaco-editor.vs-dark .token.string.yaml				{ color: #CE9178; }
 
-/* C# */
-.monaco-editor.vs-dark .token.type						{ color: #3DC9B0; }
-.monaco-editor.vs-dark .token.identifier.method			{ color: #D4D4D4; }
-
 /* SQL */
 .monaco-editor.vs-dark .token.string.sql				{ color: #FF0000; }
 .monaco-editor.vs-dark .token.predefined.sql			{ color: #FF00FF; }
@@ -191,7 +186,8 @@
 .monaco-editor.hc-black .token.terminal					{ color: #569CD6; }
 .monaco-editor.hc-black .token.terminal.code1			{ font-weight: bold; }
 
-.monaco-editor.hc-black .token.variable					{ color: #1AEBFF; }
+.monaco-editor.hc-black .token.variable,
+.monaco-editor.hc-black .token.variable.name,
 .monaco-editor.hc-black .token.variable.predefined		{ color: #1AEBFF; }
 .monaco-editor.hc-black .token.constant					{ color: #dd0000; }
 .monaco-editor.hc-black .token.string					{ color: #CE9178; }
@@ -234,10 +230,6 @@
 /* YAML */
 .monaco-editor.hc-black .token.string.yaml				{ color: #CE9178; }
 
-/* C# */
-.monaco-editor.hc-black .token.type						{ color: #3DC9B0; }
-.monaco-editor.hc-black .token.identifier.method		{ color: #D4D4D4; }
-
 /* SQL */
 .monaco-editor.hc-black .token.string.sql				{ color: #FF0000; }
 .monaco-editor.hc-black .token.predefined.sql			{ color: #FF00FF; }
@@ -347,6 +339,7 @@
 .monaco-editor.vs .token.markup.raw
 .monaco-editor.vs .token.markup.other*/
 
+.monaco-editor.vs .token.meta.variable							{ color: #000000; }
 .monaco-editor.vs .token.meta.selector							{ color: #800000; }
 .monaco-editor.vs .token.meta.tag								{ color: #800000; }
 .monaco-editor.vs .token.meta.preprocessor						{ color: #0000FF; }
@@ -359,14 +352,18 @@
 
 .monaco-editor.vs .token.storage								{ color: #0000FF; }
 .monaco-editor.vs .token.storage.content						{ color: red; }
-.monaco-editor.vs .token.storage.type							{ color: #0000FF; }
+.monaco-editor.vs .token.storage.type							{ color: #000000; }
 .monaco-editor.vs .token.storage.modifier						{ color: #0000FF; }
-.monaco-editor.vs .token.annotation.storage.type,
-.monaco-editor.vs .token.heritage.storage.type,
-.monaco-editor.vs .token.cast.storage.type,
-.monaco-editor.vs .token.new.storage.type						{ color: #000000; }
-.monaco-editor.vs .token.var.storage.type						{ color: #0000FF; }
-.monaco-editor.vs .token.var.annotation.storage.type			{ color: #000000; }
+
+/* ts grammar workarounds*/
+.monaco-editor.vs .token.storage.type.ts						{ color: #0000FF; }
+.monaco-editor.vs .token.storage.modifier.ts					{ color: #0000FF; }
+.monaco-editor.vs .token.var.storage.type.ts					{ color: #0000FF; }
+.monaco-editor.vs .token.annotation.storage.type.ts,
+.monaco-editor.vs .token.heritage.storage.type.ts,
+.monaco-editor.vs .token.cast.storage.type.ts,
+.monaco-editor.vs .token.var.annotation.storage.type.ts,
+.monaco-editor.vs .token.new.storage.type.ts					{ color: #000000; }
 
 .monaco-editor.vs .token.string									{ color: #A31515; }
 .monaco-editor.vs .token.string.tag								{ color: blue; }
@@ -474,6 +471,10 @@
 .monaco-editor.vs-dark .token.markup.raw
 .monaco-editor.vs-dark .token.markup.other*/
 
+/* for backward compatibility, keep variables in js/ts uncolored */
+.monaco-editor.vs-dark .token.meta.variable						{ color: #D4D4D4; }
+
+
 .monaco-editor.vs-dark .token.meta.selector						{ color: #D7BA7D; }
 .monaco-editor.vs-dark .token.meta.tag							{ color: #808080; } /* gray for html/xml-tag brackets */
 .monaco-editor.vs-dark .token.meta.preprocessor					{ color: #569CD6; }
@@ -486,14 +487,19 @@
 
 .monaco-editor.vs-dark .token.storage							{ color: #569CD6; }
 .monaco-editor.vs-dark .token.storage.content					{ color: #9CDCFE; }
-.monaco-editor.vs-dark .token.storage.type						{ color: #569CD6; }
+.monaco-editor.vs-dark .token.storage.type						{ color: #D4D4D4; }
 .monaco-editor.vs-dark .token.storage.modifier					{ color: #569CD6; }
-.monaco-editor.vs-dark .token.annotation.storage.type,
-.monaco-editor.vs-dark .token.heritage.storage.type,
-.monaco-editor.vs-dark .token.cast.storage.type,
-.monaco-editor.vs-dark .token.new.storage.type					{ color: #D4D4D4; }
-.monaco-editor.vs-dark .token.var.storage.type					{ color: #569CD6; }
-.monaco-editor.vs-dark .token.var.annotation.storage.type		{ color: #D4D4D4; }
+
+/* ts grammar workarounds*/
+.monaco-editor.vs-dark .token.storage.type.ts						{ color: #569CD6; }
+.monaco-editor.vs-dark .token.storage.modifier.ts					{ color: #569CD6; }
+.monaco-editor.vs-dark .token.var.storage.type.ts					{ color: #569CD6; }
+.monaco-editor.vs-dark .token.annotation.storage.type.ts,
+.monaco-editor.vs-dark .token.heritage.storage.type.ts,
+.monaco-editor.vs-dark .token.cast.storage.type.ts,
+.monaco-editor.vs-dark .token.var.annotation.storage.type.ts,
+.monaco-editor.vs-dark .token.new.storage.type.ts					{ color: #D4D4D4; }
+
 
 .monaco-editor.vs-dark .token.string							{ color: #CE9178; }
 .monaco-editor.vs-dark .token.string.tag			    		{ color: #CE9178; }
@@ -601,6 +607,9 @@
 .monaco-editor.hc-black .token.markup.raw
 .monaco-editor.hc-black .token.markup.other*/
 
+/* for backward compatibility, keep variables in js/ts uncolored */
+.monaco-editor.hc-black .token.meta.variable					{ color: #D4D4D4; }
+
 .monaco-editor.hc-black .token.meta.selector					{ color: #D7BA7D; }
 .monaco-editor.hc-black .token.meta.tag							{ color: #808080; } /* gray for html/xml-tag brackets */
 .monaco-editor.hc-black .token.meta.preprocessor				{ color: #569CD6; }
@@ -613,14 +622,18 @@
 
 .monaco-editor.hc-black .token.storage							{ color: #569CD6; }
 .monaco-editor.hc-black .token.storage.content					{ color: #9CDCFE; }
-.monaco-editor.hc-black .token.storage.type						{ color: #569CD6; }
+.monaco-editor.hc-black .token.storage.type						{ color: #D4D4D4; }
 .monaco-editor.hc-black .token.storage.modifier					{ color: #569CD6; }
-.monaco-editor.hc-black .token.annotation.storage.type,
-.monaco-editor.hc-black .token.heritage.storage.type,
-.monaco-editor.hc-black .token.cast.storage.type,
-.monaco-editor.hc-black .token.new.storage.type					{ color: #D4D4D4; }
-.monaco-editor.hc-black .token.var.storage.type					{ color: #569CD6; }
-.monaco-editor.hc-black .token.var.annotation.storage.type		{ color: #D4D4D4; }
+
+/* ts grammar workarounds*/
+.monaco-editor.hc-black .token.storage.type.ts					{ color: #569CD6; }
+.monaco-editor.hc-black .token.storage.modifier.ts				{ color: #569CD6; }
+.monaco-editor.hc-black .token.var.storage.type.ts				{ color: #569CD6; }
+.monaco-editor.hc-black .token.annotation.storage.type.ts,
+.monaco-editor.hc-black .token.heritage.storage.type.ts,
+.monaco-editor.hc-black .token.cast.storage.type.ts,
+.monaco-editor.hc-black .token.var.annotation.storage.type.ts,
+.monaco-editor.hc-black .token.new.storage.type.ts				{ color: #D4D4D4; }
 
 .monaco-editor.hc-black .token.string							{ color: #CE9178; }
 .monaco-editor.hc-black .token.string.tag						{ color: #CE9178; }