Review logging

Author: adpi2

core/src/main/scala/ch/epfl/scala/debugadapter/internal/ClassEntryLookUp.scala

@@ -252,9 +252,7 @@ private object ClassEntryLookUp {
       }
 
       if (orphanClassFiles.size > 0)
-        logger.debug(
-          s"Found ${orphanClassFiles.size} orphan class files in ${entry.name}"
-        )
+        logger.debug(s"Found ${orphanClassFiles.size} orphan class files in ${entry.name}")
 
       new ClassEntryLookUp(
         entry,

core/src/main/scala/ch/epfl/scala/debugadapter/internal/DebugAdapter.scala

@@ -23,7 +23,7 @@ private[debugadapter] object DebugAdapter {
   DebugSettings.getCurrent.showStaticVariables = true
 
   def context(debuggee: Debuggee, tools: DebugTools, logger: Logger, testMode: Boolean): IProviderContext = {
-    TimeUtils.logTime(logger, "Configured debugger") {
+    TimeUtils.logTime(logger, "Configured debugger context") {
       val context = new ProviderContext
       val classEntries = debuggee.classEntries
       val distinctEntries = classEntries

core/src/main/scala/ch/epfl/scala/debugadapter/internal/LoggingAdapter.scala

@@ -19,11 +19,8 @@ private[debugadapter] class LoggingAdapter(
       case Level.INFO | Level.CONFIG => logger.info(message)
       case Level.WARNING => logger.warn(message)
       case Level.SEVERE =>
-        if (isExpectedDuringCancellation(message) || isIgnoredError(message)) {
-          logger.debug(message)
-        } else {
-          logger.error(message)
-        }
+        if (isExpectedDuringCancellation(message) || isIgnoredError(message)) logger.debug(message)
+        else logger.error(message)
       case _ => logger.debug(message)
     }
   }

core/src/main/scala/ch/epfl/scala/debugadapter/internal/StepFilterProvider.scala

@@ -18,28 +18,28 @@ class StepFilterProvider(
 
   override def shouldSkipOver(method: Method, filters: StepFilters): Boolean = {
     try {
-      val shouldSkip = super.shouldSkipOver(method, filters) || stepFilters.exists(_.shouldSkipOver(method))
-      if (shouldSkip) logger.debug(s"Skipping $method (step into)")
-      shouldSkip
+      val skipOver = super.shouldSkipOver(method, filters) || stepFilters.exists(_.shouldSkipOver(method))
+      if (skipOver) logger.debug(s"Skipping over $method")
+      skipOver
     } catch {
       case cause: Throwable =>
         if (testMode) throw cause
-        else logger.error(s"Failed to determine if $method should be stepped into: ${cause.getMessage}")
+        logger.warn(s"Failed to determine if $method should be skipped over: ${cause.getMessage}")
         false
     }
   }
 
   override def shouldSkipOut(upperLocation: Location, method: Method): Boolean = {
     try {
-      val shouldSkip =
+      val skipOut =
         super.shouldSkipOut(upperLocation, method) ||
           stepFilters.exists(_.shouldSkipOut(upperLocation, method))
-      if (shouldSkip) logger.debug(s"Skipping $method (step out)")
-      shouldSkip
+      if (skipOut) logger.debug(s"Skipping out $method")
+      skipOut
     } catch {
       case cause: Throwable =>
         if (testMode) throw cause
-        else logger.error(s"Failed to determine if $method should be stepped out: ${cause.getMessage}")
+        logger.warn(s"Failed to determine if $method should be skipped out: ${cause.getMessage}")
         false
     }
   }

core/src/main/scala/ch/epfl/scala/debugadapter/internal/TimeUtils.scala

@@ -7,7 +7,7 @@ import ch.epfl.scala.debugadapter.Logger
 private[debugadapter] object TimeUtils {
   def logTime[T](logger: Logger, msg: String)(f: => T): T = {
     val (duration, result) = timed(f)
-    logger.debug(s"$msg in ${prettyPrint(duration)}")
+    logger.info(s"$msg in ${prettyPrint(duration)}")
     result
   }
 

sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/internal/LoggerAdapter.scala

@@ -3,7 +3,7 @@ package ch.epfl.scala.debugadapter.sbtplugin.internal
 import ch.epfl.scala.debugadapter.Logger
 
 private[debugadapter] class LoggerAdapter(underlying: sbt.Logger) extends Logger {
-  override def debug(msg: => String): Unit = underlying.debug(msg)
+  override def debug(msg: => String): Unit = ()
   override def info(msg: => String): Unit = underlying.info(msg)
   override def warn(msg: => String): Unit = underlying.warn(msg)
   override def error(msg: => String): Unit = underlying.error(msg)