From 7dd12dda1d6704b0d35a6588bd9885780aab7b93 Mon Sep 17 00:00:00 2001 From: danicheg Date: Thu, 13 Feb 2025 13:13:42 +0300 Subject: [PATCH 1/2] Enhance the error message for the update command --- src/main/scala/scalafix/sbt/ScalafixPlugin.scala | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/scala/scalafix/sbt/ScalafixPlugin.scala b/src/main/scala/scalafix/sbt/ScalafixPlugin.scala index efd6d978..c33daed0 100644 --- a/src/main/scala/scalafix/sbt/ScalafixPlugin.scala +++ b/src/main/scala/scalafix/sbt/ScalafixPlugin.scala @@ -250,11 +250,12 @@ object ScalafixPlugin extends AutoPlugin { resolveException.failed.headOption match { case Some(SemanticdbScalac(rev)) => val scalaV = scalaVersion.value - val msg = s"The SemanticDB scalac plugin version ${rev} set up " + - "via `semanticdbVersion` does follow the version recommended " + - "for Scalafix, but is not supported for the outdated Scala " + - s"version ${scalaV}. Please upgrade to a more recent Scala " + - "patch version or uninstall sbt-scalafix." + val msg = + s"The SemanticDB scalac plugin version ${rev} set up " + + "via `semanticdbVersion` does follow the version recommended " + + "for Scalafix, but is not supported for the given Scala " + + s"version ${scalaV}. Please consider upgrading to a more recent version " + + "of sbt-scalafix and/or Scala, or uninstalling sbt-scalafix plugin." throw inc.copy(message = Some(msg)) case _ => } From a7600dd3f9d2a1115246733a7dc1312a7d66bdbd Mon Sep 17 00:00:00 2001 From: danicheg Date: Sun, 16 Feb 2025 22:51:56 +0300 Subject: [PATCH 2/2] Tweak unavailable-semanticdb-scalac test --- .../sbt-scalafix/unavailable-semanticdb-scalac/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/build.sbt b/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/build.sbt index 622f2dc0..175d9164 100644 --- a/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/build.sbt +++ b/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/build.sbt @@ -19,7 +19,7 @@ checkLogs := { assert( logLines.exists( _.contains( - "Please upgrade to a more recent Scala patch version or uninstall sbt-scalafix" + "Please consider upgrading to a more recent version of sbt-scalafix and/or Scala, or uninstalling sbt-scalafix plugin" ) ) )