Merge pull request #62 from Sa1to/fix/SCL-22163

Fixing artifacts downloading logging

extractor/src/main/scala-sbt-0.13/sbt/jetbrains/LogDownloadArtifacts.scala

@@ -0,0 +1,10 @@
+package sbt.jetbrains
+
+import sbt._
+import org.jetbrains.sbt.SbtStateOps
+
+object LogDownloadArtifacts extends (State => State) with SbtStateOps {
+
+  def apply(state: State): State =
+    applySettings(state, Seq[Setting[_]](), Seq[Setting[_]]())
+}

extractor/src/main/scala-sbt-0.13/sbt/jetbrains/keysAdapterEx.scala

@@ -1,11 +1,13 @@
 package sbt.jetbrains
 
-import sbt.{Def, File, Task, TaskKey}
+import sbt.{Def, File, Task, Setting}
 
 object keysAdapterEx {
   val myScalaCompilerBridgeBinaryJar: Def.Initialize[Task[Option[File]]] = Def.taskDyn {
     Def.task {
       None
     }
   }
+
+  val artifactDownload: Seq[Setting[_]] = Seq.empty
 }

extractor/src/main/scala-sbt-1.2/org.jetbrains/LogDownloadArtifacts.scala

@@ -0,0 +1,10 @@
+package sbt.jetbrains
+
+import sbt._
+import org.jetbrains.sbt.SbtStateOps
+
+object LogDownloadArtifacts extends (State => State) with SbtStateOps {
+
+  def apply(state: State): State =
+    applySettings(state, Seq[Setting[_]](), Seq[Setting[_]]())
+}

extractor/src/main/scala-sbt-1.2/org.jetbrains/keysAdapterEx.scala

@@ -1,11 +1,13 @@
 package sbt.jetbrains
 
-import sbt.{Def, File, Task, TaskKey}
+import sbt.{Def, File, Task, Setting}
 
 object keysAdapterEx {
   val myScalaCompilerBridgeBinaryJar: Def.Initialize[Task[Option[File]]] = Def.taskDyn {
     Def.task {
       None
     }
   }
+
+  val artifactDownload: Seq[Setting[_]] = Seq.empty
 }

extractor/src/main/scala-sbt-1.3/sbt/jetbrains/LogDownloadArtifacts.scala

@@ -0,0 +1,15 @@
+package sbt.jetbrains
+
+import org.jetbrains.sbt.SbtStateOps
+import sbt.Keys.csrLogger
+import sbt._
+
+object LogDownloadArtifacts extends (State => State) with SbtStateOps {
+
+  lazy val globalSettings: Seq[Setting[_]] = Seq[Setting[_]](
+    csrLogger := keysAdapterEx.artifactDownloadCsrLogger.value
+  )
+
+  def apply(state: State): State =
+    applySettings(state, globalSettings, Seq[Setting[_]]())
+}

extractor/src/main/scala-sbt-1.3/sbt/jetbrains/keysAdapterEx.scala

@@ -1,10 +1,33 @@
 package sbt.jetbrains
 
-import sbt.{Def, File, Task, TaskKey}
+import lmcoursier.definitions.CacheLogger
+import sbt.Keys.useSuperShell
+import sbt.{Def, File, Keys, Logger, Setting, Task, ThisBuild}
 
 object keysAdapterEx {
   //NOTE: sbt.Keys.scalaCompilerBridgeBinaryJar exists since SBT 1.2.3, so we detect it only since 1.3.0
   val myScalaCompilerBridgeBinaryJar: Def.Initialize[Task[Option[File]]] = Def.taskDyn {
     sbt.Keys.scalaCompilerBridgeBinaryJar
   }
+  lazy val artifactDownloadCsrLogger: Def.Initialize[Task[Option[CacheLogger]]] = Def.task {
+    val st = Keys.streams.value
+    val progress = (ThisBuild / useSuperShell).value
+    if (progress) None
+    else Some(new CoursierLogger(st.log))
+
+  }
+
+  val artifactDownload: Seq[Setting[_]] = Seq(
+    Keys.csrLogger := keysAdapterEx.artifactDownloadCsrLogger.value
+  )
+
+  class CoursierLogger(logger: Logger) extends CacheLogger {
+    override def downloadedArtifact(url: String, success: Boolean): Unit = {
+      logger.info(s"downloaded $url")
+    }
+
+    override def downloadingArtifact(url: String): Unit = {
+      logger.info(s"downloading $url")
+    }
+  }
 }

