ts semantic highlighting: support alias

aeschli · aeschli · commit a2d46d4b6801 · 2020-01-15T23:08:15.000+01:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -231,7 +231,7 @@
 			"type": "node",
 			"request": "launch",
 			"name": "HTML Unit Tests",
-			"program": "${workspaceFolder}/extensions/html-language-features/server/node_modules/mocha/bin/_mocha",
+			"program": "${workspaceFolder}/extensions/html-language-features/server/test/index.js",
 			"stopOnEntry": false,
 			"cwd": "${workspaceFolder}/extensions/html-language-features/server",
 			"outFiles": [
diff --git a/extensions/html-language-features/server/src/modes/javascriptSemanticTokens.ts b/extensions/html-language-features/server/src/modes/javascriptSemanticTokens.ts
@@ -39,8 +39,11 @@ function collectTokens(jsLanguageService: ts.LanguageService, fileName: string,
 				return;
 			}
 			if (ts.isIdentifier(node)) {
-				const symbol = typeChecker.getSymbolAtLocation(node);
+				let symbol = typeChecker.getSymbolAtLocation(node);
 				if (symbol) {
+					if (symbol.flags & ts.SymbolFlags.Alias) {
+						symbol = typeChecker.getAliasedSymbol(symbol);
+					}
 					let typeIdx = classifySymbol(symbol);
 					if (typeIdx !== undefined) {
 						let modifierSet = 0;
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
@@ -19,7 +19,7 @@
     "jsonc-parser": "^2.1.1",
     "rimraf": "^2.6.3",
     "semver": "5.5.1",
-    "typescript-vscode-sh-plugin": "^0.5.0",
+    "typescript-vscode-sh-plugin": "^0.6.1",
     "vscode-extension-telemetry": "0.1.1",
     "vscode-nls": "^4.0.0"
   },
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.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/typescript-vscode-sh-plugin/-/typescript-vscode-sh-plugin-0.5.0.tgz#014dd928f2fa5000396147ed00792a2c901d97b9"
-  integrity sha512-MKqivbdkgllHS3Rab/zvXlGAxwCb1AHzgO/a8vmG6i5kExGIytwjUyXALdnnLUWS03B9eEJmIjzOz4y3MpgliQ==
+typescript-vscode-sh-plugin@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/typescript-vscode-sh-plugin/-/typescript-vscode-sh-plugin-0.6.1.tgz#db1a291cbc385a76e33a83fb9233e3ec66ba15ff"
+  integrity sha512-rqpHjxadpCDuGvYdCojlOLgt/TSCIgruzM/BzA0q8VjDPVh6NOKtiZLPDnzMe1rL77ZGWxYYgKtRg1bexnZrPA==
 
 uri-js@^4.2.2:
   version "4.2.2"
