Remove redundant 'jsx_string' rule. Now there's just one 'string' rule

used everywhere, which tolerates unescaped newlines.

Author: Martin Jambon

grammar.js

@@ -61,7 +61,6 @@ module.exports = grammar({
     $._jsx_attribute_value,
     $._jsx_identifier,
     $._lhs_expression,
-    $._string,
   ],
 
   conflicts: $ => [
@@ -569,7 +568,7 @@ module.exports = grammar({
     ),
 
     _jsx_attribute_value: $ => choice(
-      $.jsx_string,
+      $.string,
       $.jsx_expression,
       $._jsx_element,
       $.jsx_fragment
@@ -811,7 +810,7 @@ module.exports = grammar({
     // 2020), and perhaps will be valid in javascript as well in the
     // future.
     //
-    _string: $ => choice(
+    string: $ => choice(
       seq(
         '"',
         repeat(choice(
@@ -830,9 +829,6 @@ module.exports = grammar({
       )
     ),
 
-    string: $ => $._string,
-    jsx_string: $ => $._string,
-
     escape_sequence: $ => token.immediate(seq(
       '\\',
       choice(

src/grammar.json

@@ -2337,7 +2337,7 @@
       "members": [
         {
           "type": "SYMBOL",
-          "name": "jsx_string"
+          "name": "string"
         },
         {
           "type": "SYMBOL",
@@ -4411,7 +4411,7 @@
         ]
       }
     },
-    "_string": {
+    "string": {
       "type": "CHOICE",
       "members": [
         {
@@ -4488,14 +4488,6 @@
         }
       ]
     },
-    "string": {
-      "type": "SYMBOL",
-      "name": "_string"
-    },
-    "jsx_string": {
-      "type": "SYMBOL",
-      "name": "_string"
-    },
     "escape_sequence": {
       "type": "IMMEDIATE_TOKEN",
       "content": {
@@ -5989,8 +5981,7 @@
     "_jsx_attribute_name",
     "_jsx_attribute_value",
     "_jsx_identifier",
-    "_lhs_expression",
-    "_string"
+    "_lhs_expression"
   ],
   "supertypes": [
     "_statement",

src/node-types.json

@@ -1488,11 +1488,11 @@
           "named": true
         },
         {
-          "type": "jsx_string",
+          "type": "property_identifier",
           "named": true
         },
         {
-          "type": "property_identifier",
+          "type": "string",
           "named": true
         }
       ]
@@ -1719,21 +1719,6 @@
       }
     }
   },
-  {
-    "type": "jsx_string",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "escape_sequence",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "labeled_statement",
     "named": true,