Fix domluna#822

Project.toml

@@ -1,7 +1,7 @@
 name = "JuliaFormatter"
 uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
 authors = ["Dominique Luna <dluna132@gmail.com>"]
-version = "1.0.52"
+version = "1.0.53"
 
 [deps]
 CSTParser = "00ebfdb7-1f24-5e51-bd34-a7502290713f"

src/document.jl

@@ -124,7 +124,11 @@ function Document(text::AbstractString)
                 # multiline comment of the form
                 # #=
                 #
-                # #=
+                # =#
+
+                idx = findfirst(x -> x == '\n', t.val) + 1
+                fc2 = findfirst(c -> !isspace(c), t.val[idx:end])
+                ws2 = fc2 === nothing ? ws : max(ws, fc2 - 1)
 
                 line = t.startpos[1]
                 offset = goffset
@@ -143,6 +147,7 @@ function Document(text::AbstractString)
                             comments[line] = (ws, cs[idx:end])
                         end
                         line += 1
+                        ws = ws2
                         cs = ""
                     end
                     offset += 1

src/print.jl

@@ -160,7 +160,7 @@ function print_inlinecomment(io::IOBuffer, fst::FST, s::State)
     s.on || return
     ws, v = get(s.doc.comments, fst.startline, (0, ""))
     isempty(v) && return
-    v = v[end] == '\n' ? v[nextind(v, 1):prevind(v, end)] : v
+    v = v[end] == '\n' ? v[firstindex(v):prevind(v, end)] : v
     if ws > 0
         write(io, repeat(" ", ws))
     elseif startswith(v, "#=") && endswith(v, "=#")

test/issues.jl

@@ -1814,4 +1814,20 @@
         """
         @test format_text(s, SciMLStyle()) == s2
     end
+
+    @testset "822" begin
+        s = """
+        ℯ #=
+        =#
+        """
+        @test format_text(s) == s
+
+        s = """
+        begin
+            π => im #=
+            comment =#
+        end
+        """
+        @test format_text(s) == s
+    end
 end