Fix off-by-one error, scalameta#976.

Interestingly, this had not been pointed out before.
olafurpg · Jun 17, 2017 · 2f2f86d · 2f2f86d
1 parent 978c350
commit 2f2f86d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Settings.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Settings.scala
@@ -93,6 +93,7 @@ trait Settings {
 
   // TODO(olafur) move these elsewhere.
   val testing = default.copy(
+    maxColumn = 79,
     assumeStandardLibraryStripMargin = false,
     includeCurlyBraceInSelectChains = false,
     align = default.align.copy(tokens = Set.empty),
@@ -106,11 +107,10 @@ trait Settings {
     runner = conservativeRunner
   )
   val unitTest80 = testing.copy(
-    maxColumn = 80,
     continuationIndent = ContinuationIndent(4, 4)
   )
 
-  val unitTest40 = unitTest80.copy(maxColumn = 40)
+  val unitTest40 = unitTest80.copy(maxColumn = 39)
 
   def oneOf[T](m: Map[String, T])(input: String): Configured[T] =
     m.get(input.toLowerCase()) match {

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala
@@ -100,7 +100,7 @@ object State {
       }
     val newPolicy: PolicySummary = policy.combine(split.policy, tok.left.end)
     val splitWithPenalty = {
-      if (columnOnCurrentLine < style.maxColumn || {
+      if (columnOnCurrentLine <= style.maxColumn || {
             val commentExceedsLineLength =
               tok.right.is[Comment] &&
                 tokRightSyntax.length >= (style.maxColumn - newIndent)

diff --git a/scalafmt-tests/src/test/resources/binPack/LiteralList.stat b/scalafmt-tests/src/test/resources/binPack/LiteralList.stat
@@ -1,4 +1,5 @@
 binPack.literalArgumentLists = true
+maxColumn = 79
 <<< basic
   val secret: List[Bit] = List(0,0,1,1,1,0,1,0,1,1,1,0,0,1,1,0,1,0,0,1,1,0,1,0,1,1,0,0,1,1,1,1,1,0,1,0,1,1,0,0,0,0,1,0,1,1,1,0,0,1,0,0,1,0,0,0,1,0,0,0,1,0,1)
 >>>

diff --git a/scalafmt-tests/src/test/resources/test/ContinuationIndent.stat b/scalafmt-tests/src/test/resources/test/ContinuationIndent.stat
@@ -1,7 +1,7 @@
 continuationIndent.callSite = 5
 continuationIndent.defnSite = 3
 continuationIndent.extendSite = 2
-maxColumn = 40
+maxColumn = 39
 <<< #143
 def foo(
 a: Int,

diff --git a/scalafmt-tests/src/test/resources/test/DynamicStyle.stat b/scalafmt-tests/src/test/resources/test/DynamicStyle.stat
@@ -5,27 +5,27 @@ indentOperator.exclude = ":\\+:"
 align.tokens.add = [foo]
 <<< dynamic
 // scalafmt: { maxColumn = 20 }
-function(aaaaaaaaaa, bbbbbbb)
+function(aaaaaaaaaaa, bbbbbbb)
 >>>
 // scalafmt: { maxColumn = 20 }
 function(
-  aaaaaaaaaa,
+  aaaaaaaaaaa,
   bbbbbbb)
 <<< multiline
 /*
 scalafmt: {
   maxColumn = 20
 }
 */
-function(aaaaaaaaaa, bbbbbbb)
+function(aaaaaaaaaaa, bbbbbbb)
 >>>
 /*
 scalafmt: {
   maxColumn = 20
 }
  */
 function(
-  aaaaaaaaaa,
+  aaaaaaaaaaa,
   bbbbbbb)
 <<< align.tokens.add
 {

diff --git a/scalafmt-tests/src/test/scala/org/scalafmt/util/HasTests.scala b/scalafmt-tests/src/test/scala/org/scalafmt/util/HasTests.scala
@@ -126,7 +126,7 @@ trait HasTests extends FunSuiteLike with FormatAssertions {
     spec match {
       case "unit"                           => ScalafmtConfig.unitTest40
       case "default" | "standard" | "scala" => ScalafmtConfig.unitTest80
-      case "scalajs"                        => ScalafmtConfig.scalaJs
+      case "scalajs"                        => ScalafmtConfig.scalaJs.copy(maxColumn = 79)
       case style                            => throw UnknownStyle(style)
     }