Skip to content

Commit 120f905

Browse files
Albert Meltzerkitbellew
authored andcommitted
Bugfix: forgot to use the ScalafmtLogger, fix that
1 parent e7c4b2b commit 120f905

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

plugin/src/main/scala/org/scalafmt/sbt/ScalafmtPlugin.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ object ScalafmtPlugin extends AutoPlugin {
124124
override def trace(t: => Throwable): Unit = log.trace(t)
125125
override def success(message: => String): Unit = success(message)
126126
override def log(level: Level.Value, message: => String): Unit =
127-
log.log(level, "scalafmt: " + message)
127+
log.log(level, getMessage(message))
128+
def getMessage(message: String): String = "scalafmt: " + message
128129
}
129130

130131
private class FormatSession(
@@ -135,7 +136,7 @@ object ScalafmtPlugin extends AutoPlugin {
135136
filterMode: String,
136137
errorHandling: ErrorHandling
137138
) {
138-
private val log = taskStreams.log
139+
private val log = new ScalafmtLogger(taskStreams.log)
139140
private val reporter = new ScalafmtSbtReporter(
140141
log,
141142
new OutputStreamWriter(taskStreams.binary()),
@@ -201,9 +202,9 @@ object ScalafmtPlugin extends AutoPlugin {
201202
}
202203
val bad = res.count(_ eq None)
203204
if (bad != 0) {
204-
val err = s"scalafmt: failed for $bad sources"
205-
if (errorHandling.failOnErrors) throw new MessageOnlyException(err)
206-
log.error(err)
205+
val err = s"failed for $bad sources"
206+
if (!errorHandling.failOnErrors) log.error(err)
207+
else throw new MessageOnlyException(log.getMessage(err))
207208
}
208209
res
209210
}

0 commit comments

Comments
 (0)