Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use lengthIs instead of length #349

Merged
merged 1 commit into from
May 21, 2022
Merged

use lengthIs instead of length #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}*) }
Expand All @@ -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)}*) }
Expand All @@ -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)}*) }
Expand All @@ -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)}*) }
Expand All @@ -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)}*) }
Expand All @@ -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)}*) }
Expand All @@ -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)}*) }
Expand All @@ -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)}*) }
Expand All @@ -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)}*) }
Expand All @@ -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)}*) }
Expand Down
20 changes: 10 additions & 10 deletions src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down