Test select with apply in braces and single func

scalameta · Nov 25, 2024 · f0975ba · f0975ba
1 parent 2ae3560
commit f0975ba
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 1 deletion.
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
@@ -11291,3 +11291,37 @@ object a {
     quux(x)
   }
 }
+<<< #4133 select with braced apply and single function arg, !parensForOneLineApply
+maxColumn = 74
+newlines {
+  avoidForSimpleOverflow = [punct, slc, tooLong]
+  ignoreInSyntax = false
+}
+rewrite.rules = [RedundantBraces]
+rewrite.redundantBraces.parensForOneLineApply = false
+===
+  topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+>>>
+topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy {
+  x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+}
+<<< #4133 select with braced apply and single function arg, parensForOneLineApply
+maxColumn = 74
+newlines {
+  avoidForSimpleOverflow = [punct, slc, tooLong]
+  ignoreInSyntax = false
+}
+rewrite.rules = [RedundantBraces]
+rewrite.redundantBraces.parensForOneLineApply = true
+===
+  topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+>>>
+topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy {
+  x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+}
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
@@ -10532,3 +10532,36 @@ object a {
     quux(x)
   }
 }
+<<< #4133 select with braced apply and single function arg, !parensForOneLineApply
+maxColumn = 74
+newlines {
+  avoidForSimpleOverflow = [punct, slc, tooLong]
+  ignoreInSyntax = false
+}
+rewrite.rules = [RedundantBraces]
+rewrite.redundantBraces.parensForOneLineApply = false
+===
+  topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+>>>
+topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy {
+  x => (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+}
+<<< #4133 select with braced apply and single function arg, parensForOneLineApply
+maxColumn = 74
+newlines {
+  avoidForSimpleOverflow = [punct, slc, tooLong]
+  ignoreInSyntax = false
+}
+rewrite.rules = [RedundantBraces]
+rewrite.redundantBraces.parensForOneLineApply = true
+===
+  topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+>>>
+topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest)
+  .sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
@@ -11043,3 +11043,37 @@ object a {
     quux(x)
   }
 }
+<<< #4133 select with braced apply and single function arg, !parensForOneLineApply
+maxColumn = 74
+newlines {
+  avoidForSimpleOverflow = [punct, slc, tooLong]
+  ignoreInSyntax = false
+}
+rewrite.rules = [RedundantBraces]
+rewrite.redundantBraces.parensForOneLineApply = false
+===
+  topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+>>>
+topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy {
+  x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+}
+<<< #4133 select with braced apply and single function arg, parensForOneLineApply
+maxColumn = 74
+newlines {
+  avoidForSimpleOverflow = [punct, slc, tooLong]
+  ignoreInSyntax = false
+}
+rewrite.rules = [RedundantBraces]
+rewrite.redundantBraces.parensForOneLineApply = true
+===
+  topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+>>>
+topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy {
+  x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+}
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
@@ -11471,3 +11471,39 @@ object a {
     quux(x)
   }
 }
+<<< #4133 select with braced apply and single function arg, !parensForOneLineApply
+maxColumn = 74
+newlines {
+  avoidForSimpleOverflow = [punct, slc, tooLong]
+  ignoreInSyntax = false
+}
+rewrite.rules = [RedundantBraces]
+rewrite.redundantBraces.parensForOneLineApply = false
+===
+  topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+>>>
+topLevelStatementBlankLines
+  .filter(x => x.minNest <= x.maxNest)
+  .sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+<<< #4133 select with braced apply and single function arg, parensForOneLineApply
+maxColumn = 74
+newlines {
+  avoidForSimpleOverflow = [punct, slc, tooLong]
+  ignoreInSyntax = false
+}
+rewrite.rules = [RedundantBraces]
+rewrite.redundantBraces.parensForOneLineApply = true
+===
+  topLevelStatementBlankLines.filter(x => x.minNest <= x.maxNest).sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
+>>>
+topLevelStatementBlankLines
+  .filter(x => x.minNest <= x.maxNest)
+  .sortBy { x =>
+    (x.minBreaks, x.maxNest, -x.minNest, x.regex.fold(0)(-_.length))
+  }
diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
@@ -144,7 +144,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
     val explored = Debug.explored.get()
     logger.debug(s"Total explored: $explored")
     if (!onlyUnit && !onlyManual)
-      assertEquals(explored, 1183844, "total explored")
+      assertEquals(explored, 1184830, "total explored")
     val results = debugResults.result()
     // TODO(olafur) don't block printing out test results.
     // I don't want to deal with scalaz's Tasks :'(