Merge pull request #84 from jmbockhorst/cons-pattern

Parse multiple cons_pattern better
elm-tooling · Feb 23, 2021 · 413fc74 · 413fc74
2 parents dafaa5b + 5dd6eca
commit 413fc74
Show file tree

Hide file tree

Showing 5 changed files with 13,887 additions and 13,863 deletions.
diff --git a/grammar.js b/grammar.js
@@ -591,7 +591,7 @@ module.exports = grammar({
     cons_pattern: ($) =>
       seq(
         field("part", $._single_pattern_cons),
-        repeat1(seq("::", field("part", $._single_pattern_cons)))
+        seq("::", field("part", choice($.cons_pattern, $._single_pattern_cons)))
       ),
 
     _single_pattern_cons: ($) =>

diff --git a/src/grammar.json b/src/grammar.json
@@ -2357,24 +2357,30 @@
           }
         },
         {
-          "type": "REPEAT1",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "::"
-              },
-              {
-                "type": "FIELD",
-                "name": "part",
-                "content": {
-                  "type": "SYMBOL",
-                  "name": "_single_pattern_cons"
-                }
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "::"
+            },
+            {
+              "type": "FIELD",
+              "name": "part",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "cons_pattern"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "_single_pattern_cons"
+                  }
+                ]
               }
-            ]
-          }
+            }
+          ]
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -536,6 +536,10 @@
             "type": "char_constant_expr",
             "named": true
           },
+          {
+            "type": "cons_pattern",
+            "named": true
+          },
           {
             "type": "list_pattern",
             "named": true