Rename interpolation_identifier

corpus/expressions.txt

@@ -706,9 +706,9 @@ def matchTest(x: Int): String = x match {
             (identifier)
             (interpolated_string
               (interpolation
-                (dollar_identifier))
+                (interpolation_identifier))
               (interpolation
-                (dollar_identifier))))
+                (interpolation_identifier))))
           (infix_expression
             (identifier)
             (operator_identifier)

corpus/literals.txt

@@ -53,7 +53,7 @@ val string7 = s"$$ $a"
       (identifier)
       (interpolated_string
         (interpolation
-          (dollar_identifier))
+          (interpolation_identifier))
         (interpolation
           (block
             (identifier))))))
@@ -63,7 +63,7 @@ val string7 = s"$$ $a"
       (identifier)
       (interpolated_string
         (interpolation
-          (dollar_identifier)))))
+          (interpolation_identifier)))))
   (val_definition
     (identifier)
     (interpolated_string_expression
@@ -86,28 +86,28 @@ val string7 = s"$$ $a"
       (identifier)
       (interpolated_string
         (interpolation
-          (dollar_identifier))
+          (interpolation_identifier))
         (interpolation
           (block
             (identifier)))
         (interpolation
-          (dollar_identifier)))))
+          (interpolation_identifier)))))
   (val_definition
     (identifier)
     (interpolated_string_expression
       (identifier)
         (interpolated_string
           (interpolation
-            (dollar_identifier))
+            (interpolation_identifier))
           (interpolation
-            (dollar_identifier)))))
+            (interpolation_identifier)))))
   (val_definition
     (identifier)
     (interpolated_string_expression
       (identifier)
       (interpolated_string
         (interpolation
-          (dollar_identifier))))))
+          (interpolation_identifier))))))
 
 
 ================================================================================

corpus/patterns.txt

@@ -104,13 +104,13 @@ def showNotification(notification: Notification): String = {
       (match_expression (identifier) (case_block
         (case_clause
           (case_class_pattern (type_identifier) (identifier) (identifier) (wildcard))
-          (interpolated_string_expression (identifier) (interpolated_string (interpolation (dollar_identifier)) (interpolation (dollar_identifier)))))
+          (interpolated_string_expression (identifier) (interpolated_string (interpolation (interpolation_identifier)) (interpolation (interpolation_identifier)))))
         (case_clause
           (case_class_pattern (type_identifier) (identifier) (identifier))
-          (interpolated_string_expression (identifier) (interpolated_string (interpolation (dollar_identifier)) (interpolation (dollar_identifier)))))
+          (interpolated_string_expression (identifier) (interpolated_string (interpolation (interpolation_identifier)) (interpolation (interpolation_identifier)))))
         (case_clause
           (case_class_pattern (type_identifier) (identifier) (identifier))
-          (interpolated_string_expression (identifier) (interpolated_string (interpolation (dollar_identifier)) (interpolation (dollar_identifier))))))))))
+          (interpolated_string_expression (identifier) (interpolated_string (interpolation (interpolation_identifier)) (interpolation (interpolation_identifier))))))))))
 
 ============================
 Infix patterns

grammar.js

@@ -1405,7 +1405,7 @@ module.exports = grammar({
      * suffix and can be approximated as
      * /[A-Za-z_][A-Z_a-z0-9]/;
      */
-    dollar_identifier: $ =>
+    interpolation_identifier: $ =>
       /[\p{Lu}\p{Lt}\p{Nl}\p{Lo}\p{Lm}\p{Ll}_\u00AA\u00BB\u02B0-\u02B8\u02C0-\u02C1\u02E0-\u02E4\u037A\u1D78\u1D9B-\u1DBF\u2071\u207F\u2090-\u209C\u2C7C-\u2C7D\uA69C-\uA69D\uA770\uA7F8-\uA7F9\uAB5C-\uAB5F][\p{Lu}\p{Lt}\p{Nl}\p{Lo}\p{Lm}\p{Ll}_\u00AA\u00BB\u02B0-\u02B8\u02C0-\u02C1\u02E0-\u02E4\u037A\u1D78\u1D9B-\u1DBF\u2071\u207F\u2090-\u209C\u2C7C-\u2C7D\uA69C-\uA69D\uA770\uA7F8-\uA7F9\uAB5C-\uAB5F0-9_\p{Ll}]*/,
 
     _backquoted_id: $ => /`[^\n`]+`/,
@@ -1514,7 +1514,7 @@ module.exports = grammar({
 
     _dollar_escape: $ => seq('$', '$'),
 
-    interpolation: $ => seq("$", choice($.dollar_identifier, $.block)),
+    interpolation: $ => seq("$", choice($.interpolation_identifier, $.block)),
 
     interpolated_string: $ =>
       choice(

queries/scala/highlights.scm

@@ -25,7 +25,7 @@
 
 (self_type (identifier) @parameter)
 
-(interpolation (dollar_identifier) @none)
+(interpolation (interpolation_identifier) @none)
 (interpolation (block) @none)
 
 ;; types

queries/scala/locals.scm

@@ -28,4 +28,4 @@
 
 (identifier) @local.reference
 
-(dollar_identifier) @local.reference
+(interpolation_identifier) @local.reference