Merge pull request #68 from nrfulton/master

Adds support for $ in identifiers.

Author: eed3si9n

corpus/definitions.txt

@@ -351,6 +351,30 @@ class A {
         (identifier)
         (type_identifier)))))
 
+=======================================
+$ in identifier names
+=======================================
+
+class $A$B$ {
+  val b$, c$ : Int
+  val d$ : String
+}
+
+---
+
+(compilation_unit
+  (class_definition
+    (identifier)
+    (template_body
+      (val_declaration
+        (identifier)
+        (identifier)
+        (type_identifier))
+      (val_declaration
+        (identifier)
+        (type_identifier)))))
+
+
 =======================================
 Value declarations (Scala 3 syntax)
 =======================================

grammar.js

@@ -778,7 +778,7 @@ module.exports = grammar({
     ),
 
     // TODO: Include operators.
-    _plainid: $ => /[a-zA-Z_]\w*/,
+    _plainid: $ => /[a-zA-Z_\\$][\w\\$]*/,
     _backquoted_id: $=> /`[^\n`]+`/,
     identifier: $ => choice(
       $._plainid, 

src/grammar.json

@@ -3958,7 +3958,7 @@
     },
     "_plainid": {
       "type": "PATTERN",
-      "value": "[a-zA-Z_]\\w*"
+      "value": "[a-zA-Z_\\\\$][\\w\\\\$]*"
     },
     "_backquoted_id": {
       "type": "PATTERN",