Adapted multiarg infix is just a tuple

som-snytt · som-snytt · commit effa62a14843 · 2021-05-19T22:37:06.000-07:00
diff --git a/src/compiler/scala/tools/nsc/typechecker/Adaptations.scala b/src/compiler/scala/tools/nsc/typechecker/Adaptations.scala
@@ -36,6 +36,10 @@ trait Adaptations {
         case Apply(_, arg :: Nil) => arg
         case _                    => EmptyTree
       }
+      def isInfix = t match {
+        case Apply(_, arg :: Nil) => t.hasAttachment[MultiargInfixAttachment.type]
+        case _                    => false
+      }
       def callString = (
         ( if (t.symbol.isConstructor) "new " else "" ) +
         ( t.symbol.owner.decodedName ) +
@@ -86,15 +90,17 @@ trait Adaptations {
         true // keep adaptation
       }
       @inline def warnAdaptation = {
-        if (settings.warnAdaptedArgs) context.warning(t.pos, adaptWarningMessage(
+        if (settings.warnAdaptedArgs && !isInfix) context.warning(t.pos, adaptWarningMessage(
           s"adapted the argument list to the expected ${args.size}-tuple: add additional parens instead"),
           WarningCategory.LintAdaptedArgs)
         true // keep adaptation
       }
-      if (args.isEmpty) {
-        if (currentRun.isScala3) noAdaptation else deprecatedAdaptation
-      } else
+      if (args.nonEmpty)
         warnAdaptation
+      else if (currentRun.isScala3)
+        noAdaptation
+      else
+        deprecatedAdaptation
     }
   }
 }
diff --git a/test/files/pos/t5073.scala b/test/files/pos/t5073.scala
@@ -1,7 +1,9 @@
 
+//scalac: -Xlint -Werror
+
 trait Test {
 
-  trait T[A]
+  trait T[_]
 
   class C {
     def -:(x: AnyRef): T[x.type] = ???
@@ -33,4 +35,9 @@ class B {
 }
 
 // issue 11117
-class A2[B](val b: B) { def c: List[b.type] = b :: Nil }
+class A2[B2](val b: B2) { def c: List[b.type] = b :: Nil }
+
+// don't bug me about adapting a tuple when I wrote a tuple arg to infix
+class `lukas warned me about this and I brushed him off but that was last year before pandemic` {
+  def `tuple in infix expression must not warn` = (42, 27) :: Nil
+}

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@ trait Adaptations {`
`36`	`36`	`case Apply(_, arg :: Nil) => arg`
`37`	`37`	`case _ => EmptyTree`
`38`	`38`	`}`
	`39`	`+ def isInfix = t match {`
	`40`	`+ case Apply(_, arg :: Nil) => t.hasAttachment[MultiargInfixAttachment.type]`
	`41`	`+ case _ => false`
	`42`	`+ }`
`39`	`43`	`def callString = (`
`40`	`44`	`( if (t.symbol.isConstructor) "new " else "" ) +`
`41`	`45`	`( t.symbol.owner.decodedName ) +`
`@@ -86,15 +90,17 @@ trait Adaptations {`
`86`	`90`	`true // keep adaptation`
`87`	`91`	`}`
`88`	`92`	`@inline def warnAdaptation = {`
`89`		`- if (settings.warnAdaptedArgs) context.warning(t.pos, adaptWarningMessage(`
	`93`	`+ if (settings.warnAdaptedArgs && !isInfix) context.warning(t.pos, adaptWarningMessage(`
`90`	`94`	`s"adapted the argument list to the expected ${args.size}-tuple: add additional parens instead"),`
`91`	`95`	`WarningCategory.LintAdaptedArgs)`
`92`	`96`	`true // keep adaptation`
`93`	`97`	`}`
`94`		`- if (args.isEmpty) {`
`95`		`- if (currentRun.isScala3) noAdaptation else deprecatedAdaptation`
`96`		`- } else`
	`98`	`+ if (args.nonEmpty)`
`97`	`99`	`warnAdaptation`
	`100`	`+ else if (currentRun.isScala3)`
	`101`	`+ noAdaptation`
	`102`	`+ else`
	`103`	`+ deprecatedAdaptation`
`98`	`104`	`}`
`99`	`105`	`}`
`100`	`106`	`}`