fix extra lambda indent (#36)

Use proc-renderer for lambdas also (fixes parameter format as well)
arnetheduck · Feb 2, 2024 · dd146ed · dd146ed
1 parent 1f4c491
commit dd146ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/phrenderer.nim b/src/phrenderer.nim
@@ -1220,7 +1220,7 @@ proc gproc(g: var TOutput, n: PNode) =
       if reorderPostfix(n):
         gpostfixes(g, n)
 
-      gstmts(g, n[bodyPos], flags)
+      gstmts(g, n[bodyPos])
   else:
     withIndent(g):
       gmids(g, n)
@@ -1632,14 +1632,8 @@ proc gsub(g: var TOutput, n: PNode, flags: SubFlags, extra: int) =
     putWithSpace(g, tkBind, "bind")
     gsub(g, n[0])
   of nkLambda:
-    gprefixes(g, n[paramsPos])
     put(g, tkProc, "proc")
-    gsub(g, n[paramsPos], flags = {sfSkipPrefix})
-    gsub(g, n[pragmasPos])
-    optSpace(g)
-    putWithSpace(g, tkEquals, "=")
-    gmids(g, n, true, true)
-    gsubOptNL(g, n[bodyPos], strict = true)
+    gproc(g, n)
   of nkDo:
     optSpace(g)
     put(g, tkDo, $tkDo)

diff --git a/tests/after/comments.nim b/tests/after/comments.nim
@@ -216,9 +216,9 @@ block: # block colon line
 
 let x =
   proc(): int = # lambda eq line
-      # lambda first line
-      discard
-      discard
+    # lambda first line
+    discard
+    discard
 while false: # while colon line
   # while first line
   discard

diff --git a/tests/after/procs.nim b/tests/after/procs.nim
@@ -134,7 +134,7 @@ type Fp =
     aaaaaaaaaaaaaaaaa: int,
     bbbbbbbbbbbbbbb =
       proc() =
-          discard
+        discard
     ,
     cccccccccccccccccc = 30,
   )