Indent stacked dot calls (#122)

#32 introduced call chaining, but
when called outside of a `let`, the lack of indent makes it hard to tell
where the dot expression ends and where the next expression starts

To make the expression boundaries more visible, apply an indent to the
dotted calls, like so:

```nim
# old
aaaa
.f()
.g()

# new
aaaa
  .f()
  .g()
```

Author: arnetheduck

src/phrenderer.nim

@@ -1503,7 +1503,7 @@ proc gsub(g: var TOutput, n: PNode, flags: SubFlags, extra: int) =
             false
         ind = condIndent(g, doPars)
 
-      gsub(g, n[0])
+      gsub(g, n[0], flags * {sfNoIndent, sfLongIndent})
 
       var i = 1
       while i < n.len and n[i].kind notin postExprBlocks:
@@ -1522,8 +1522,27 @@ proc gsub(g: var TOutput, n: PNode, flags: SubFlags, extra: int) =
         optNL(g)
         put(g, tkParRi, $tkParRi)
     elif n.len >= 1:
-      gsub(g, n[0], flags = (flags * {sfStackDot}) + {sfStackDotInCall})
+      let
+        nameFlags =
+          (flags * {sfStackDot, sfNoIndent, sfLongIndent}) + {sfStackDotInCall}
+        stackDot =
+          if n[0].kind == nkDotExpr:
+            let dot = n[0]
+            sfStackDot in flags or (
+              g.overflows(lsub(g, dot[0]) + lsub(g, dot[1]) + 1) and
+              isStackedCall(dot[0], true)
+            )
+          else:
+            false
+
+      gsub(g, n[0], nameFlags)
+
+      # The way stacked calls work, the `.name` part will be indented when on a
+      # new line by the nkDotExpr handler - when that happens, we must also
+      # indent the list of parameters
+      let ind = g.condIndent(stackDot, flagIndent(flags))
       glist(g, n, tkParLe, start = 1, flags = {lfLongSepAtEnd})
+      g.dedent(ind)
     else:
       put(g, tkParLe, "(")
       put(g, tkParRi, ")")
@@ -1647,12 +1666,13 @@ proc gsub(g: var TOutput, n: PNode, flags: SubFlags, extra: int) =
           )
         stackNL = stackDot and sfStackDotInCall in flags
         subFlags =
-          {sfParDo} + (
+          flags * {sfNoIndent, sfLongIndent} + {sfParDo} + (
             if stackDot:
               {sfStackDot}
             else:
               {}
           )
+        wid = flagIndent(flags)
 
       gsub(g, n[0], flags = subFlags)
 
@@ -1664,8 +1684,12 @@ proc gsub(g: var TOutput, n: PNode, flags: SubFlags, extra: int) =
         gmids(g, n)
       elif stackNL:
         optNL(g)
+
+      # Careful, this indent must be matched for the parameter list in nkCall!
+      g.optIndent(wid)
       put(g, tkDot, ".")
-      gsub(g, n[1])
+      gsub(g, n[1], {sfNoIndent})
+      g.dedent(wid)
   of nkBind:
     putWithSpace(g, tkBind, "bind")
     gsub(g, n[0])

tests/after/comments.nim

@@ -445,21 +445,21 @@ echo dotexpr.dot # after dotexpr in command
 
 dotexpr
 # between dotexpr and dotonnewline
-.dotonnewline
+  .dotonnewline
 
 if true:
   echo dotexpr.dot # after dotexpr in command ind
   # between two dotepxrs ind
   dotexpr
   # between dotexpr and dotonnewline ind
-  .dotonnewline
+    .dotonnewline
 
 block:
   f.x
   # comment between the dots
-  .z()
+    .z()
   # also after call
-  .d() # far eol of dotexpr
+    .d() # far eol of dotexpr
 
   # after dotexpr ind
 

tests/after/exprs.nim

@@ -142,8 +142,8 @@ discard a .. -b
 discard -1 .. -2
 
 aaaaaaa.bbbbbbbbb
-.longdotcall().ccccccccc.dddddddddd.eeeeeeeee
-.sdcsd(a0000000, b000000, c000000).fffffff.ggggggg.hhhhhhhh.csdcsdcs.sdcsdcsd.csdcsdcsdcsd.csdcsdcs.dcsdcsdcsdcs.sdc
+  .longdotcall().ccccccccc.dddddddddd.eeeeeeeee
+  .sdcsd(a0000000, b000000, c000000).fffffff.ggggggg.hhhhhhhh.csdcsdcs.sdcsdcsd.csdcsdcsdcsd.csdcsdcs.dcsdcsdcsdcs.sdc
 
 mynums = myNums
   .replace1("one", "o1ne")
@@ -154,8 +154,8 @@ mynums = myNums
   .replace6("six", "s6ix")
   .replace7("seven", "s7even")
 aaaaaaaaaaaaaaaaaaaaa.bbbbbbbbbbbbbbbbbbbbbb
-.ccccccccccccccccccccccccccc().ccccccccccccccccccccccccc
-.ddddddddddddddddd() # no newline before previous dotexpr
+  .ccccccccccccccccccccccccccc().ccccccccccccccccccccccccc
+  .ddddddddddddddddd() # no newline before previous dotexpr
 
 let xxxxxxxxx = block:
   f()
@@ -244,3 +244,53 @@ let xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx =
 let xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = """
 
 """
+
+csasacdsa
+  .casdcasdcsadc(
+    aaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccc
+  )
+  .cccccccccc(eeeeeeeeeeeeeeeeeeeeee, bbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccc)
+  .ddddddd()
+  .eeeeeeeee()
+
+if csasacdsa
+    .casdcasdcsadc(
+      aaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccc
+    )
+    .cccccccccc(eeeeeeeeeeeeeeeeeeeeee, bbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccc)
+    .ddddddd()
+    .eeeeeeeee():
+  discard
+
+if csasacdsa
+    .casdcasdcsadc(
+      aaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccc
+    )
+    .cccccccccc(eeeeeeeeeeeeeeeeeeeeee, bbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccc)
+    .ddddddd()
+    .eeeeeeeee() and
+    csasacdsa
+    .casdcasdcsadc(
+      aaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccc
+    )
+    .cccccccccc(eeeeeeeeeeeeeeeeeeeeee, bbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccc)
+    .ddddddd()
+    .eeeeeeeee():
+  discard
+
+let x = csasacdsa
+  .casdcasdcsadc(
+    aaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccc
+  )
+  .cccccccccc(eeeeeeeeeeeeeeeeeeeeee, bbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccc)
+  .ddddddd()
+  .eeeeeeeee()
+
+let x = csasacdsa
+  .casdcasdcsadc(
+    aaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccc
+  )
+  .cccccccccc(eeeeeeeeeeeeeeeeeeeeee, bbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccc)
+  .ddddddd()
+  .eeeeeeeee().valueOr:
+    discard