diff --git a/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala b/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala index 2013f48..a52ff05 100644 --- a/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala +++ b/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala @@ -20,7 +20,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isErrorEnabled) $underlying.error($message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{ if ($underlying.isErrorEnabled) $underlying.error($message, ${anyRefArgs.head}) } else '{ if ($underlying.isErrorEnabled) $underlying.error($message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -38,7 +38,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message, ${anyRefArgs.head}) } else '{ if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -64,7 +64,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isWarnEnabled) $underlying.warn($message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{ if ($underlying.isWarnEnabled) $underlying.warn($message, ${anyRefArgs.head}) } else '{ if ($underlying.isWarnEnabled) $underlying.warn($message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -82,7 +82,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message, ${anyRefArgs.head}) } else '{ if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -108,7 +108,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isInfoEnabled) $underlying.info($message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{ if ($underlying.isInfoEnabled) $underlying.info($message, ${anyRefArgs.head}) } else '{ if ($underlying.isInfoEnabled) $underlying.info($message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -126,7 +126,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message, ${anyRefArgs.head}) } else '{ if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -153,7 +153,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isDebugEnabled) $underlying.debug($message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{ if ($underlying.isDebugEnabled) $underlying.debug($message, ${anyRefArgs.head}) } else '{ if ($underlying.isDebugEnabled) $underlying.debug($message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -171,7 +171,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message, ${anyRefArgs.head}) } else '{ if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -197,7 +197,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isTraceEnabled) $underlying.trace($message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{ if ($underlying.isTraceEnabled) $underlying.trace($message, ${anyRefArgs.head}) } else '{ if ($underlying.isTraceEnabled) $underlying.trace($message, ${Expr.ofSeq(anyRefArgs)}*) } @@ -215,7 +215,7 @@ private[scalalogging] object LoggerMacro { val anyRefArgs = formatArgs(args) if(anyRefArgs.isEmpty) '{ if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message) } - else if(anyRefArgs.length == 1) + else if(anyRefArgs.lengthIs == 1) '{if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message, ${anyRefArgs.head}) } else '{ if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) } diff --git a/src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala b/src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala index 31bff70..4715289 100644 --- a/src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala +++ b/src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala @@ -22,7 +22,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def errorMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isErrorEnabled) { $underlying.error($canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -48,7 +48,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def errorMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isErrorEnabled($marker)) { $underlying.error($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -82,7 +82,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def warnMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isWarnEnabled) { $underlying.warn($canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -108,7 +108,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def warnMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isWarnEnabled($marker)) { $underlying.warn($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -143,7 +143,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def infoMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isInfoEnabled) { $underlying.info($canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -169,7 +169,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def infoMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isInfoEnabled($marker)) { $underlying.info($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -204,7 +204,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def debugMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isDebugEnabled) { $underlying.debug($canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -230,7 +230,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def debugMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isDebugEnabled($marker)) { $underlying.debug($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -265,7 +265,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def traceMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isTraceEnabled) { $underlying.trace($canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a) @@ -291,7 +291,7 @@ private[scalalogging] object LoggerTakingImplicitMacro { def traceMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = { val formatedArgs = LoggerMacro.formatArgs(args) - if (formatedArgs.length == 1) + if (formatedArgs.lengthIs == 1) '{if ($underlying.isTraceEnabled($marker)) { $underlying.trace($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head}) $canLogEv.afterLog($a)