Splits: don't indent enclosed cond in if/while

We already do that for `danglingParentheses.ctrlSite = true` but now fix
also the other case.

Author: kitbellew

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Splits.scala

@@ -1999,7 +1999,7 @@ object SplitsAfterLeftParen extends Splits {
         val nlPolicy = penalizeNewlines & decideNewlinesOnlyBeforeClose(close)
         Seq(noSplit, Split(Newline, 1, policy = nlPolicy).withIndent(indent))
       } else Seq(baseNoSplit(penalizeNewlines, Newline).withIndents(
-        if (noAlign) Seq(indent) // TODO: check if enclosed
+        if (noAlign) if (enclosedInBraces) Seq.empty else Seq(indent)
         else alignIndents,
       ))
     }

scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat

@@ -12296,9 +12296,9 @@ if ({
 }) baos.write(buffer, 0, nread)
 >>>
 if ({
-    nread = is.read(buffer, 0, buffer.length)
-    nread != -1
-  }) baos.write(buffer, 0, nread)
+  nread = is.read(buffer, 0, buffer.length)
+  nread != -1
+}) baos.write(buffer, 0, nread)
 <<< while cond in braces, danglingParentheses.ctrlSite
 maxColumn = 80
 danglingParentheses.ctrlSite = true
@@ -12322,6 +12322,6 @@ while ({
 }) baos.write(buffer, 0, nread)
 >>>
 while ({
-    nread = is.read(buffer, 0, buffer.length)
-    nread != -1
-  }) baos.write(buffer, 0, nread)
+  nread = is.read(buffer, 0, buffer.length)
+  nread != -1
+}) baos.write(buffer, 0, nread)

scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat

@@ -11520,9 +11520,9 @@ if ({
 }) baos.write(buffer, 0, nread)
 >>>
 if ({
-    nread = is.read(buffer, 0, buffer.length)
-    nread != -1
-  }) baos.write(buffer, 0, nread)
+  nread = is.read(buffer, 0, buffer.length)
+  nread != -1
+}) baos.write(buffer, 0, nread)
 <<< while cond in braces, danglingParentheses.ctrlSite
 maxColumn = 80
 danglingParentheses.ctrlSite = true
@@ -11546,6 +11546,6 @@ while ({
 }) baos.write(buffer, 0, nread)
 >>>
 while ({
-    nread = is.read(buffer, 0, buffer.length)
-    nread != -1
-  }) baos.write(buffer, 0, nread)
+  nread = is.read(buffer, 0, buffer.length)
+  nread != -1
+}) baos.write(buffer, 0, nread)

scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat

@@ -12066,9 +12066,9 @@ if ({
 }) baos.write(buffer, 0, nread)
 >>>
 if ({
-    nread = is.read(buffer, 0, buffer.length)
-    nread != -1
-  }) baos.write(buffer, 0, nread)
+  nread = is.read(buffer, 0, buffer.length)
+  nread != -1
+}) baos.write(buffer, 0, nread)
 <<< while cond in braces, danglingParentheses.ctrlSite
 maxColumn = 80
 danglingParentheses.ctrlSite = true
@@ -12092,6 +12092,6 @@ while ({
 }) baos.write(buffer, 0, nread)
 >>>
 while ({
-    nread = is.read(buffer, 0, buffer.length)
-    nread != -1
-  }) baos.write(buffer, 0, nread)
+  nread = is.read(buffer, 0, buffer.length)
+  nread != -1
+}) baos.write(buffer, 0, nread)

scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat

@@ -12560,9 +12560,9 @@ if ({
 }) baos.write(buffer, 0, nread)
 >>>
 if ({
-    nread = is.read(buffer, 0, buffer.length)
-    nread != -1
-  })
+  nread = is.read(buffer, 0, buffer.length)
+  nread != -1
+})
   baos.write(buffer, 0, nread)
 <<< while cond in braces, danglingParentheses.ctrlSite
 maxColumn = 80
@@ -12588,7 +12588,7 @@ while ({
 }) baos.write(buffer, 0, nread)
 >>>
 while ({
-    nread = is.read(buffer, 0, buffer.length)
-    nread != -1
-  })
+  nread = is.read(buffer, 0, buffer.length)
+  nread != -1
+})
   baos.write(buffer, 0, nread)