Use fully-qualified classOf from scala.Predef

Log4s · Nov 26, 2019 · 845c14fc93fc06fd84a6a25899d4d57f47dd66ae · 845c14f
1 parent 5deaa53
commit 845c14fc93fc06fd84a6a25899d4d57f47dd66ae
Unified Split

Showing with 7 additions and 2 deletions.

+2 −2 core/shared/src/main/scala-2.11/org/log4s/LoggerMacros.scala

+5 −0 core/shared/src/test/scala/org/log4s/GetLoggerSpec.scala
diff --git a/core/shared/src/main/scala-2.11/org/log4s/LoggerMacros.scala b/core/shared/src/main/scala-2.11/org/log4s/LoggerMacros.scala
@@ -62,7 +62,7 @@ private[log4s] object LoggerMacros {
       val typeParams = typeSymbol.typeParams
 
       if (typeParams.isEmpty) {
-        loggerByParam(q"classOf[$typeSymbol]")
+        loggerByParam(q"_root_.scala.Predef.classOf[$typeSymbol]")
       } else {
         if (typeParams.exists(_.asType.typeParams.nonEmpty)) {
           /* We have at least one higher-kinded type: fall back to by-name logger construction, as
@@ -71,7 +71,7 @@ private[log4s] object LoggerMacros {
         } else {
           val typeArgs = List.fill(typeParams.length)(WildcardType)
           val typeConstructor = tq"$typeSymbol[..${typeArgs}]"
-          loggerByParam(q"classOf[$typeConstructor]")
+          loggerByParam(q"_root_.scala.Predef.classOf[$typeConstructor]")
         }
       }
     }

diff --git a/core/shared/src/test/scala/org/log4s/GetLoggerSpec.scala b/core/shared/src/test/scala/org/log4s/GetLoggerSpec.scala
@@ -115,6 +115,11 @@ class GetLoggerSpec extends FlatSpec with Matchers with GivenWhenThen with Logge
     val hkt = new GetLoggerSpecKinds.NestedKind1[Seq]
     hkt.logger.name shouldEqual "org.log4s.GetLoggerSpecKinds.NestedKind1"
   }
+
+  it should "use classOf from scala.Predef" in {
+    val classOf = 1 // shadow the symbol to make compilation fail if it’s attempted to be used
+    getLogger.name shouldEqual "org.log4s.GetLoggerSpec"
+  }
 }
 
 private class GetLoggerSpecParam[A] {