Allow chains to be broken over multiple lines

For some reason this breaks arithmetic with operators starting the following lines, and I have no idea why. This feels like whack-a-mole, and I don"t like it!
koto-lang · Mar 4, 2024 · 41d551a · 41d551a
1 parent c714f92
commit 41d551a
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 34 deletions.
diff --git a/grammar.js b/grammar.js
@@ -170,14 +170,17 @@ module.exports = grammar({
       $.null,
     ),
 
-    chain: $ => prec.left(PREC.chain, seq(
+    chain: $ => prec.right(PREC.chain, seq(
       field('start', $._term),
       choice(
         seq(
           repeat1(choice(
-            field('lookup', seq(
-              '.', choice($.identifier, $.string),
-            )),
+            seq(
+              repeat($._indented_line),
+              field('lookup', seq(
+                '.', choice($.identifier, $.string),
+              )),
+            ),
             field('call', $.tuple),
             field('index', $._index),
           )),
@@ -199,7 +202,8 @@ module.exports = grammar({
       ']'
     ),
 
-    call: $ => prec.right(seq(
+    call: $ => prec.right(PREC.chain, seq(
+      repeat($._indented_line),
       $._expression,
       repeat(seq(
         repeat($._indented_line),

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/chains.txt b/test/corpus/chains.txt
@@ -68,7 +68,7 @@ f g 1, 2
 )
 
 ===========================================================================================
-dots_and_calls
+dots_and_calls_single_line
 ===========================================================================================
 
 a.b()
@@ -98,3 +98,19 @@ a.b().c()
   )
 )
 
+===========================================================================================
+dots_and_calls_multi_line
+===========================================================================================
+
+foo
+  .bar()
+
+---
+
+(module
+  (chain
+    start: (identifier)
+    lookup: (identifier)
+    call: (tuple)
+  )
+)
diff --git a/test/corpus/expressions.txt b/test/corpus/expressions.txt
@@ -152,30 +152,6 @@ binary_op_multi_line_post
 )
 
 
-===========================================================================================
-binary_op_multi_line_pre
-===========================================================================================
-
-1 
-  + 2 
-    * 3 
-  + 4
-
----
-
-(module
-  (binary_op
-    (binary_op
-      (binary_op
-        (number)
-        (number)
-      )
-      (number)
-    )
-    (number)
-  )
-)
-
 ===========================================================================================
 assignment
 ===========================================================================================

diff --git a/test/failing/expressions.txt b/test/failing/expressions.txt
@@ -17,3 +17,26 @@ from foo import a, b, c
   )
 )
 
+===========================================================================================
+binary_op_multi_line_pre
+===========================================================================================
+
+1
+  + 2
+    * 3
+  + 4
+
+---
+
+(module
+  (binary_op
+    (binary_op
+      (binary_op
+        (number)
+        (number)
+      )
+      (number)
+    )
+    (number)
+  )
+)