Fix for varargs

lightbend-labs · Mar 1, 2024 · a6e2c8b · a6e2c8b
1 parent 14db4cb
commit a6e2c8b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala b/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala
@@ -276,11 +276,12 @@ private[scalalogging] object LoggerMacro {
       case Block(Nil, e) => rec(e)
       case Typed(e, _) => rec(e)
       case Inlined(_, Nil, e) => rec(e)
-      // Seq():_*, List():_* e.g., 
-      case Apply(TypeApply(Select(Ident(_), "apply"), _), List(Typed(Repeated(elems, _),_))) => 
+      // Seq():_*, List():_* , forceVarargs(1,2):_*e.g., 
+      case Apply(TypeApply(_, _), List(Typed(Repeated(elems, _),_))) => 
         Some(elems.map(map))
-      // forceVarargs(1,2):_*  
-      case Apply(TypeApply(_, _), List(Typed(Repeated(elems, _),_))) => Some(elems.map(map))  
+      case Ident(name) =>
+        // todo
+        None
       case _  =>
         None
     }

diff --git a/src/test/scala-3/com/typesafe/scalalogging/Scala3LoggerSpec.scala b/src/test/scala-3/com/typesafe/scalalogging/Scala3LoggerSpec.scala
@@ -34,6 +34,14 @@ class Scala3LoggerSpec extends AnyWordSpec with Matchers with Varargs with Mocki
       logger.info("""Hello {}""", forceVarargs(arg5ref):_*)
       verify(underlying).info("""Hello {}""", arg5ref)
     }
+
+    "work when passing a inline value as repeated arguments" in {
+      val f = fixture(_.isInfoEnabled, isEnabled = true)
+      import f._
+      inline def argss = Seq(arg5ref, arg5ref, arg5ref)
+      logger.info("""Hello {} {} {}""", argss:_*)
+      verify(underlying).info("""Hello {} {} {}""", Seq(arg5ref, arg5ref, arg5ref):_*)
+    }
   }
 
   private def fixture(p: Underlying => Boolean, isEnabled: Boolean) = new LoggerF(p, isEnabled)