Fix ambiguities in compiler

Now that extension names are the same as normal names, we got several ambiguos imports

Author: odersky

compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

@@ -206,7 +206,7 @@ class JSCodeGen()(using genCtx: Context) {
         withScopedVars(
             currentClassSym := sym
         ) {
-          val tree = if (isJSType(sym)) {
+          val tree = if (sym.isJSType) {
             if (!sym.is(Trait) && sym.isNonNativeJSClass)
               genNonNativeJSClass(td)
             else
@@ -702,7 +702,7 @@ class JSCodeGen()(using genCtx: Context) {
       Nil
     } else {
       val moduleClass = module.moduleClass
-      if (!isJSType(moduleClass))
+      if (!moduleClass.isJSType)
         genStaticForwardersFromModuleClass(existingMembers, moduleClass)
       else
         Nil
@@ -1678,7 +1678,7 @@ class JSCodeGen()(using genCtx: Context) {
     }
 
     fun match {
-      case _ if isJSDefaultParam(sym) =>
+      case _ if sym.isJSDefaultParam =>
         js.Transient(UndefinedParam)(toIRType(sym.info.finalResultType))
 
       case Select(Super(_, _), _) =>
@@ -1771,7 +1771,7 @@ class JSCodeGen()(using genCtx: Context) {
     } else /*if (translatedAnonFunctions contains tpe.typeSymbol) {
       val functionMaker = translatedAnonFunctions(tpe.typeSymbol)
       functionMaker(args map genExpr)
-    } else*/ if (isJSType(clsSym)) {
+    } else*/ if (clsSym.isJSType) {
       genNewJSClass(tree)
     } else {
       toTypeRef(tpe) match {
@@ -2406,7 +2406,7 @@ class JSCodeGen()(using genCtx: Context) {
      * and `-0.0`, see Javadoc (scala-dev#329, scala-js#2799).
      */
     val mustUseAnyComparator: Boolean = {
-      isJSType(lsym) || isJSType(rsym) || {
+      lsym.isJSType || rsym.isJSType || {
         val p = ctx.platform
         p.isMaybeBoxed(lsym) && p.isMaybeBoxed(rsym) && {
           val areSameFinals = lsym.is(Final) && rsym.is(Final) && (ltpe =:= rtpe)
@@ -2603,7 +2603,7 @@ class JSCodeGen()(using genCtx: Context) {
 
     if (isMethodStaticInIR(sym)) {
       genApplyStatic(sym, genActualArgs(sym, args))
-    } else if (isJSType(sym.owner)) {
+    } else if (sym.owner.isJSType) {
       if (!sym.owner.isNonNativeJSClass || sym.isJSExposed)
         genApplyJSMethodGeneric(sym, genExprOrGlobalScope(receiver), genActualJSArgs(sym, args), isStat)(tree.sourcePos)
       else
@@ -2689,13 +2689,13 @@ class JSCodeGen()(using genCtx: Context) {
           }
         }
 
-        if (isJSGetter(sym)) {
+        if (sym.isJSGetter) {
           assert(noSpread && argc == 0)
           genSelectGet(jsFunName)
-        } else if (isJSSetter(sym)) {
+        } else if (sym.isJSSetter) {
           assert(noSpread && argc == 1)
           genSelectSet(jsFunName, requireNotSpread(args.head))
-        } else if (isJSBracketAccess(sym)) {
+        } else if (sym.isJSBracketAccess) {
           assert(noSpread && (argc == 1 || argc == 2),
               s"@JSBracketAccess methods should have 1 or 2 non-varargs arguments")
           (args: @unchecked) match {
@@ -2704,7 +2704,7 @@ class JSCodeGen()(using genCtx: Context) {
             case List(keyArg, valueArg) =>
               genSelectSet(requireNotSpread(keyArg), requireNotSpread(valueArg))
           }
-        } else if (isJSBracketCall(sym)) {
+        } else if (sym.isJSBracketCall) {
           val (methodName, actualArgs) = extractFirstArg(args)
           genCall(methodName, actualArgs)
         } else {
@@ -3187,7 +3187,7 @@ class JSCodeGen()(using genCtx: Context) {
 
     val sym = to.typeSymbol
 
-    if (sym == defn.ObjectClass || isJSType(sym)) {
+    if (sym == defn.ObjectClass || sym.isJSType) {
       /* asInstanceOf[Object] always succeeds, and
        * asInstanceOf to a raw JS type is completely erased.
        */
@@ -3217,7 +3217,7 @@ class JSCodeGen()(using genCtx: Context) {
 
     if (sym == defn.ObjectClass) {
       js.BinaryOp(js.BinaryOp.!==, value, js.Null())
-    } else if (isJSType(sym)) {
+    } else if (sym.isJSType) {
       if (sym.is(Trait)) {
         report.error(
             s"isInstanceOf[${sym.fullName}] not supported because it is a JS trait",
@@ -3347,7 +3347,7 @@ class JSCodeGen()(using genCtx: Context) {
       arg match {
         case Literal(value) if value.tag == Constants.ClazzTag =>
           val classSym = value.typeValue.typeSymbol
-          if (isJSType(classSym) && !classSym.is(Trait) && !classSym.is(ModuleClass))
+          if (classSym.isJSType && !classSym.is(Trait) && !classSym.is(ModuleClass))
             classSym
           else
             fail()
@@ -3999,7 +3999,7 @@ class JSCodeGen()(using genCtx: Context) {
     } else {
       val cls = encodeClassName(sym)
       val tree =
-        if (isJSType(sym)) js.LoadJSModule(cls)
+        if (sym.isJSType) js.LoadJSModule(cls)
         else js.LoadModule(cls)
       MaybeGlobalScope.NotGlobalScope(tree)
     }

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

@@ -212,7 +212,7 @@ object NameOps {
     /** Same as `funArity`, except that it returns -1 if the prefix
      *  is not one of "", "Context", "Erased", "ErasedContext"
      */
-    private def checkedFunArity(suffixStart: Int) =
+    private def checkedFunArity(suffixStart: Int): Int =
       if suffixStart == 0
          || isPreceded("Context", suffixStart)
          || isPreceded("Erased", suffixStart)

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

@@ -1187,7 +1187,7 @@ trait Applications extends Compatibility {
             typedType(untpd.rename(tree, tree.name.toTypeName))(using nestedCtx)
           ttree.tpe match {
             case alias: TypeRef if alias.info.isTypeAlias && !nestedCtx.reporter.hasErrors =>
-              companionRef(alias) match {
+              Inferencing.companionRef(alias) match {
                 case companion: TermRef => return untpd.ref(companion).withSpan(tree.span)
                 case _ =>
               }

scala3doc/src/dotty/dokka/model/api/internalExtensions.scala

@@ -20,17 +20,17 @@ import org.jetbrains.dokka.model.DModule
 import collection.JavaConverters._
 import org.jetbrains.dokka.links._
 import org.jetbrains.dokka.model.doc.DocumentationNode
-import org.jetbrains.dokka.model.properties._  
+import org.jetbrains.dokka.model.properties._
 import java.util.{List => JList, Set => JSet}
 
 import com.virtuslab.dokka.site.SourceSetWrapper
 
 private [model] case class MemberExtension(
   visibility: Visibility,
   modifiers: Seq[dotty.dokka.model.api.Modifier],
-  kind: Kind, 
+  kind: Kind,
   val annotations: List[Annotation],
-  signature: Signature, 
+  signature: Signature,
   origin: Origin = Origin.DefinedWithin
 ) extends ExtraProperty[Documentable]:
  override def getKey = MemberExtension
@@ -49,30 +49,30 @@ case class CompositeMemberExtension(
 object CompositeMemberExtension extends BaseKey[Documentable, CompositeMemberExtension]:
   val empty = CompositeMemberExtension()
 
-  override def mergeStrategyFor(left: CompositeMemberExtension, right: CompositeMemberExtension) = 
+  override def mergeStrategyFor(left: CompositeMemberExtension, right: CompositeMemberExtension) =
     new MergeStrategy$Replace(left.copy(members = left.members ++ right.members))
       .asInstanceOf[MergeStrategy[Documentable]]
 
 extension (member: Member):
-  private def putInMember(ext: MemberExtension) = 
+  private def putInMember(ext: MemberExtension) =
     val memberWithExtra = member.asInstanceOf[WithExtraProperties[Member]]
     memberWithExtra.withNewExtras(memberWithExtra.getExtra plus ext).asInstanceOf[Member]
 
-  private def putInCompositeMember(ext: CompositeMemberExtension) = 
+  private def putInCompositeMember(ext: CompositeMemberExtension) =
     val memberWithExtra = member.asInstanceOf[WithExtraProperties[Member]]
-    memberWithExtra.withNewExtras(memberWithExtra.getExtra plus ext).asInstanceOf[Member]  
+    memberWithExtra.withNewExtras(memberWithExtra.getExtra plus ext).asInstanceOf[Member]
 
-  def copy(modifiers: Seq[Modifier]) =
+  def copy(modifiers: Seq[Modifier]): Member =
     val ext = MemberExtension.getFrom(member).getOrElse(MemberExtension.empty).copy(modifiers = modifiers)
     putInMember(ext)
-  
-  def withOrigin(origin: Origin) =
+
+  def withOrigin(origin: Origin): Member =
     val ext = MemberExtension.getFrom(member).getOrElse(MemberExtension.empty).copy(origin = origin)
     putInMember(ext)
 
-  def withKind(kind: Kind) =
+  def withKind(kind: Kind): Member =
     val ext = MemberExtension.getFrom(member).getOrElse(MemberExtension.empty).copy(kind = kind)
-    putInMember(ext)  
+    putInMember(ext)
 
   def withMembers(newMembers: Seq[Member]): Member =
     val original = member.compositeMemberExt.getOrElse(CompositeMemberExtension())
@@ -88,11 +88,11 @@ extension (member: Member):
     val original = member.compositeMemberExt.getOrElse(CompositeMemberExtension())
     val newExt = original.copy(knownChildren = knownChildren)
     putInCompositeMember(newExt)
-    
-  def updateRecusivly(op: Member => Member) = op(member).withMembers(member.allMembers.map(op))  
+
+  def updateRecusivly(op: Member => Member) = op(member).withMembers(member.allMembers.map(op))
 
 extension (bound: Bound):
-  def asSignature: Signature = bound match 
+  def asSignature: Signature = bound match
     case tc: TypeConstructor =>
       tc.getProjections.asScala.toSeq.map {
         case txt: UnresolvedBound => txt.getName
@@ -101,7 +101,7 @@ extension (bound: Bound):
       }
 
 extension (m: DModule):
-  def updatePackages(op: Seq[DPackage] => Seq[DPackage]): DModule = 
+  def updatePackages(op: Seq[DPackage] => Seq[DPackage]): DModule =
     m.copy(
             m.getName,
             op(m.getPackages.asScala.toSeq).asJava,

scala3doc/src/dotty/dokka/translators/ScalaPageCreator.scala

@@ -162,7 +162,7 @@ class ScalaPageCreator(
 
     extension (b: DocBuilder):
         def descriptionIfNotEmpty(d: Documentable): DocBuilder = {
-            val desc = contentForDescription(d).asScala.toSeq
+            val desc = this.contentForDescription(d).asScala.toSeq
             val res = if desc.isEmpty then b else b
                 .sourceSetDependentHint(
                     Set(d.getDri),