Merge pull request #14396 from rssh/fix-14393

fix #14393
scala · Feb 3, 2022 · 3d3f820 · 3d3f820
2 parents 8bb2453 + 869af6d
commit 3d3f820
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
@@ -4391,6 +4391,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
             foldTree(x, tpt)(owner)
           case Typed(expr, tpt) =>
             foldTree(foldTree(x, expr)(owner), tpt)(owner)
+          case TypedOrTest(expr, tpt) =>
+            foldTree(foldTree(x, expr)(owner), tpt)(owner)
           case NamedArg(_, arg) =>
             foldTree(x, arg)(owner)
           case Assign(lhs, rhs) =>

diff --git a/tests/pos-macros/i14393/Macro_1.scala b/tests/pos-macros/i14393/Macro_1.scala
@@ -0,0 +1,20 @@
+package i14393
+import scala.quoted.*
+
+object M {
+
+  inline def useFoldTree[X](inline x:X):X = ${
+     useFoldTreeImpl('x)
+  }
+
+  def useFoldTreeImpl[X:Type](x:Expr[X])(using Quotes):Expr[X] = {
+     import quotes.reflect.*
+     val search = new TreeAccumulator[Int] {
+        def foldTree(s:Int, tree: Tree)(owner: Symbol): Int =
+                 foldOverTree(s,tree)(owner)
+     }
+     search.foldTree(0,x.asTerm)(Symbol.spliceOwner)
+     x
+  }
+
+}
diff --git a/tests/pos-macros/i14393/Test_2.scala b/tests/pos-macros/i14393/Test_2.scala
@@ -0,0 +1,11 @@
+package i14393
+
+def thing() =
+      M.useFoldTree {
+
+        Option("") match
+          case None =>
+          case Some(_) =>
+            ???
+
+      }