2 files changed, 40 insertions, 15 deletions
diff --git a/test/files/scalacheck/quasiquotes/ErrorProps.scala b/test/files/scalacheck/quasiquotes/ErrorProps.scala
index 92d299bede..3a66574c7d 100644
--- a/test/files/scalacheck/quasiquotes/ErrorProps.scala
+++ b/test/files/scalacheck/quasiquotes/ErrorProps.scala
@@ -52,13 +52,6 @@ object ErrorProps extends QuasiquoteProperties("errors") {
       StringContext("\"", "\"").q(x)
     """)
 
-  property("expected different cardinality") = fails(
-    "Can't splice List[reflect.runtime.universe.Tree] with ..., consider using ..",
-    """
-      val args: List[Tree] = Nil
-      q"f(...$args)"
-    """)
-
   property("non-liftable type ..") = fails(
     "Can't splice List[StringBuilder] with .., consider omitting the dots or providing an implicit instance of Liftable[StringBuilder]",
     """
@@ -90,13 +83,6 @@ object ErrorProps extends QuasiquoteProperties("errors") {
       q"$xs"
     """)
 
-  property("use zero card") = fails(
-    "Can't splice reflect.runtime.universe.Tree with .., consider omitting the dots",
-    """
-      val t = EmptyTree
-      q"f(..$t)"
-    """)
-
   property("not liftable or natively supported") = fails(
     "Can't splice StringBuilder, consider providing an implicit instance of Liftable[StringBuilder]",
     """
@@ -188,4 +174,4 @@ object ErrorProps extends QuasiquoteProperties("errors") {
 
   // // Make sure a nice error is reported in this case
   // { import Flag._; val mods = NoMods; q"lazy $mods val x: Int" }
-}
-\ No newline at end of file
+}
diff --git a/test/files/scalacheck/quasiquotes/TermConstructionProps.scala b/test/files/scalacheck/quasiquotes/TermConstructionProps.scala
index 38fbfa9f7f..7bbd7a85b3 100644
--- a/test/files/scalacheck/quasiquotes/TermConstructionProps.scala
+++ b/test/files/scalacheck/quasiquotes/TermConstructionProps.scala
@@ -229,4 +229,43 @@ object TermConstructionProps extends QuasiquoteProperties("term construction") {
     val q"($a, $b) => $_" = q"_ + _"
     assert(a.name != b.name)
   }
+
+  property("SI-7275 a") = test {
+    val t = q"stat1; stat2"
+    assertEqAst(q"..$t", "{stat1; stat2}")
+  }
+
+  property("SI-7275 b") = test {
+    def f(t: Tree) = q"..$t"
+    assertEqAst(f(q"stat1; stat2"), "{stat1; stat2}")
+  }
+
+  property("SI-7275 c1") = test {
+    object O
+    implicit val liftO = Liftable[O.type] { _ => q"foo; bar" }
+    assertEqAst(q"f(..$O)", "f(foo, bar)")
+  }
+
+  property("SI-7275 c2") = test {
+    object O
+    implicit val liftO = Liftable[O.type] { _ => q"{ foo; bar }; { baz; bax }" }
+    assertEqAst(q"f(...$O)", "f(foo, bar)(baz, bax)")
+  }
+
+  property("SI-7275 d") = test {
+    val l = q"a; b" :: q"c; d" :: Nil
+    assertEqAst(q"f(...$l)", "f(a, b)(c, d)")
+    val l2: Iterable[Tree] = l
+    assertEqAst(q"f(...$l2)", "f(a, b)(c, d)")
+  }
+
+  property("SI-7275 e") = test {
+    val t = q"{ a; b }; { c; d }"
+    assertEqAst(q"f(...$t)", "f(a, b)(c, d)")
+  }
+
+  property("SI-7275 e2") = test {
+    val t = q"{ a; b }; c; d"
+    assertEqAst(q"f(...$t)", "f(a, b)(c)(d)")
+  }
 }