maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ts semantic highlighting: support alias

Browse source
This commit is contained in:
Martin Aeschlimann 2020-01-15 23:08:15 +01:00
parent e3c320d492
commit a2d46d4b68
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vscode/launch.json vendored
View file

@ -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": [

5
extensions/html-language-features/server/src/modes/javascriptSemanticTokens.ts
View file

@ -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;

2
extensions/typescript-language-features/package.json
View file

@ -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"
},

8
extensions/typescript-language-features/yarn.lock
View file

@ -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"