fix #779 (#790)

domluna · Dec 10, 2023 · 4bb1984 · 4bb1984 · domluna · Dec 10, 2023
1 parent 4152c35
commit 4bb1984
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "JuliaFormatter"
 uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
 authors = ["Dominique Luna <dluna132@gmail.com>"]
-version = "1.0.43"
+version = "1.0.44"
 
 [deps]
 CSTParser = "00ebfdb7-1f24-5e51-bd34-a7502290713f"

diff --git a/src/passes.jl b/src/passes.jl
@@ -391,8 +391,7 @@ end
 """
     binaryop_to_whereop(fst::FST, s::State)
 
-Handles the case of a function def defined
-as:
+Handles the case of a function def defined as:
 
 ```julia
 foo(a::A)::R where A = body
@@ -435,13 +434,16 @@ function binaryop_to_whereop!(fst::FST, s::State)
     # transform fst[1] to a Where
     oldbinop = fst[1]
     oldwhereop = fst[1][end]
-    binop = FST(Binary, fst[1].indent)
 
-    # foo(a::A)
-    add_node!(binop, oldbinop[1], s)
-    # foo(a::A)::
-    add_node!(binop, oldbinop[2], s, join_lines = true)
-    # foo(a::A)::R
+    # get everything up to the where
+    binop = FST(Binary, fst[1].indent)
+    for n in oldbinop.nodes
+        if n.typ === Where
+            break
+        end
+        add_node!(binop, n, s, join_lines = true)
+    end
+    # # foo(a::A)::R gets the "R"
     add_node!(binop, oldwhereop[1], s, join_lines = true)
 
     whereop = FST(Where, fst[1].indent)

diff --git a/test/issues.jl b/test/issues.jl
@@ -1770,4 +1770,9 @@
         """
         @test format_text(s, SciMLStyle()) == s
     end
+
+    @testset "779" begin
+        s = "Int <: B where {B} && Int <: C where {C}"
+        fmt(s) == s
+    end
 end