Put semi colon on calls with only keyword arguments on first line

fredrikekre · Jul 20, 2024 · d09e6af · d09e6af
1 parent 2dfe195
commit d09e6af
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 0 deletions.
diff --git a/src/runestone.jl b/src/runestone.jl
@@ -1879,6 +1879,54 @@ function indent_listlike(
             any_kid_changed = true
             push!(kids′, kid)
             accept_node!(ctx, kid)
+        elseif kind(kid) === K"parameters"
+            # For parameters we want the newline after the semi-colon
+            grandkids = verified_kids(kid)
+            semi_idx = findfirst(x -> kind(x) === K";", grandkids)::Int
+            next_idx = semi_idx + 1
+            if kind(grandkids[next_idx]) === K"NewlineWs"
+                # Nothing to do
+                any_kid_changed && push!(kids′, kid)
+                accept_node!(ctx, kid)
+            elseif kind(grandkids[next_idx]) === K"Whitespace"
+                # Merge with the newline
+                let pos = position(ctx.fmt_io)
+                    for k in 1:(next_idx - 1)
+                        accept_node!(ctx, grandkids[k])
+                    end
+                    replace_bytes!(ctx, "\n", 0)
+                    seek(ctx.fmt_io, pos)
+                end
+                grandkid = grandkids[next_idx]
+                grandkid′ = Node(JuliaSyntax.SyntaxHead(K"NewlineWs", JuliaSyntax.TRIVIA_FLAG), 1 + span(grandkid))
+                grandkids′ = copy(grandkids)
+                grandkids′[next_idx] = grandkid′
+                kid = make_node(kid, grandkids′)
+                if kids′ === kids
+                    kids′ = kids[1:(open_idx - 1)]
+                end
+                any_kid_changed = true
+                push!(kids′, kid)
+                accept_node!(ctx, kid)
+            else
+                # Insert a newline as the first grandchild
+                let pos = position(ctx.fmt_io)
+                    for k in 1:semi_idx
+                        accept_node!(ctx, grandkids[k])
+                    end
+                    replace_bytes!(ctx, "\n", 0)
+                    seek(ctx.fmt_io, pos)
+                end
+                grandkids′ = copy(grandkids)
+                insert!(grandkids′, next_idx, Node(JuliaSyntax.SyntaxHead(K"NewlineWs", JuliaSyntax.TRIVIA_FLAG), 1))
+                kid = make_node(kid, grandkids′)
+                if kids′ === kids
+                    kids′ = kids[1:(open_idx - 1)]
+                end
+                any_kid_changed = true
+                push!(kids′, kid)
+                accept_node!(ctx, kid)
+            end
         else
             nlws = Node(JuliaSyntax.SyntaxHead(K"NewlineWs", JuliaSyntax.TRIVIA_FLAG), 1)
             replace_bytes!(ctx, "\n", 0)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -275,6 +275,18 @@ end
         @test format_string("f(\n$(sp)$(a)$(sp);\n$(sp)$(b)$(sp)\n)") ==
             format_string("f(\n$(sp)$(a)$(sp);\n$(sp)$(b)$(sp),$(sp)\n)") ==
             "f(\n    $(a);\n    $(b),\n)"
+        @test format_string("f($(sp)$(a)$(sp);$(sp)b$(sp)=$(sp)$(b)$(sp))") ==
+            format_string("f($(sp)$(a)$(sp);$(sp)b$(sp)=$(sp)$(b)$(sp),$(sp))") ==
+            "f($(a); b = $(b))"
+        @test format_string("f(\n$(sp)$(a)$(sp);\n$(sp)b$(sp)=$(sp)$(b)$(sp)\n)") ==
+            format_string("f(\n$(sp)$(a)$(sp);\n$(sp)b$(sp)=$(sp)$(b)$(sp),$(sp)\n)") ==
+            "f(\n    $(a);\n    b = $(b),\n)"
+        # Keyword arguments only with semi-colon on the same line as opening paren
+        @test format_string("f(;\n$(sp)b$(sp)=$(sp)$(b)$(sp)\n)") ==
+            format_string("f(;\n$(sp)b$(sp)=$(sp)$(b)$(sp),$(sp)\n)") ==
+            format_string("f(;$(sp)b$(sp)=$(sp)$(b)$(sp)\n)") ==
+            format_string("f(;$(sp)b$(sp)=$(sp)$(b)$(sp),$(sp)\n)") ==
+            "f(;\n    b = $(b),\n)"
         # vect with parameter (not valid Julia syntax, but parses)
         @test format_string("[$(sp)1,$(sp)2$(sp);$(sp)]") == "[1, 2]"
         # Multple `;` in argument list (lowering error but parses....)