wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala

@@ -68,7 +68,6 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
       checkAnnotations(tree)
       super.transform(tree)
     else tree match {
-
       case _: TypeTree | _: RefTree if tree.isType  =>
         val healedType = healType(tree.sourcePos)(tree.tpe)
         if healedType == tree.tpe then tree

compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala

@@ -102,14 +102,17 @@ abstract class TreeMapWithStages(@constructorOnly ictx: Context) extends TreeMap
 
       tree match {
         case TypeApply(Select(Select(scope, _) ,nme.apply), List(quotedTree)) if tree.symbol.isQuote =>
+          val old = inQuoteOrSplice
+          inQuoteOrSplice = true
           currentScope = scope
-          dropEmptyBlocks(quotedTree) match
+          try dropEmptyBlocks(quotedTree) match
             case SplicedType(t) =>
               // '[ x.$splice ] --> x
               transform(t)
             case _ =>
               transformQuotation(quotedTree, tree)
-        case Apply(Select(Quoted(quotedTree), _), List(scope)) if quotedTree.isType =>
+          finally inQuoteOrSplice = old
+        case Apply(Select(Quoted(quotedTree), _), List(scope)) if quotedTree.isType => // TODO remove?
           currentScope = scope
           dropEmptyBlocks(quotedTree) match
             case SplicedType(t) =>

library/src-bootstrapped/scala/quoted/Scope.scala

@@ -198,35 +198,20 @@ trait Scope extends Liftables, Unliftables { self =>
 
 
 // tests/neg-macros/i4044b.scala failed
-// tests/neg-macros/i7013.scala failed
-// tests/neg-macros/i7013b.scala failed
-// tests/neg-macros/i7013c.scala failed
-// tests/neg-macros/i7892.scala failed
 // tests/neg-macros/quotedPatterns-1.scala failed
 // tests/pos-macros/i4414.scala failed
-// tests/pos-macros/i6140.scala failed
-// tests/pos-macros/i6142.scala failed
-// tests/pos-macros/i6210 failed
-// tests/pos-macros/i7358.scala failed
 // tests/pos-macros/i7405.scala failed
 // tests/pos-macros/i7405b.scala failed
 // tests/pos-macros/i8100.scala failed
 // tests/pos-macros/i8302.scala failed
 // tests/pos-macros/quoted-pattern-type.scala failed
 // tests/pos-macros/return-quoted.scala failed
 // tests/pos-macros/toexproftuple.scala failed
-// tests/pos-macros/typetags.scala failed
 // tests/run-macros/f-interpolation-1 failed
 // tests/run-macros/i5941 failed
-// tests/run-macros/i7008 failed
 // tests/run-macros/i7987 failed
 // tests/run-macros/i8007 failed
-// tests/run-macros/i8520 failed
-// tests/run-macros/quote-implicitMatch failed
-// tests/run-macros/quote-toExprOfTuple failed
 // tests/run-macros/quoted-pattern-type failed
-// tests/run-macros/refined-selectable-macro failed
-// tests/run-macros/string-context-implicits failed
 // tests/run-macros/xml-interpolation-1 failed
 // tests/run-macros/xml-interpolation-2 failed
 
@@ -236,7 +221,6 @@ trait Scope extends Liftables, Unliftables { self =>
 // tests/run-staging/i3876.scala failed
 // tests/run-staging/i4044b.scala failed
 // tests/run-staging/i4730.scala failed
-// tests/run-staging/i5247.scala failed
 // tests/run-staging/i6754.scala failed
 // tests/run-staging/multi-staging.scala failed
 // tests/run-staging/quote-nested-4.scala failed