Merge pull request #6509 from dotty-staging/avoid-StringContext-ambiguities

Avoid ambiguities between scala.StringContext and internal.StringContext

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -1184,10 +1184,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
       val baseType = tree.tpe.baseType(defn.QuotedExprClass)
       val argType =
         if (baseType != NoType) baseType.argTypesHi.head
-        else {
-          assert(ctx.reporter.hasErrors)
-          defn.NothingType
-        }
+        else defn.NothingType
       ref(defn.InternalQuoted_exprSplice).appliedToType(argType).appliedTo(tree)
     }
     def unapply(tree: Tree)(implicit ctx: Context): Option[Tree] = tree match {

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -637,10 +637,10 @@ class Definitions {
     lazy val StringContextModule_applyR: TermRef = StringContextModule.requiredMethodRef(nme.apply)
     def StringContextModule_apply(implicit ctx: Context): Symbol = StringContextModule_applyR.symbol
 
-  lazy val InternalStringContextModuleR: TermRef = ctx.requiredModuleRef("dotty.internal.StringContext")
-  def InternalStringContextModule(implicit ctx: Context): Symbol = InternalStringContextModuleR.termSymbol
-    lazy val InternalStringContextModule_fR: TermRef = InternalStringContextModule.requiredMethodRef(nme.f)
-    def InternalStringContextModule_f(implicit ctx: Context): Symbol = InternalStringContextModule_fR.symbol
+  lazy val InternalStringContextMacroModuleR: TermRef = ctx.requiredModuleRef("dotty.internal.StringContextMacro")
+  def InternalStringContextMacroModule(implicit ctx: Context): Symbol = InternalStringContextMacroModuleR.termSymbol
+    lazy val InternalStringContextMacroModule_fR: TermRef = InternalStringContextMacroModule.requiredMethodRef(nme.f)
+    def InternalStringContextMacroModule_f(implicit ctx: Context): Symbol = InternalStringContextMacroModule_fR.symbol
 
   lazy val PartialFunctionType: TypeRef         = ctx.requiredClassRef("scala.PartialFunction")
   def PartialFunctionClass(implicit ctx: Context): ClassSymbol = PartialFunctionType.symbol.asClass

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -2784,7 +2784,7 @@ class Typer extends Namer
           // a call to dotty.internal.StringContext.f which we can implement using the new macros.
           // As the macro is implemented in the bootstrapped library, it can only be used from the bootstrapped compiler.
           val Apply(TypeApply(Select(sc, _), _), args) = tree
-          val newCall = ref(defn.InternalStringContextModule_f).appliedTo(sc).appliedToArgs(args)
+          val newCall = ref(defn.InternalStringContextMacroModule_f).appliedTo(sc).appliedToArgs(args)
           readaptSimplified(Inliner.inlineCall(newCall))
         } else {
           ctx.error("Scala 2 macro cannot be used in Dotty. See http://dotty.epfl.ch/docs/reference/dropped-features/macros.html", tree.sourcePos)

library/src-3.x/dotty/internal/StringContext.scala renamed to library/src-3.x/dotty/internal/StringContextMacro.scala

@@ -2,10 +2,10 @@ package dotty.internal
 
 import scala.quoted._
 
-object StringContext {
+object StringContextMacro {
 
   /** Implemetation of scala.StringContext.f used in Dotty while the standard library is still not bootstrapped */
-  inline def f(sc: => scala.StringContext)(args: Any*): String = ${ fImpl('sc, 'args) }
+  inline def f(sc: => StringContext)(args: Any*): String = ${ fImpl('sc, 'args) }
 
   private def fImpl(sc: Expr[StringContext], args: Expr[Seq[Any]]): Expr[String] = {
     // TODO implement f interpolation checks and generate optimal code