fix #728 (#735)

domluna · Jun 7, 2023 · fd4fae3 · fd4fae3 · domluna · Jun 7, 2023
1 parent f2a5bbe
commit fd4fae3
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/src/print.jl b/src/print.jl
@@ -73,13 +73,23 @@ function print_tree(
                    (nodes[i+2].typ === Block || nodes[i+2].typ === Begin)
                 if noindent
                     add_indent!(nodes[i+2], s, -s.opts.indent)
+                    # this captures the trailing comment is not captured as being part of the block
+                    if i + 4 <= length(nodes) && nodes[i+4].typ === NOTCODE
+                        nodes[i+4].indent -= s.opts.indent
+                    end
+                else
+                    n.indent = nodes[i+2].indent
                 end
-                n.indent = nodes[i+2].indent
             elseif i > 2 && (nodes[i-2].typ === Block || nodes[i-2].typ === Begin)
                 if noindent
-                    add_indent!(nodes[i+2], s, -s.opts.indent)
+                    add_indent!(nodes[i-2], s, -s.opts.indent)
+                else
+                    n.indent = nodes[i-2].indent
                 end
-                n.indent = nodes[i-2].indent
+            end
+
+            if noindent
+                n.indent -= s.opts.indent
             end
         end
 

diff --git a/test/issues.jl b/test/issues.jl
@@ -1660,4 +1660,26 @@
         """
         @test fmt(s, 4, 92, always_use_return = true) == s
     end
+    @testset "728" begin
+        s = """
+        begin
+        #! format: noindent
+
+        # This is OK
+        function foo end
+
+        # This is not
+
+        end
+        """
+        @test fmt(s, 4, 92) == s
+
+        s = """
+        begin
+        #! format: noindent
+
+        end
+        """
+        @test fmt(s, 4, 92) == s
+    end
 end