Use the faster implmentation of the 2020 syntaxtical classifications

microsoft · Oct 5, 2020 · 4dcce0f · 4dcce0f
1 parent 23cb2d8
commit 4dcce0f
Show file tree

Hide file tree

Showing 8 changed files with 1,859 additions and 162 deletions.
diff --git a/src/services/classifier2020.ts b/src/services/classifier2020.ts
diff --git a/tests/cases/fourslash/semanticClassificationClassExpression.ts b/tests/cases/fourslash/semanticClassificationClassExpression.ts
@@ -14,8 +14,8 @@ verify.semanticClassificationsAre("original",
 const c2 = classification("2020");
 verify.semanticClassificationsAre("2020",
     c2.semanticToken("class.declaration", "x"), 
-    c2.semanticToken("class", "C"), 
+    c2.semanticToken("class.declaration", "C"), 
     c2.semanticToken("class.declaration", "C"), 
     c2.semanticToken("class.declaration", "D"), 
-    c2.semanticToken("class", "B"), 
+    c2.semanticToken("class.declaration", "B"), 
 );
diff --git a/tests/cases/fourslash/semanticClassificationUninstantiatedModuleWithVariableOfSameName1.ts b/tests/cases/fourslash/semanticClassificationUninstantiatedModuleWithVariableOfSameName1.ts
@@ -13,9 +13,11 @@ verify.semanticClassificationsAre("original",
     c.moduleName("M", test.marker("0").position),
     c.interfaceName("I", test.marker("1").position));
 
+
+
 const c2 = classification("2020");
 verify.semanticClassificationsAre("2020",
-    c2.semanticToken("variable", "M"), 
+    c2.semanticToken("namespace.declaration", "M"), 
     c2.semanticToken("interface.declaration", "I"), 
     c2.semanticToken("variable.declaration", "M"), 
     c2.semanticToken("property.declaration", "I"), 

diff --git a/tests/cases/fourslash/semanticClassificationUninstantiatedModuleWithVariableOfSameName2.ts b/tests/cases/fourslash/semanticClassificationUninstantiatedModuleWithVariableOfSameName2.ts
@@ -23,7 +23,7 @@ verify.semanticClassificationsAre("original",
 
 const c2 = classification("2020");
 verify.semanticClassificationsAre("2020",
-    c2.semanticToken("variable", "M"), 
+    c2.semanticToken("namespace.declaration", "M"), 
     c2.semanticToken("interface.declaration", "I"), 
     c2.semanticToken("variable.declaration", "M"), 
     c2.semanticToken("property.declaration", "foo"), 
@@ -34,4 +34,3 @@ verify.semanticClassificationsAre("2020",
     c2.semanticToken("variable.declaration", "x"), 
     c2.semanticToken("variable", "M"), 
 );
-
diff --git a/tests/cases/fourslash/semanticClassificationWithUnionTypes.ts b/tests/cases/fourslash/semanticClassificationWithUnionTypes.ts
@@ -25,7 +25,7 @@ verify.semanticClassificationsAre("original",
 
 const c2 = classification("2020");
 verify.semanticClassificationsAre("2020",
-    c2.semanticToken("variable", "M"), 
+    c2.semanticToken("namespace.declaration", "M"), 
     c2.semanticToken("interface.declaration", "I"), 
     c2.semanticToken("interface.declaration", "I"), 
     c2.semanticToken("class.declaration", "C"), 

diff --git a/tests/cases/fourslash/syntacticClassificationsForOfKeyword.ts b/tests/cases/fourslash/syntacticClassificationsForOfKeyword.ts
@@ -17,6 +17,6 @@ verify.syntacticClassificationsAre(
 
 const c2 = classification("2020");
 verify.semanticClassificationsAre("2020",
-    c2.semanticToken("variable.declaration", "of"), 
-    c2.semanticToken("variable", "of"), 
+    c2.semanticToken("variable.declaration.local", "of"), 
+    c2.semanticToken("variable.local", "of"), 
 );
diff --git a/tests/cases/fourslash/syntacticClassificationsForOfKeyword2.ts b/tests/cases/fourslash/syntacticClassificationsForOfKeyword2.ts
@@ -15,8 +15,8 @@ verify.syntacticClassificationsAre(
     c.punctuation("}")
     );
 
-const c2 = classification("2020");
-verify.semanticClassificationsAre("2020",
-    c2.semanticToken("variable.declaration", "of"), 
-    c2.semanticToken("variable", "of"), 
+const c2 = classification("2020");
+verify.semanticClassificationsAre("2020",
+    c2.semanticToken("variable.declaration.local", "of"), 
+    c2.semanticToken("variable.local", "of"), 
 );
diff --git a/tests/cases/fourslash/syntacticClassificationsForOfKeyword3.ts b/tests/cases/fourslash/syntacticClassificationsForOfKeyword3.ts
@@ -19,7 +19,7 @@ verify.syntacticClassificationsAre(
 
 const c2 = classification("2020");
 verify.semanticClassificationsAre("2020",
-    c2.semanticToken("variable.declaration", "of"), 
-    c2.semanticToken("variable", "of"), 
-    c2.semanticToken("variable", "of"), 
+    c2.semanticToken("variable.declaration.local", "of"), 
+    c2.semanticToken("variable.local", "of"), 
+    c2.semanticToken("variable.local", "of"), 
 );