[typescript][semantic] add library modifier. Fixes microsoft#91090

aeschli · aeschli · commit 40077f5ea98d · 2020-03-27T14:35:22.000+01:00
diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json
@@ -192,7 +192,7 @@
 		},
 		{
 			"name": "Support.constant",
-			"scope": "support.constant",
+			"scope": [ "support.constant", "support.variable"],
 			"settings": {
 				"fontStyle": "",
 				"foreground": "#eb939aff"
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -182,7 +182,10 @@
 		},
 		{
 			"name": "Library constant",
-			"scope": "support.constant",
+			"scope": [
+				"support.constant",
+				"support.variable"
+			],
 			"settings": {}
 		},
 		{
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
@@ -19,7 +19,7 @@
     "jsonc-parser": "^2.2.1",
     "rimraf": "^2.6.3",
     "semver": "5.5.1",
-    "typescript-vscode-sh-plugin": "^0.6.10",
+    "typescript-vscode-sh-plugin": "^0.6.11",
     "vscode-extension-telemetry": "0.1.1",
     "vscode-nls": "^4.1.1"
   },
diff --git a/extensions/typescript-language-features/src/features/semanticTokens.ts b/extensions/typescript-language-features/src/features/semanticTokens.ts
@@ -151,6 +151,7 @@ tokenModifiers[TokenModifier.declaration] = 'declaration';
 tokenModifiers[TokenModifier.readonly] = 'readonly';
 tokenModifiers[TokenModifier.static] = 'static';
 tokenModifiers[TokenModifier.local] = 'local';
+tokenModifiers[TokenModifier.defaultLibrary] = 'defaultLibrary';
 
 // make sure token types and modifiers are complete
 if (tokenTypes.filter(t => !!t).length !== TokenType._) {
diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock
@@ -626,10 +626,10 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-typescript-vscode-sh-plugin@^0.6.10:
-  version "0.6.10"
-  resolved "https://registry.yarnpkg.com/typescript-vscode-sh-plugin/-/typescript-vscode-sh-plugin-0.6.10.tgz#f9fdac506a3adb698d52fd01723ec78e8a5fc09e"
-  integrity sha512-cYycpwLnYT2oS48tac+UvVRtIFHHTcHAz/g3N2HpYftuMEBvBcsGfe2SrlnrGCa1gMheTbo+twIHhsQu9ygdvg==
+typescript-vscode-sh-plugin@^0.6.11:
+  version "0.6.11"
+  resolved "https://registry.yarnpkg.com/typescript-vscode-sh-plugin/-/typescript-vscode-sh-plugin-0.6.11.tgz#638fcc28ea5fad044b316d4305fe0925251ddf78"
+  integrity sha512-b3hVytj/EMFd2TgkF16l5NXEOQBRJ79e3k5+NWF8bxElLP6JsNEv/aXMFgNK07p8WcVkeE9PXC9YoURj2LWDpg==
 
 uri-js@^4.2.2:
   version "4.2.2"
diff --git a/src/vs/platform/theme/common/tokenClassificationRegistry.ts b/src/vs/platform/theme/common/tokenClassificationRegistry.ts
@@ -533,7 +533,15 @@ function createDefaultTokenClassificationRegistry(): TokenClassificationRegistry
 
 	registerTokenStyleDefault('variable.readonly', [['variable.other.constant']]);
 	registerTokenStyleDefault('property.readonly', [['variable.other.constant.property']]);
-
+	registerTokenStyleDefault('type.defaultLibrary', [['support.type']]);
+	registerTokenStyleDefault('class.defaultLibrary', [['support.class']]);
+	registerTokenStyleDefault('interface.defaultLibrary', [['support.class']]);
+	registerTokenStyleDefault('variable.defaultLibrary', [['support.variable'], ['support.other.variable']]);
+	registerTokenStyleDefault('variable.defaultLibrary.readonly', [['support.constant']]);
+	registerTokenStyleDefault('property.defaultLibrary', [['support.variable.property']]);
+	registerTokenStyleDefault('property.defaultLibrary.readonly', [['support.constant.property']]);
+	registerTokenStyleDefault('function.defaultLibrary', [['support.function']]);
+	registerTokenStyleDefault('member.defaultLibrary', [['support.function']]);
 	return registry;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@`
`192`	`192`	`},`
`193`	`193`	`{`
`194`	`194`	`"name": "Support.constant",`
`195`		`- "scope": "support.constant",`
	`195`	`+ "scope": [ "support.constant", "support.variable"],`
`196`	`196`	`"settings": {`
`197`	`197`	`"fontStyle": "",`
`198`	`198`	`"foreground": "#eb939aff"`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,10 @@`
`182`	`182`	`},`
`183`	`183`	`{`
`184`	`184`	`"name": "Library constant",`
`185`		`- "scope": "support.constant",`
	`185`	`+ "scope": [`
	`186`	`+ "support.constant",`
	`187`	`+ "support.variable"`
	`188`	`+ ],`
`186`	`189`	`"settings": {}`
`187`	`190`	`},`
`188`	`191`	`{`