Skip to content

Handle string literals in merge conflict regions #33914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2019
Merged

Handle string literals in merge conflict regions #33914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/services/classifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 16 additions & 0 deletions tests/cases/fourslash/syntacticClassificationsMergeConflictMarker1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"));