Merge pull request microsoft#3850 from Microsoft/textClassification

Classify Identifiers as 'Identifier', not 'Text'.

Author: CyrusNajmabadi

src/services/services.ts

@@ -6575,7 +6575,7 @@ namespace ts {
                         }
                     }
 
-                    return ClassificationType.text;
+                    return ClassificationType.identifier;
                 }
             }
 

tests/cases/fourslash/shims/getSyntacticClassifications.ts

@@ -22,8 +22,8 @@ var c = classification;
 verify.syntacticClassificationsAre(
     c.comment("// comment"),
     c.keyword("module"), c.moduleName("M"), c.punctuation("{"),
-        c.keyword("var"), c.text("v"), c.operator("="), c.numericLiteral("0"), c.operator("+"), c.numericLiteral("1"), c.punctuation(";"),
-        c.keyword("var"), c.text("s"), c.operator("="), c.stringLiteral('"string"'), c.punctuation(";"),
+        c.keyword("var"), c.identifier("v"), c.operator("="), c.numericLiteral("0"), c.operator("+"), c.numericLiteral("1"), c.punctuation(";"),
+        c.keyword("var"), c.identifier("s"), c.operator("="), c.stringLiteral('"string"'), c.punctuation(";"),
         c.keyword("class"), c.className("C"), c.punctuation("<"), c.typeParameterName("T"), c.punctuation(">"), c.punctuation("{"),
         c.punctuation("}"),
         c.keyword("enum"), c.enumName("E"), c.punctuation("{"),

tests/cases/fourslash/syntacticClassificationWithErrors.ts

@@ -8,7 +8,7 @@
 let c = classification
 verify.syntacticClassificationsAre(
     c.keyword("class"), c.className("A"), c.punctuation("{"),
-    c.text("a"), c.punctuation(":"),
+    c.identifier("a"), c.punctuation(":"),
     c.punctuation("}"),
-    c.text("c"), c.operator("=")
+    c.identifier("c"), c.operator("=")
     );

tests/cases/fourslash/syntacticClassifications1.ts

@@ -22,8 +22,8 @@ var c = classification;
 verify.syntacticClassificationsAre(
     c.comment("// comment"),
     c.keyword("module"), c.moduleName("M"), c.punctuation("{"),
-        c.keyword("var"), c.text("v"), c.operator("="), c.numericLiteral("0"), c.operator("+"), c.numericLiteral("1"), c.punctuation(";"),
-        c.keyword("var"), c.text("s"), c.operator("="), c.stringLiteral('"string"'), c.punctuation(";"),
+        c.keyword("var"), c.identifier("v"), c.operator("="), c.numericLiteral("0"), c.operator("+"), c.numericLiteral("1"), c.punctuation(";"),
+        c.keyword("var"), c.identifier("s"), c.operator("="), c.stringLiteral('"string"'), c.punctuation(";"),
         c.keyword("class"), c.className("C"), c.punctuation("<"), c.typeParameterName("T"), c.punctuation(">"), c.punctuation("{"),
         c.punctuation("}"),
         c.keyword("enum"), c.enumName("E"), c.punctuation("{"),

tests/cases/fourslash/syntacticClassificationsConflictMarkers1.ts

@@ -12,8 +12,8 @@ var c = classification;
 verify.syntacticClassificationsAre(
     c.keyword("class"), c.className("C"), c.punctuation("{"),
     c.comment("<<<<<<< HEAD"),
-    c.text("v"), c.operator("="), c.numericLiteral("1"), c.punctuation(";"),
+    c.identifier("v"), c.operator("="), c.numericLiteral("1"), c.punctuation(";"),
     c.comment("======="),
-    c.text("v"), c.punctuation("="), c.numericLiteral("2"), c.punctuation(";"),
+    c.identifier("v"), c.punctuation("="), c.numericLiteral("2"), c.punctuation(";"),
     c.comment(">>>>>>> Branch - a"),
     c.punctuation("}"));

tests/cases/fourslash/syntacticClassificationsConflictMarkers2.ts

@@ -11,5 +11,5 @@ verify.syntacticClassificationsAre(
     c.comment("<<<<<<< HEAD"),
     c.keyword("class"), c.className("C"), c.punctuation("{"), c.punctuation("}"),
     c.comment("======="),
-    c.keyword("class"), c.text("D"), c.punctuation("{"), c.punctuation("}"),
+    c.keyword("class"), c.identifier("D"), c.punctuation("{"), c.punctuation("}"),
     c.comment(">>>>>>> Branch - a"));

tests/cases/fourslash/syntacticClassificationsDocComment1.ts

@@ -13,5 +13,5 @@ verify.syntacticClassificationsAre(
     c.punctuation("}"),
     c.comment(" */"),
     c.keyword("var"),
-    c.text("v"),
+    c.identifier("v"),
     c.punctuation(";"));

tests/cases/fourslash/syntacticClassificationsDocComment2.ts

@@ -15,12 +15,12 @@ verify.syntacticClassificationsAre(
     c.punctuation("{"),
     c.keyword("function"),
     c.punctuation("("),
-    c.text("x"),
+    c.identifier("x"),
     c.punctuation(")"),
     c.punctuation(":"),
     c.keyword("string"),
     c.punctuation("}"),
     c.comment(" */"),
     c.keyword("var"),
-    c.text("v"),
+    c.identifier("v"),
     c.punctuation(";"));

tests/cases/fourslash/syntacticClassificationsDocComment3.ts

@@ -15,5 +15,5 @@ verify.syntacticClassificationsAre(
     c.keyword("number"),
     c.comment(" /* } */"),
     c.keyword("var"),
-    c.text("v"),
+    c.identifier("v"),
     c.punctuation(";"));

tests/cases/fourslash/syntacticClassificationsForOfKeyword.ts

@@ -7,9 +7,9 @@ verify.syntacticClassificationsAre(
     c.keyword("for"),
     c.punctuation("("),
     c.keyword("var"),
-    c.text("of"),
+    c.identifier("of"),
     c.keyword("of"),
-    c.text("of"),
+    c.identifier("of"),
     c.punctuation(")"),
     c.punctuation("{"),
     c.punctuation("}")