Don't consume trailing newlines as part layouts (#74)

Additionally, using left-associative precedence for lambda case causes brace layouts to fail
tree-sitter · Mar 12, 2022 · 0fcad22 · 0fcad22
1 parent e4335ea
commit 0fcad22
Show file tree

Hide file tree

Showing 8 changed files with 333,390 additions and 314,090 deletions.
diff --git a/grammar.js b/grammar.js
@@ -20,6 +20,7 @@ module.exports = grammar({
   extras: $ => [
     /\p{Zs}/,
     /\n/,
+    /\r/,
     $.cpp,
     $.comment,
     $.pragma,
@@ -201,6 +202,8 @@ module.exports = grammar({
      * Implicit parameters have slightly weird restrictions.
      */
     [$._type_or_implicit, $._context_constraints],
+
+    [$.exp_lambda_case],
   ],
 
   word: $ => $._varid,

diff --git a/grammar/exp.js b/grammar/exp.js
@@ -156,11 +156,11 @@ module.exports = {
   /**
    * left associative because the alts are optional
    */
-  exp_lambda_case: $ => prec.left(seq(
+  exp_lambda_case: $ => seq(
     '\\',
     'case',
     optional($.alts),
-  )),
+  ),
 
   rec: $ => seq(
     'rec',

diff --git a/src/grammar.json b/src/grammar.json
@@ -4031,33 +4031,29 @@
       ]
     },
     "exp_lambda_case": {
-      "type": "PREC_LEFT",
-      "value": 0,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "\\"
-          },
-          {
-            "type": "STRING",
-            "value": "case"
-          },
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "alts"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        ]
-      }
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\\"
+        },
+        {
+          "type": "STRING",
+          "value": "case"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "alts"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
     },
     "rec": {
       "type": "SEQ",
@@ -8972,6 +8968,10 @@
       "type": "PATTERN",
       "value": "\\n"
     },
+    {
+      "type": "PATTERN",
+      "value": "\\r"
+    },
     {
       "type": "SYMBOL",
       "name": "cpp"
@@ -9071,6 +9071,9 @@
     [
       "_type_or_implicit",
       "_context_constraints"
+    ],
+    [
+      "exp_lambda_case"
     ]
   ],
   "precedences": [