TokenOps bugfix: don't use block before docstring

scalameta · Jul 4, 2020 · d962207 · d962207
1 parent 3e9cfa9
commit d962207
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TokenOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TokenOps.scala
@@ -54,9 +54,9 @@ object TokenOps {
       ft.meta.right.text.startsWith("/**") &&
       TreeOps
         .findTreeOrParent(ft.meta.leftOwner) {
+          case t if t.pos.end <= ft.right.start => None
           case _: Pkg | _: Source | _: Template | _: Term.Block => Some(false)
-          case t if t.pos.end > ft.right.start => Some(true)
-          case _ => None
+          case _ => Some(true)
         }
         .isEmpty
 

diff --git a/scalafmt-tests/src/test/resources/test/JavaDoc.stat b/scalafmt-tests/src/test/resources/test/JavaDoc.stat
@@ -1290,7 +1290,6 @@ object a {
   input.read
   /** foo */
     .foo { bar }
-
     /** baz */
     .baz(qux)
 }