Add missing symbols to block environment

Author: nicolasstucki

library/src-3.x/scala/internal/quoted/Matcher.scala

@@ -120,8 +120,12 @@ object Matcher {
           fn1 =#= fn2 && args1 =##= args2
 
         case (Block(stats1, expr1), Block(stats2, expr2)) =>
-          // FIXME update the environment
-          stats1 =##= stats2 && expr1 =#= expr2
+          val env = the[Env] ++ stats1.map(_.symbol).zip(stats2.map(_.symbol))
+
+          {
+            implied for Env = env
+            stats1 =##= stats2 && expr1 =#= expr2
+          }
 
         case (If(cond1, thenp1, elsep1), If(cond2, thenp2, elsep2)) =>
           cond1 =#= cond2 && thenp1 =#= thenp2 && elsep1 =#= elsep2

tests/run-macros/quote-matcher-runtime.check

@@ -302,6 +302,26 @@ Pattern: {
 }
 Result: None
 
+Scrutinee: {
+  val a: scala.Int = 45
+  a.+(a)
+}
+Pattern: {
+  val x: scala.Int = 45
+  x.+(x)
+}
+Result: Some(List())
+
+Scrutinee: {
+  val a: scala.Int = 45
+  a.+(a)
+}
+Pattern: {
+  val x: scala.Int = 45
+  x.+(scala.internal.Quoted.patternHole[scala.Int])
+}
+Result: Some(List(Expr(a)))
+
 Scrutinee: {
   lazy val a: scala.Int = 45
   ()
@@ -572,6 +592,26 @@ Pattern: {
 }
 Result: Some(List())
 
+Scrutinee: {
+  def a: scala.Int = a
+  a.+(a)
+}
+Pattern: {
+  def a: scala.Int = a
+  a.+(a)
+}
+Result: Some(List())
+
+Scrutinee: {
+  def a: scala.Int = a
+  a.+(a)
+}
+Pattern: {
+  def a: scala.Int = scala.internal.Quoted.patternHole[scala.Int]
+  a.+(scala.internal.Quoted.patternHole[scala.Int])
+}
+Result: Some(List(Expr(a), Expr(a)))
+
 Scrutinee: {
   lazy val a: scala.Int = a
   ()

tests/run-macros/quote-matcher-runtime/quoted_2.scala

@@ -90,6 +90,8 @@ object Test {
     matches({ val a: Int = 45 }, { lazy val a: Int = 45 })
     matches({ val a: Int = 45 }, { var a: Int = 45 })
     matches({ val a: Int = 45 }, { @patternBindHole var a: Int = patternHole })
+    matches({ val a: Int = 45; a + a }, { val x: Int = 45; x + x })
+    matches({ val a: Int = 45; a + a }, { val x: Int = 45; x + patternHole[Int] })
     matches({ lazy val a: Int = 45 }, { val a: Int = 45 })
     matches({ lazy val a: Int = 45 }, { lazy val a: Int = 45 })
     matches({ lazy val a: Int = 45 }, { var a: Int = 45 })
@@ -117,6 +119,8 @@ object Test {
     matches({ def a(x: Int): Int = 45 }, { def a(x: Int @patternBindHole): Int = 45 })
     matches({ def a(x: Int): Int = x }, { def b(y: Int): Int = y })
     matches({ def a: Int = a }, { def b: Int = b })
+    matches({ def a: Int = a; a + a }, { def a: Int = a; a + a })
+    matches({ def a: Int = a; a + a }, { def a: Int = patternHole[Int]; a + patternHole[Int] })
     matches({ lazy val a: Int = a }, { lazy val b: Int = b })
     matches(1 match { case _ => 2 }, 1 match { case _ => 2 })
     matches(1 match { case _ => 2 }, patternHole[Int] match { case _ => patternHole[Int] })