Skip to content

Commit 20ae8b7

Browse files
committed
Use the faster implmentation of the 2020 syntaxtical classifications
1 parent 23cb2d8 commit 20ae8b7

8 files changed

+1913
-163
lines changed

src/services/classifier2020.ts

Lines changed: 1897 additions & 148 deletions
Large diffs are not rendered by default.

tests/cases/fourslash/semanticClassificationClassExpression.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ verify.semanticClassificationsAre("original",
1414
const c2 = classification("2020");
1515
verify.semanticClassificationsAre("2020",
1616
c2.semanticToken("class.declaration", "x"),
17-
c2.semanticToken("class", "C"),
17+
c2.semanticToken("class.declaration", "C"),
1818
c2.semanticToken("class.declaration", "C"),
1919
c2.semanticToken("class.declaration", "D"),
20-
c2.semanticToken("class", "B"),
20+
c2.semanticToken("class.declaration", "B"),
2121
);

tests/cases/fourslash/semanticClassificationUninstantiatedModuleWithVariableOfSameName1.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ verify.semanticClassificationsAre("original",
1313
c.moduleName("M", test.marker("0").position),
1414
c.interfaceName("I", test.marker("1").position));
1515

16+
17+
1618
const c2 = classification("2020");
1719
verify.semanticClassificationsAre("2020",
18-
c2.semanticToken("variable", "M"),
20+
c2.semanticToken("namespace.declaration", "M"),
1921
c2.semanticToken("interface.declaration", "I"),
2022
c2.semanticToken("variable.declaration", "M"),
2123
c2.semanticToken("property.declaration", "I"),

tests/cases/fourslash/semanticClassificationUninstantiatedModuleWithVariableOfSameName2.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ verify.semanticClassificationsAre("original",
2323

2424
const c2 = classification("2020");
2525
verify.semanticClassificationsAre("2020",
26-
c2.semanticToken("variable", "M"),
26+
c2.semanticToken("namespace.declaration", "M"),
2727
c2.semanticToken("interface.declaration", "I"),
2828
c2.semanticToken("variable.declaration", "M"),
2929
c2.semanticToken("property.declaration", "foo"),
@@ -34,4 +34,3 @@ verify.semanticClassificationsAre("2020",
3434
c2.semanticToken("variable.declaration", "x"),
3535
c2.semanticToken("variable", "M"),
3636
);
37-

tests/cases/fourslash/semanticClassificationWithUnionTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ verify.semanticClassificationsAre("original",
2525

2626
const c2 = classification("2020");
2727
verify.semanticClassificationsAre("2020",
28-
c2.semanticToken("variable", "M"),
28+
c2.semanticToken("namespace.declaration", "M"),
2929
c2.semanticToken("interface.declaration", "I"),
3030
c2.semanticToken("interface.declaration", "I"),
3131
c2.semanticToken("class.declaration", "C"),

tests/cases/fourslash/syntacticClassificationsForOfKeyword.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ verify.syntacticClassificationsAre(
1717

1818
const c2 = classification("2020");
1919
verify.semanticClassificationsAre("2020",
20-
c2.semanticToken("variable.declaration", "of"),
21-
c2.semanticToken("variable", "of"),
20+
c2.semanticToken("variable.declaration.local", "of"),
21+
c2.semanticToken("variable.local", "of"),
2222
);

tests/cases/fourslash/syntacticClassificationsForOfKeyword2.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ verify.syntacticClassificationsAre(
1515
c.punctuation("}")
1616
);
1717

18-
const c2 = classification("2020");
19-
verify.semanticClassificationsAre("2020",
20-
c2.semanticToken("variable.declaration", "of"),
21-
c2.semanticToken("variable", "of"),
18+
const c2 = classification("2020");
19+
verify.semanticClassificationsAre("2020",
20+
c2.semanticToken("variable.declaration.local", "of"),
21+
c2.semanticToken("variable.local", "of"),
2222
);

tests/cases/fourslash/syntacticClassificationsForOfKeyword3.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ verify.syntacticClassificationsAre(
1919

2020
const c2 = classification("2020");
2121
verify.semanticClassificationsAre("2020",
22-
c2.semanticToken("variable.declaration", "of"),
23-
c2.semanticToken("variable", "of"),
24-
c2.semanticToken("variable", "of"),
22+
c2.semanticToken("variable.declaration.local", "of"),
23+
c2.semanticToken("variable.local", "of"),
24+
c2.semanticToken("variable.local", "of"),
2525
);

0 commit comments

Comments
 (0)