Fix for varargs

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

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala b/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala
@@ -279,6 +279,8 @@ private[scalalogging] object LoggerMacro {
       // Seq():_*, List():_* e.g., 
       case Apply(TypeApply(Select(Ident(_), "apply"), _), List(Typed(Repeated(elems, _),_))) => 
         Some(elems.map(map))
+      // forceVarargs(1,2):_*  
+      case Apply(TypeApply(_, _), List(Typed(Repeated(elems, _),_))) => Some(elems.map(map))  
       case _  =>
         None
     }

diff --git a/src/test/scala-3/com/typesafe/scalalogging/Scala3LoggerSpec.scala b/src/test/scala-3/com/typesafe/scalalogging/Scala3LoggerSpec.scala
@@ -24,7 +24,14 @@ class Scala3LoggerSpec extends AnyWordSpec with Matchers with Varargs with Mocki
     "work when passing a Seq as repeated arguments" in {
       val f = fixture(_.isInfoEnabled, isEnabled = true)
       import f._
-      logger.info("""Hello {}""", Seq(arg5ref)*)
+      logger.info("""Hello {}""", Seq(arg5ref):_*)
+      verify(underlying).info("""Hello {}""", arg5ref)
+    }
+
+    "work when passing a fun as repeated arguments" in {
+      val f = fixture(_.isInfoEnabled, isEnabled = true)
+      import f._
+      logger.info("""Hello {}""", forceVarargs(arg5ref):_*)
       verify(underlying).info("""Hello {}""", arg5ref)
     }
   }