Merge pull request tree-sitter#157 from brandonspark/string-interpolations

feat(java 21): add string templates

Author: aryx

grammar.js

@@ -158,6 +158,7 @@ module.exports = grammar({
       repeat(choice(
         $.string_fragment,
         $.escape_sequence,
+        $.string_interpolation,
       )),
       '"'
     ),
@@ -166,6 +167,7 @@ module.exports = grammar({
       repeat(choice(
         alias($._multiline_string_fragment, $.multiline_string_fragment),
         $._escape_sequence,
+        $.string_interpolation,
       )),
       '"""'
     ),
@@ -181,6 +183,12 @@ module.exports = grammar({
         seq(/"[^"]*/, repeat(/[^"]+/))
       )),
 
+    string_interpolation: $ => seq(
+      '\\{',
+      $.expression,
+      '}'
+    ),
+
     _escape_sequence: $ =>
       choice(
         prec(2, token.immediate(seq('\\', /[^abfnrtvxu'\"\\\?]/))),
@@ -336,6 +344,7 @@ module.exports = grammar({
       $.method_invocation,
       $.method_reference,
       $.array_creation_expression,
+      $.template_expression
     ),
 
     array_creation_expression: $ => prec.right(seq(
@@ -386,6 +395,12 @@ module.exports = grammar({
       field('field', choice($.identifier, $._reserved_identifier, $.this))
     ),
 
+    template_expression: $ => seq(
+      field('template_processor', $.primary_expression),
+      '.',
+      field('template_argument', $.string_literal)
+    ),
+
     array_access: $ => seq(
       field('array', $.primary_expression),
       '[',

src/grammar.json

@@ -1268,6 +1268,10 @@
               {
                 "type": "SYMBOL",
                 "name": "escape_sequence"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "string_interpolation"
               }
             ]
           }
@@ -1302,6 +1306,10 @@
               {
                 "type": "SYMBOL",
                 "name": "_escape_sequence"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "string_interpolation"
               }
             ]
           }
@@ -1352,6 +1360,23 @@
         ]
       }
     },
+    "string_interpolation": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\\{"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
     "_escape_sequence": {
       "type": "CHOICE",
       "members": [
@@ -2751,6 +2776,10 @@
         {
           "type": "SYMBOL",
           "name": "array_creation_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "template_expression"
         }
       ]
     },
@@ -3077,6 +3106,31 @@
         }
       ]
     },
+    "template_expression": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "template_processor",
+          "content": {
+            "type": "SYMBOL",
+            "name": "primary_expression"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "."
+        },
+        {
+          "type": "FIELD",
+          "name": "template_argument",
+          "content": {
+            "type": "SYMBOL",
+            "name": "string_literal"
+          }
+        }
+      ]
+    },
     "array_access": {
       "type": "SEQ",
       "members": [

src/node-types.json

@@ -279,6 +279,10 @@
         "type": "parenthesized_expression",
         "named": true
       },
+      {
+        "type": "template_expression",
+        "named": true
+      },
       {
         "type": "this",
         "named": true
@@ -3351,6 +3355,21 @@
       ]
     }
   },
+  {
+    "type": "string_interpolation",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "expression",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "string_literal",
     "named": true,
@@ -3370,6 +3389,10 @@
         {
           "type": "string_fragment",
           "named": true
+        },
+        {
+          "type": "string_interpolation",
+          "named": true
         }
       ]
     }
@@ -3540,6 +3563,32 @@
       ]
     }
   },
+  {
+    "type": "template_expression",
+    "named": true,
+    "fields": {
+      "template_argument": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "string_literal",
+            "named": true
+          }
+        ]
+      },
+      "template_processor": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "primary_expression",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "ternary_expression",
     "named": true,
@@ -4143,6 +4192,10 @@
     "type": "[",
     "named": false
   },
+  {
+    "type": "\\{",
+    "named": false
+  },
   {
     "type": "]",
     "named": false