extractor/src/main/scala/org/jetbrains/sbt/CreateTasks.scala

@@ -52,21 +52,4 @@ object CreateTasks extends (State => State) with SbtStateOps {
   def apply(state: State): State =
     applySettings(state, globalSettings, projectSettings)
 
-  private def applySettings(state: State, globalSettings: Seq[Setting[_]], projectSettings: Seq[Setting[_]]): State = {
-    val extracted = Project.extract(state)
-    import extracted.{structure => extractedStructure, _}
-    val transformedGlobalSettings = Project.transform(_ => GlobalScope, globalSettings)
-    val transformedProjectSettings = extractedStructure.allProjectRefs.flatMap { projectRef =>
-      transformSettings(projectScope(projectRef), projectRef.build, rootProject, projectSettings)
-    }
-    reapply(extracted.session.appendRaw(transformedGlobalSettings ++ transformedProjectSettings), state)
-  }
-
-  // copied from sbt.internal.Load
-  private def transformSettings(thisScope: Scope, uri: URI, rootProject: URI => String, settings: Seq[Setting[_]]): Seq[Setting[_]] =
-    Project.transform(Scope.resolveScope(thisScope, uri, rootProject), settings)
-
-  // copied from sbt.internal.SessionSettings
-  private def reapply(session: SessionSettings, s: State): State =
-    BuiltinCommands.reapply(session, Project.structure(s), s)
 }

extractor/src/main/scala/org/jetbrains/sbt/StructurePlugin.scala

@@ -5,6 +5,7 @@ import org.jetbrains.sbt.structure.XmlSerializer._
 import sbt._
 import sbt.complete.DefaultParsers
 import sbt.plugins.JvmPlugin
+import sbt.jetbrains.keysAdapterEx
 
 /**
   * Created by jast on 2017-02-22.
@@ -18,7 +19,7 @@ object StructurePlugin extends AutoPlugin {
     StructureKeys.sbtStructureOutputFile := None,
     StructureKeys.sbtStructureOptions := "prettyPrint download",
     StructureKeys.dumpStructureTo := pluginOnlyTasks.dumpStructureTo.evaluated
-  ) ++ CreateTasks.globalSettings
+  ) ++ keysAdapterEx.artifactDownload ++ CreateTasks.globalSettings
 
   override lazy val projectSettings: Seq[Setting[_]] = CreateTasks.projectSettings
 
@@ -52,4 +53,4 @@ private object pluginOnlyTasks {
       outputFile
     }
   }
-}
+}

extractor/src/main/scala/org/jetbrains/sbt/operations.scala

@@ -9,6 +9,25 @@ import sbt.jetbrains.apiAdapter._
  * @since 4/10/15.
  */
 trait SbtStateOps {
+
+  def applySettings(state: State, globalSettings: Seq[Setting[_]], projectSettings: Seq[Setting[_]]): State = {
+    val extracted = Project.extract(state)
+    import extracted.{structure => extractedStructure, _}
+    val transformedGlobalSettings = Project.transform(_ => GlobalScope, globalSettings)
+    val transformedProjectSettings = extractedStructure.allProjectRefs.flatMap { projectRef =>
+      transformSettings(projectScope(projectRef), projectRef.build, rootProject, projectSettings)
+    }
+    reapply(extracted.session.appendRaw(transformedGlobalSettings ++ transformedProjectSettings), state)
+  }
+
+  // copied from sbt.internal.Load
+  private def transformSettings(thisScope: Scope, uri: URI, rootProject: URI => String, settings: Seq[Setting[_]]): Seq[Setting[_]] =
+    Project.transform(Scope.resolveScope(thisScope, uri, rootProject), settings)
+
+  // copied from sbt.internal.SessionSettings
+  private def reapply(session: SessionSettings, s: State): State =
+    BuiltinCommands.reapply(session, Project.structure(s), s)
+
   def structure(state: State): BuildStructure =
     sbt.Project.structure(state)