Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some missing typescript scopes (#245870)

Browse Source
This commit is contained in:
Alex Ross
2025-04-07 12:54:52 +02:00
committed by GitHub
parent 324d1b341b
commit 1a602a166e
4 changed files with 330 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue241715.ts
View File

@@ -45,3 +45,6 @@ function makeDate(mOrTimestamp: number, d?: number, y?: number): Date {
type StringNumberBooleans = [string, number, ...boolean[]]; type StringNumberBooleans = [string, number, ...boolean[]];
type StringBooleansNumber = [string, ...boolean[], number]; type StringBooleansNumber = [string, ...boolean[], number];
type BooleansStringNumber = [...boolean[], string, number]; type BooleansStringNumber = [...boolean[], string, number];
let s = '2';
+s;

182
extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
View File

@@ -6859,6 +6859,188 @@
"light_modern": "default: #3B3B3B" "light_modern": "default: #3B3B3B"
} }
}, },
{
"c": ";",
"t": "source.ts punctuation.terminator.statement.ts",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_modern": "default: #CCCCCC",
"hc_light": "default: #292929",
"light_modern": "default: #3B3B3B"
}
},
{
"c": "let",
"t": "source.ts meta.var.expr.ts storage.type.ts",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
"dark_vs": "storage.type: #569CD6",
"light_vs": "storage.type: #0000FF",
"hc_black": "storage.type: #569CD6",
"dark_modern": "storage.type: #569CD6",
"hc_light": "storage.type: #0F4A85",
"light_modern": "storage.type: #0000FF"
}
},
{
"c": " ",
"t": "source.ts meta.var.expr.ts",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_modern": "default: #CCCCCC",
"hc_light": "default: #292929",
"light_modern": "default: #3B3B3B"
}
},
{
"c": "s",
"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
}
},
{
"c": " ",
"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_modern": "default: #CCCCCC",
"hc_light": "default: #292929",
"light_modern": "default: #3B3B3B"
}
},
{
"c": "=",
"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
"dark_vs": "keyword.operator: #D4D4D4",
"light_vs": "keyword.operator: #000000",
"hc_black": "keyword.operator: #D4D4D4",
"dark_modern": "keyword.operator: #D4D4D4",
"hc_light": "keyword.operator: #000000",
"light_modern": "keyword.operator: #000000"
}
},
{
"c": " ",
"t": "source.ts meta.var.expr.ts",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_modern": "default: #CCCCCC",
"hc_light": "default: #292929",
"light_modern": "default: #3B3B3B"
}
},
{
"c": "'",
"t": "source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_modern": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_modern": "string: #A31515"
}
},
{
"c": "2",
"t": "source.ts meta.var.expr.ts string.quoted.single.ts",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_modern": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_modern": "string: #A31515"
}
},
{
"c": "'",
"t": "source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_modern": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_modern": "string: #A31515"
}
},
{
"c": ";",
"t": "source.ts punctuation.terminator.statement.ts",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_modern": "default: #CCCCCC",
"hc_light": "default: #292929",
"light_modern": "default: #3B3B3B"
}
},
{
"c": "+",
"t": "source.ts keyword.operator.arithmetic.ts",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
"dark_vs": "keyword.operator: #D4D4D4",
"light_vs": "keyword.operator: #000000",
"hc_black": "keyword.operator: #D4D4D4",
"dark_modern": "keyword.operator: #D4D4D4",
"hc_light": "keyword.operator: #000000",
"light_modern": "keyword.operator: #000000"
}
},
{
"c": "s",
"t": "source.ts variable.other.readwrite.ts",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
}
},
{ {
"c": ";", "c": ";",
"t": "source.ts punctuation.terminator.statement.ts", "t": "source.ts punctuation.terminator.statement.ts",

142
extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json
View File

@@ -2479,7 +2479,7 @@
}, },
{ {
"c": "value", "c": "value",
"t": "variable.ts", "t": "variable.ts variable.parameter.ts",
"r": { "r": {
"dark_plus": "variable: #9CDCFE", "dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080", "light_plus": "variable: #001080",
@@ -4675,6 +4675,146 @@
"light_modern": "default: #3B3B3B" "light_modern": "default: #3B3B3B"
} }
}, },
{
"c": ";",
"t": "punctuation.delimiter.ts",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_modern": "default: #CCCCCC",
"hc_light": "default: #292929",
"light_modern": "default: #3B3B3B"
}
},
{
"c": "let",
"t": "storage.type.ts",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
"dark_vs": "storage.type: #569CD6",
"light_vs": "storage.type: #0000FF",
"hc_black": "storage.type: #569CD6",
"dark_modern": "storage.type: #569CD6",
"hc_light": "storage.type: #0F4A85",
"light_modern": "storage.type: #0000FF"
}
},
{
"c": "s",
"t": "variable.ts",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
}
},
{
"c": "=",
"t": "keyword.operator.assignment.ts",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
"dark_vs": "keyword.operator: #D4D4D4",
"light_vs": "keyword.operator: #000000",
"hc_black": "keyword.operator: #D4D4D4",
"dark_modern": "keyword.operator: #D4D4D4",
"hc_light": "keyword.operator: #000000",
"light_modern": "keyword.operator: #000000"
}
},
{
"c": "'",
"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_modern": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_modern": "string: #A31515"
}
},
{
"c": "2",
"t": "string.quoted.single.ts",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_modern": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_modern": "string: #A31515"
}
},
{
"c": "'",
"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_modern": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_modern": "string: #A31515"
}
},
{
"c": ";",
"t": "punctuation.delimiter.ts",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_modern": "default: #CCCCCC",
"hc_light": "default: #292929",
"light_modern": "default: #3B3B3B"
}
},
{
"c": "+",
"t": "keyword.operator.arithmetic.ts",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
"dark_vs": "keyword.operator: #D4D4D4",
"light_vs": "keyword.operator: #000000",
"hc_black": "keyword.operator: #D4D4D4",
"dark_modern": "keyword.operator: #D4D4D4",
"hc_light": "keyword.operator: #000000",
"light_modern": "keyword.operator: #000000"
}
},
{
"c": "s",
"t": "variable.ts",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
}
},
{ {
"c": ";", "c": ";",
"t": "punctuation.delimiter.ts", "t": "punctuation.delimiter.ts",

4
src/vs/editor/common/languages/highlights/typescript.scm
View File

@@ -130,6 +130,9 @@
(arrow_function (arrow_function
parameter: (identifier) @variable.parameter.ts) parameter: (identifier) @variable.parameter.ts)
(type_predicate
name: (identifier) @variable.parameter.ts)
; Function and method calls ; Function and method calls
(call_expression (call_expression
@@ -238,6 +241,7 @@
(unary_expression ([ (unary_expression ([
"-" "-"
"+"
]) @keyword.operator.arithmetic.ts) ]) @keyword.operator.arithmetic.ts)
[ [