Merge pull request #1606 from retronym/ticket/6646

SI-6646 Fix regression in for desugaring.

2 files changed, 24 insertions, 0 deletions

diff --git a/test/files/run/t6646.check b/test/files/run/t6646.check
new file mode 100644
index 0000000000..b0b7ad32f3
--- /dev/null
+++ b/test/files/run/t6646.check
@@ -0,0 +1,5 @@
+Found NotNull
+Found lower
+Found 2
+A single ident is always a pattern
+A single ident is always a pattern
diff --git a/test/files/run/t6646.scala b/test/files/run/t6646.scala
new file mode 100644
index 0000000000..150b0df11e
--- /dev/null
+++ b/test/files/run/t6646.scala
@@ -0,0 +1,19 @@
+sealed trait ColumnOption
+case object NotNull extends ColumnOption
+case object PrimaryKey extends ColumnOption
+case object lower extends ColumnOption
+
+object Test {
+  def main(args: Array[String]) {
+    val l = List(PrimaryKey, NotNull, lower)
+
+    // withFilter must be generated in these
+    for (option @ NotNull <- l) println("Found " + option)
+    for (option @ `lower` <- l) println("Found " + option)
+    for ((`lower`, i) <- l.zipWithIndex) println("Found " + i)
+
+    // no withFilter
+    for (X <- List("A single ident is always a pattern")) println(X)
+    for (`x` <- List("A single ident is always a pattern")) println(`x`)
+  }
+}