Avoid auto-tupling in unapply unless a tuple is expected

scala · Jul 13, 2021 · fb6769e · fb6769e
1 parent 54b89b1
commit fb6769e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -1360,7 +1360,7 @@ trait Applications extends Compatibility {
         for (argType <- argTypes) assert(!isBounds(argType), unapplyApp.tpe.show)
         val bunchedArgs = argTypes match {
           case argType :: Nil =>
-            if (args.lengthCompare(1) > 0 && Feature.autoTuplingEnabled) untpd.Tuple(args) :: Nil
+            if (args.lengthCompare(1) > 0 && Feature.autoTuplingEnabled && defn.isTupleType(argType)) untpd.Tuple(args) :: Nil
             else args
           case _ => args
         }

diff --git a/tests/neg/i10757.check b/tests/neg/i10757.check
@@ -0,0 +1,7 @@
+-- [E007] Type Mismatch Error: tests/neg/i10757.scala:4:23 -------------------------------------------------------------
+4 |  case Var(name, _) => name: String // error
+  |                       ^^^^
+  |                       Found:    (name : Any)
+  |                       Required: String
+
+longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i10757.scala b/tests/neg/i10757.scala
@@ -0,0 +1,4 @@
+case class Var(name: String)
+
+@main def f = Var("a") match
+  case Var(name, _) => name: String // error