[jsx mode] Narrow test for trailing-comma generic

marijnh · marijnh · commit adc4282471ee · 2023-10-27T10:34:30.000+02:00
Issue codemirror#7073
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
@@ -103,7 +103,8 @@
     }
 
     function jsToken(stream, state, cx) {
-      if (stream.peek() == "<" && !/,\s*>/.test(stream.string) && jsMode.expressionAllowed(stream, cx.state)) {
+      if (stream.peek() == "<" && !stream.match(/^<([^<>]|<[^>]*>)+,\s*>/, false) &&
+          jsMode.expressionAllowed(stream, cx.state)) {
         state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),
                                     xmlMode, 0, state.context)
         jsMode.skipExpression(cx.state)

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`function jsToken(stream, state, cx) {`
`106`		`- if (stream.peek() == "<" && !/,\s*>/.test(stream.string) && jsMode.expressionAllowed(stream, cx.state)) {`
	`106`	`+ if (stream.peek() == "<" && !stream.match(/^<([^<>]\|<[^>]>)+,\s>/, false) &&`
	`107`	`+ jsMode.expressionAllowed(stream, cx.state)) {`
`107`	`108`	`state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),`
`108`	`109`	`xmlMode, 0, state.context)`
`109`	`110`	`jsMode.skipExpression(cx.state)`