Modify expression extraction

Author: Sara Alemanno

library/src-3.x/dotty/internal/StringContextMacro.scala

@@ -71,17 +71,9 @@ object StringContextMacro {
    */
   def getPartsExprs(strCtxExpr : Expr[scala.StringContext])(implicit reflect : Reflection): List[Expr[String]] = {
     import reflect._
-    strCtxExpr.unseal.underlyingArgument match {
-      case Apply(Select(Select(_, "StringContext") | Ident("StringContext"), "apply"), List(parts1)) =>
-        parts1.seal.cast[Seq[String]] match {
-          case ExprSeq(parts2) => parts2.toList
-          case _ => QuoteError("Expected statically known String Context", strCtxExpr)
-        }
-      case Apply(Select(New(TypeIdent("StringContext")), _), List(parts1)) =>
-        parts1.seal.cast[Seq[String]] match {
-          case ExprSeq(parts2) => parts2.toList
-          case _ => QuoteError("Expected statically known String Context", strCtxExpr)
-        }
+    strCtxExpr match {
+      case '{ StringContext(${ExprSeq(parts)}: _*) } => parts.toList
+      case '{ new StringContext(${ExprSeq(parts)}: _*) } => parts.toList
       case _ => QuoteError("Expected statically known String Context", strCtxExpr)
     }
   }

tests/run-macros/f-interpolator-neg/Macros_1.scala

@@ -17,7 +17,7 @@ object Macro {
     (strCtxExpr, argsExpr) match {
       case ('{ StringContext(${ExprSeq(parts)}: _*) }, ExprSeq(args)) =>
         val errors = List.newBuilder[Expr[(Boolean, Int, Int, Int, String)]]
-         // true if error, false if warning
+        // true if error, false if warning
         // 0 if part, 1 if arg, 2 if strCtx, 3 if args
         // index in the list if arg or part, -1 otherwise
         // offset, 0 if strCtx, args or arg
@@ -67,7 +67,7 @@ object Macro {
         errors.result().toExprOfList
     case ('{ new StringContext(${ExprSeq(parts)}: _*) }, ExprSeq(args)) =>
         val errors = List.newBuilder[Expr[(Boolean, Int, Int, Int, String)]]
-         // true if error, false if warning
+        // true if error, false if warning
         // 0 if part, 1 if arg, 2 if strCtx, 3 if args
         // index in the list if arg or part, -1 otherwise
         // offset, 0 if strCtx, args or arg