fix available characters in the identifier

grammar.js

@@ -22,8 +22,6 @@ module.exports = grammar({
     $.line_comment,
   ],
 
-  word: ($) => $._identifier,
-
   conflicts: ($) => [[$._connection_path, $.container]],
 
   rules: {
@@ -116,14 +114,17 @@ module.exports = grammar({
         )
       ),
 
-    shape_key: ($) => choice($.string, seq($._identifier, optional($._dash))),
+    shape_key: ($) => choice($.string, $._identifier),
 
     _identifier: ($) =>
-      token(
+      seq(
-        prec(
+        optional("-"),
-          PREC.IDENTIFIER,
+        /[\w\d$]/,
-          /\-?([\w\d]+([\w\d`'"]+)?|([\w\d]+([\w\d `'"]+)?( +|\-)[\w\d]+([\w\d `'"]+)?)+)/
+        repeat(
-        )
+          token(prec(PREC.IDENTIFIER, /([\w\d'"$(),]+)?( +|-)[\w\d'"$()]+/))
+        ),
+        optional(/[\w\d'"$()]+/),
+        optional($._dash)
       ),
 
     text_block: ($) =>

src/grammar.json

@@ -1,6 +1,5 @@
 {
   "name": "d2",
-  "word": "_identifier",
   "rules": {
     "source_file": {
       "type": "REPEAT",
@@ -474,11 +473,55 @@
           "name": "string"
         },
         {
+          "type": "SYMBOL",
+          "name": "_identifier"
+        }
+      ]
+    },
+    "_identifier": {
       "type": "SEQ",
       "members": [
         {
-              "type": "SYMBOL",
+          "type": "CHOICE",
-              "name": "_identifier"
+          "members": [
+            {
+              "type": "STRING",
+              "value": "-"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "PATTERN",
+          "value": "[\\w\\d$]"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 0,
+              "content": {
+                "type": "PATTERN",
+                "value": "([\\w\\d'\"$(),]+)?( +|-)[\\w\\d'\"$()]+"
+              }
+            }
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "PATTERN",
+              "value": "[\\w\\d'\"$()]+"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
           "type": "CHOICE",
@@ -493,19 +536,6 @@
           ]
         }
       ]
-        }
-      ]
-    },
-    "_identifier": {
-      "type": "TOKEN",
-      "content": {
-        "type": "PREC",
-        "value": 0,
-        "content": {
-          "type": "PATTERN",
-          "value": "\\-?([\\w\\d]+([\\w\\d`'\"]+)?|([\\w\\d]+([\\w\\d `'\"]+)?( +|\\-)[\\w\\d]+([\\w\\d `'\"]+)?)+)"
-        }
-      }
     },
     "text_block": {
       "type": "CHOICE",
@@ -1249,29 +1279,6 @@
               "value": "\""
             }
           ]
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "`"
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "IMMEDIATE_TOKEN",
-                "content": {
-                  "type": "PATTERN",
-                  "value": "[^`\\n]+"
-                }
-              }
-            },
-            {
-              "type": "STRING",
-              "value": "`"
-            }
-          ]
         }
       ]
     },

src/node-types.json

@@ -322,6 +322,10 @@
     "type": "'",
     "named": false
   },
+  {
+    "type": "-",
+    "named": false
+  },
   {
     "type": "3d",
     "named": false
@@ -334,10 +338,6 @@
     "type": ";",
     "named": false
   },
-  {
-    "type": "`",
-    "named": false
-  },
   {
     "type": "`|",
     "named": false

test/corpus/connection.txt

@@ -103,20 +103,24 @@ Complex identifier connection
 ================================================================================
 Foo Bar -- Biz Baz
 -Bar-Foo- <- -Baz-Biz-
+imAShape -- im_a_shape
+im_a_shape -- im$AShape
+im a shape -- i'm $a shape
+i'm a shape -- a-sh$ape
+a-shape -- im a sh$ape
+foo' 'bar -- baz
 
 --------------------------------------------------------------------------------
 
 (source_file
-  (connection
+  (connection (shape_key) (arrow) (shape_key))
-    (shape_key)
+  (connection (shape_key) (arrow) (shape_key))
-    (arrow)
+  (connection (shape_key) (arrow) (shape_key))
-    (shape_key)
+  (connection (shape_key) (arrow) (shape_key))
-  )
+  (connection (shape_key) (arrow) (shape_key))
-  (connection
+  (connection (shape_key) (arrow) (shape_key))
-    (shape_key)
+  (connection (shape_key) (arrow) (shape_key))
-    (arrow)
+  (connection (shape_key) (arrow) (shape_key))
-    (shape_key)
-  )
 )
 
 ================================================================================

test/corpus/shape.txt

@@ -27,10 +27,11 @@ Complex shape key
  Foo bar 
 -Biz-baz-
 imAShape
-im_a_shape
+im_a$_shape
 im a shape
 i'm a shape
 a-shape
+changeTeam(member, props, ctx)
 
 --------------------------------------------------------------------------------
 
@@ -42,6 +43,7 @@ a-shape
   (shape (shape_key))
   (shape (shape_key))
   (shape (shape_key))
+  (shape (shape_key))
 )
 
 ================================================================================