Fix bug in formatting in export/public expressions with macronames

src/runestone.jl

@@ -973,13 +973,16 @@ function spaces_in_export_public(ctx::Context, node::Node)
             end
             state = :expect_identifier
         elseif state === :expect_identifier
-            if kind(kid) === K"Identifier"
+            state = :expect_comma
+            if kind(kid) in KSet"Identifier @ MacroName"
                 any_changes && push!(kids′, kid)
                 accept_node!(ctx, kid)
+                if kind(kid) === K"@"
+                    state = :expect_identifier
+                end
             else
                 @assert false
             end
-            state = :expect_comma
         else
             @assert state === :expect_comma
             state = :expect_space

test/runtests.jl

@@ -799,12 +799,12 @@ end
 end
 
 @testset "spaces in export/public" begin
-    for sp in ("", " ", "  ", "\t"), verb in ("export", "public")
+    for sp in ("", " ", "  ", "\t"), verb in ("export", "public"), (a, b) in (("a", "@b"), ("@a", "b"))
-        @test format_string("$(verb) $(sp)a") == "$(verb) a"
+        @test format_string("$(verb) $(sp)$(a)") == "$(verb) $(a)"
-        @test format_string("$(verb)\na") == "$(verb)\n    a"
+        @test format_string("$(verb)\n$(a)") == "$(verb)\n    $(a)"
-        @test format_string("$(verb) $(sp)a$(sp),$(sp)b") == "$(verb) a, b"
+        @test format_string("$(verb) $(sp)$(a)$(sp),$(sp)$(b)") == "$(verb) $(a), $(b)"
-        @test format_string("$(verb) a$(sp),\nb") == "$(verb) a,\n    b"
+        @test format_string("$(verb) $(a)$(sp),\n$(b)") == "$(verb) $(a),\n    $(b)"
-        @test format_string("$(verb) \na$(sp),\nb") == "$(verb)\n    a,\n    b"
+        @test format_string("$(verb) \n$(a)$(sp),\n$(b)") == "$(verb)\n    $(a),\n    $(b)"
     end
 end