FormatOps: implement indentOperator.exemptScope

scalameta · Jan 27, 2022 · 115f2cb · 115f2cb
1 parent 7044913
commit 115f2cb
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 28 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/IndentOperator.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/IndentOperator.scala
@@ -54,7 +54,7 @@ case class IndentOperator(
       "Use indentOperator.exemptScope instead (true->topLevelOnly, false->all)",
       "3.4.0"
     )
-    topLevelOnly: Boolean = true,
+    private val topLevelOnly: Boolean = true,
     @annotation.ExtraName("include")
     includeRegex: String = ".*",
     @annotation.ExtraName("exclude")
@@ -65,6 +65,12 @@ case class IndentOperator(
 
   def noindent(op: String): Boolean =
     excludeRegexp.matcher(op).find() || !includeRegexp.matcher(op).find()
+
+  lazy val getExemptScope: IndentOperator.Exempt =
+    exemptScope.getOrElse(
+      if (topLevelOnly) IndentOperator.Exempt.oldTopLevel
+      else IndentOperator.Exempt.all
+    )
 }
 
 object IndentOperator {

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
@@ -3,6 +3,7 @@ package org.scalafmt.internal
 import org.scalafmt.Error.UnexpectedTree
 import org.scalafmt.config.{
   BinPack,
+  IndentOperator,
   Newlines,
   ScalafmtConfig,
   ScalafmtRunner,
@@ -583,8 +584,31 @@ class FormatOps(
         case t: Case => t.pat.eq(child) || t.body.eq(child)
         case _ => false
       }
-      val allowNoIndent =
-        !style.indentOperator.topLevelOnly || isOldTopLevel(getChild)
+      def isAloneEnclosed(child: Tree) = child.parent.exists {
+        case Case(`child`, _, _) => true
+        case Term.If(`child`, _, _) => true
+        case Term.While(`child`, _) => true
+        case Term.Do(_, `child`) => true
+        case Term.Block(List(`child`)) => true
+        case fun: Term.FunctionTerm => isBlockFunction(fun)
+        case SplitCallIntoParts(_, Left(Seq(`child`))) => true
+        case _ => false
+      }
+      def isAloneArgOrBody(child: Tree) = child.parent.exists {
+        case t: Case => t.pat.eq(child) || t.body.eq(child)
+        case _: Term.If | _: Term.While | _: Term.Do => true
+        case Term.Block(List(`child`)) => true
+        case Term.ForYield(_, `child`) => true
+        case SplitAssignIntoParts(`child`, _) => true
+        case SplitCallIntoParts(_) => true
+        case _ => false
+      }
+      val allowNoIndent = style.indentOperator.getExemptScope match {
+        case IndentOperator.Exempt.all => true
+        case IndentOperator.Exempt.oldTopLevel => isOldTopLevel(getChild)
+        case IndentOperator.Exempt.aloneEnclosed => isAloneEnclosed(getChild)
+        case IndentOperator.Exempt.aloneArgOrBody => isAloneArgOrBody(getChild)
+      }
       def isInfixTopLevelMatch(op: String, noindent: Boolean): Boolean = {
         noindent == style.indentOperator.noindent(op) &&
         noindent == allowNoIndent

diff --git a/scalafmt-tests/src/test/resources/test/IndentOperator.stat b/scalafmt-tests/src/test/resources/test/IndentOperator.stat
@@ -2956,7 +2956,7 @@ object a {
     b
   } else
     a &&
-    b
+      b
   if (
     a &&
     b
@@ -2965,12 +2965,12 @@ object a {
     b
   } else
     a &&
-    b
+      b
   if a &&
     b
   then
     a &&
-    b
+      b
   else {
     a &&
     b
@@ -2980,7 +2980,7 @@ object a {
     b
   then
     a &&
-    b
+      b
   else {
     a &&
     b
@@ -3193,24 +3193,24 @@ object a {
     b
   )
     a &&
-    b
+      b
   while (
     a &&
     b
   )
     a &&
-    b
+      b
   while a &&
     b
   do
     a &&
-    b
+      b
   while
     a &&
     b
   do
     a &&
-    b
+      b
 }
 <<< aloneArgOrBody, while
 runner.dialect = scala3
@@ -3375,7 +3375,7 @@ object a {
 object a {
   foo(
     a &&
-      b
+    b
   )
   foo {
     a &&
@@ -3389,10 +3389,10 @@ object a {
   )
   foo(
     a &&
-      b
+    b
   )(
     a &&
-      b
+    b
   )
 }
 <<< aloneArgOrBody, apply
@@ -3426,24 +3426,24 @@ object a {
 object a {
   foo(
     a &&
-      b
+    b
   )
   foo {
     a &&
     b
   }
   foo(
     a &&
-      b,
+    b,
     a &&
-      b
+    b
   )
   foo(
     a &&
-      b
+    b
   )(
     a &&
-      b
+    b
   )
 }
 <<< oldTopLevel, apply
@@ -3524,21 +3524,21 @@ a match {
 a match {
   case foo =>
     a &&
-    b
+      b
   case foo =>
     val baz = qux
     a &&
-    b
+      b
   case bar => {
     val baz = qux
     a &&
-    b
+      b
   }
   case bar if
         a &&
           b =>
     a &&
-    b
+      b
 }
 <<< aloneArgOrBody, case
 newlines.source = keep
@@ -3571,11 +3571,11 @@ a match {
   case foo =>
     val baz = qux
     a &&
-    b
+      b
   case bar => {
     val baz = qux
     a &&
-    b
+      b
   }
   case bar if
         a &&
@@ -3654,7 +3654,7 @@ object a {
   foo { x =>
     val bar = qux
     a &&
-    b
+      b
   }
   foo(x =>
     a &&
@@ -3689,11 +3689,11 @@ object a {
   foo { x =>
     val bar = qux
     a &&
-    b
+      b
   }
   foo(x =>
     a &&
-      b
+    b
   )
 }
 <<< oldTopLevel, lambda