Fix single line block unnesting with hidden whitespace, closes #79 (#85)

fredrikekre · Oct 28, 2024 · e10cd92 · e10cd92
1 parent 63433c6
commit e10cd92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/runestone.jl b/src/runestone.jl
@@ -2026,6 +2026,12 @@ function indent_block(
         if kind(kids′[insert_idx]) === K"Whitespace"
             kids′, ws = popatview!(kids′, insert_idx)
             wsspn = span(ws)
+        elseif !is_leaf(kids′[insert_idx]) &&
+                kind(first_leaf(kids′[insert_idx])) === K"Whitespace"
+            ws = first_leaf(kids′[insert_idx])
+            kids′[insert_idx] = replace_first_leaf(kids′[insert_idx], nullnode)
+            any_kid_changed = true
+            wsspn = span(ws)
         end
         # If we end up in this code path we are most likely splitting a single line block
         # into multiples lines. This means that we haven't yet updated the indent level for

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1135,6 +1135,8 @@ end
         for mut in ("", "mutable ")
             @test format_string("$(mut)struct A$(d)x$(d)end") == "$(mut)struct A\n    x\nend"
         end
+        # https://github.com/fredrikekre/Runic.jl/issues/79
+        @test format_string("while true$(d)x += 1\nend") == "while true\n    x += 1\nend"
     end # d-loop
     # module-end, baremodule-end
     for b in ("", "bare")