fix unquoted strings and identifiers

grammar.js

@@ -116,7 +116,12 @@ module.exports = grammar({
     shape_key: ($) => choice($.string, seq($._identifier, optional($._dash))),
 
     _identifier: ($) =>
-      token(prec(PREC.IDENTIFIER, /\-?([\w\d]+|([\w\d]+( +|\-)[\w\d]+)+)/)),
+      token(
+        prec(
+          PREC.IDENTIFIER,
+          /\-?([\w\d]+([\w\d`'"]+)?|([\w\d]+([\w\d `'"]+)?( +|\-)[\w\d]+([\w\d `'"]+)?)+)/
+        )
+      ),
 
     // attributes
 
@@ -255,7 +260,7 @@ module.exports = grammar({
     dot: ($) => token("."),
 
     _unquoted_string: ($) =>
-      token(prec(PREC.UNQUOTED_STRING, /[\w\-?!]([^'"`\n;{}]*[\w\-?!])?/)),
+      token(prec(PREC.UNQUOTED_STRING, /[^'"`\n\s;{}]([^\n;{}]*[^\n\s;{}])?/)),
 
     string: ($) =>
       choice(

src/grammar.json

@@ -502,7 +502,7 @@
         "value": 0,
         "content": {
           "type": "PATTERN",
-          "value": "\\-?([\\w\\d]+|([\\w\\d]+( +|\\-)[\\w\\d]+)+)"
+          "value": "\\-?([\\w\\d]+([\\w\\d`'\"]+)?|([\\w\\d]+([\\w\\d `'\"]+)?( +|\\-)[\\w\\d]+([\\w\\d `'\"]+)?)+)"
         }
       }
     },
@@ -1103,7 +1103,7 @@
         "value": 0,
         "content": {
           "type": "PATTERN",
-          "value": "[\\w\\-?!]([^'\"`\\n;{}]*[\\w\\-?!])?"
+          "value": "[^'\"`\\n\\s;{}]([^\\n;{}]*[^\\n\\s;{}])?"
         }
       }
     },

test/corpus/attributes.txt

@@ -6,7 +6,7 @@ direction: value
 shape: oval
 label: ten
 constraint: utehu
-icon: huell
+icon: ./test.svg
 opacity: 1
 fill: red
 stroke: red
@@ -392,3 +392,4 @@ foo -> bar: {
   )
 )
 
+

test/corpus/shape.txt

@@ -26,12 +26,22 @@ Complex shape key
 ================================================================================
  Foo bar 
 -Biz-baz-
+imAShape
+im_a_shape
+im a shape
+i'm a shape
+a-shape
 
 --------------------------------------------------------------------------------
 
 (source_file
   (shape (shape_key))
   (shape (shape_key))
+  (shape (shape_key))
+  (shape (shape_key))
+  (shape (shape_key))
+  (shape (shape_key))
+  (shape (shape_key))
 )
 
 ================================================================================