Merge remote-tracking branch 'origin/master' into merge/2.10.x-to-master

Conflicts:
	src/compiler/scala/tools/nsc/ast/parser/Parsers.scala

1 files changed, 11 insertions, 0 deletions

diff --git a/test/files/scalacheck/quasiquotes/TypeConstructionProps.scala b/test/files/scalacheck/quasiquotes/TypeConstructionProps.scala
index 535ed8ecbf..cac83ff8ac 100644
--- a/test/files/scalacheck/quasiquotes/TypeConstructionProps.scala
+++ b/test/files/scalacheck/quasiquotes/TypeConstructionProps.scala
@@ -22,4 +22,15 @@ object TypeConstructionProps extends QuasiquoteProperties("type construction")
     assert(tq"(..$ts)" ≈ tq"Tuple2[t1, t2]")
     assert(tq"(t0, ..$ts)" ≈ tq"Tuple3[t0, t1, t2]")
   }
+
+  property("refined type") = test {
+    val stats = q"def foo" :: q"val x: Int" :: q"type Y = String" :: Nil
+    assert(tq"T { ..$stats }" ≈ tq"T { def foo; val x: Int; type Y = String }")
+  }
+
+  property("function type") = test {
+    val argtpes = tq"A" :: tq"B" :: Nil
+    val restpe = tq"C"
+    assert(tq"..$argtpes => $restpe" ≈ tq"(A, B) => C")
+  }
 }
\ No newline at end of file