Skip to content

Commit 07dcff7

Browse files
committed
fix: allow ampersands not followed by # or a letter in jsx strings
1 parent 9802cc5 commit 07dcff7

File tree

6 files changed

+4848
-4441
lines changed

6 files changed

+4848
-4441
lines changed

grammar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,10 +716,10 @@ module.exports = grammar({
716716
// We give names to the token() constructs containing a regexp
717717
// so as to obtain a node in the CST.
718718
//
719-
unescaped_double_jsx_string_fragment: _ => token.immediate(prec(1, /[^"&]+/)),
719+
unescaped_double_jsx_string_fragment: _ => token.immediate(prec(1, /([^"&]|&[^#A-Za-z])+/)),
720720

721721
// same here
722-
unescaped_single_jsx_string_fragment: _ => token.immediate(prec(1, /[^'&]+/)),
722+
unescaped_single_jsx_string_fragment: _ => token.immediate(prec(1, /([^'&]|&[^#A-Za-z])+/)),
723723

724724
_jsx_attribute_value: $ => choice(
725725
alias($._jsx_string, $.string),

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"keywords": [
77
"parser",
88
"lexer",
9-
"javascript"
9+
"javascript"
1010
],
1111
"repository": {
1212
"type": "git",
@@ -40,6 +40,9 @@
4040
"queries/highlights-jsx.scm",
4141
"queries/highlights-params.scm"
4242
],
43+
"tags": [
44+
"queries/tags.scm"
45+
],
4346
"injection-regex": "^(js|javascript)$"
4447
}
4548
]

src/grammar.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)