Merge pull request #33914 from amcasey/ConflictMarker

Handle string literals in merge conflict regions

Author: amcasey

src/services/classifier.ts

@@ -985,8 +985,7 @@ namespace ts {
                 return ClassificationType.bigintLiteral;
             }
             else if (tokenKind === SyntaxKind.StringLiteral) {
-                // TODO: GH#18217
-                return token!.parent.kind === SyntaxKind.JsxAttribute ? ClassificationType.jsxAttributeStringLiteralValue : ClassificationType.stringLiteral;
+                return token && token.parent.kind === SyntaxKind.JsxAttribute ? ClassificationType.jsxAttributeStringLiteralValue : ClassificationType.stringLiteral;
             }
             else if (tokenKind === SyntaxKind.RegularExpressionLiteral) {
                 // TODO: we should get another classification type for these literals.

tests/cases/fourslash/syntacticClassificationsMergeConflictMarker1.ts

@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts"/>
+
+//// <<<<<<< HEAD
+//// "AAAA"
+//// =======
+//// "BBBB"
+//// >>>>>>> Feature
+
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("<<<<<<< HEAD"),
+    c.stringLiteral("\"AAAA\""),
+    c.comment("======="),
+    c.stringLiteral("\"BBBB\""),
+    c.comment(">>>>>>> Feature"));