Merge pull request #1213 from olafurpg/1203

Avoid lookup up match for non-Token.Left{Brace,Paren}
scalameta · Jun 5, 2018 · 7dd4b00 · 7dd4b00
2 parents 871555f + ffd617c
commit 7dd4b00
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
@@ -751,10 +751,19 @@ class FormatOps(val tree: Tree, val initStyle: ScalafmtConfig) {
       leftTok2tok(matching(token)) match {
         case FormatToken(RightParenOrBracket(), l @ LeftParen(), _) =>
           loop(l)
-        // This case only applies to classes
-        case f @ FormatToken(RightBracket(), mod, _) if mod.is[Modifier] =>
-          loop(next(f).right)
-        case FormatToken(r @ RightParenOrBracket(), _, _) => Some(r)
+        case f @ FormatToken(left @ RightParenOrBracket(), right, _) =>
+          right match {
+            case Modifier() =>
+              // This case only applies to classes
+              next(f).right match {
+                case x @ (_: Token.LeftParen | _: Token.LeftBracket) =>
+                  loop(x)
+                case _ =>
+                  Some(left)
+              }
+            case _ =>
+              Some(left)
+          }
         case _ => None
       }
     }

diff --git a/scalafmt-tests/src/test/resources/vertical-multiline/verticalMultiline.stat b/scalafmt-tests/src/test/resources/vertical-multiline/verticalMultiline.stat
@@ -269,3 +269,13 @@ class SomeVeryLongName[
     SomeOtherTypeName,
     YetAnotherType]
   extends Something
+<<< #1203
+object Recorder {
+  sealed abstract class Ast[A]
+  final case class Record()
+}
+>>>
+object Recorder {
+  sealed abstract class Ast[A]
+  final case class Record()
+}