Merge pull request #1632 from rvacaru/revert/1562-better-error-msgs

Revert "better error for external rules ran with old scalafix-cli version"
scalacenter · Jul 15, 2022 · 759f864 · 759f864
2 parents 352bad1 + df0ee69
commit 759f864
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 94 deletions.
diff --git a/project/Mima.scala b/project/Mima.scala
@@ -35,7 +35,9 @@ object Mima {
       ProblemFilters.exclude[MissingClassProblem]("scalafix.testkit.SyntacticRuleSuite$"),
       ProblemFilters.exclude[Problem]("scalafix.testkit.SyntacticRuleSuite"),
       ProblemFilters.exclude[ReversedMissingMethodProblem]("scalafix.interfaces.ScalafixArguments.withSemanticdbTargetroots"),
-      ProblemFilters.exclude[IncompatibleMethTypeProblem]("scalafix.testkit.RuleTest.fromPath") // private[scalafix]
+      ProblemFilters.exclude[IncompatibleMethTypeProblem]("scalafix.testkit.RuleTest.fromPath"), // private[scalafix]
+      ProblemFilters.exclude[MissingClassProblem]("metaconfig.generic.package"),
+      ProblemFilters.exclude[MissingClassProblem]("metaconfig.generic.package$")
     )
   }
 }
diff --git a/scalafix-core/src/main/scala-2.12/scalafix/util/metaconfig/generic/package.scala b/scalafix-core/src/main/scala-2.12/scalafix/util/metaconfig/generic/package.scala
diff --git a/scalafix-core/src/main/scala-2.13/metaconfig/generic/package.scala b/scalafix-core/src/main/scala-2.13/metaconfig/generic/package.scala
diff --git a/scalafix-core/src/main/scala/scalafix/internal/config/ConfigRulePatches.scala b/scalafix-core/src/main/scala/scalafix/internal/config/ConfigRulePatches.scala
@@ -3,7 +3,6 @@ package scalafix.internal.config
 import metaconfig.ConfDecoder
 import metaconfig.generic
 import metaconfig.generic.Surface
-import scalafix.internal.util.MetaconfigCompatMacros
 import scalafix.patch.Patch
 import scalafix.patch.Patch.internal._
 
@@ -18,7 +17,7 @@ case class ConfigRulePatches(
 
 object ConfigRulePatches {
   implicit val surface: Surface[ConfigRulePatches] =
-    MetaconfigCompatMacros.deriveSurfaceOrig[ConfigRulePatches]
+    generic.deriveSurface[ConfigRulePatches]
   val default: ConfigRulePatches = ConfigRulePatches()
   implicit val configRuleDecoder: ConfDecoder[ConfigRulePatches] =
     generic.deriveDecoder[ConfigRulePatches](default)

diff --git a/scalafix-core/src/main/scala/scalafix/internal/config/DebugConfig.scala b/scalafix-core/src/main/scala/scalafix/internal/config/DebugConfig.scala
@@ -3,14 +3,13 @@ package scalafix.internal.config
 import metaconfig.ConfDecoder
 import metaconfig.generic
 import metaconfig.generic.Surface
-import scalafix.internal.util.MetaconfigCompatMacros
 
 case class DebugConfig(
     printSymbols: Boolean = false
 )
 object DebugConfig {
   implicit val surface: Surface[DebugConfig] =
-    MetaconfigCompatMacros.deriveSurfaceOrig[DebugConfig]
+    generic.deriveSurface[DebugConfig]
   val default: DebugConfig = DebugConfig()
   implicit val decoder: ConfDecoder[DebugConfig] =
     generic.deriveDecoder[DebugConfig](default)

diff --git a/scalafix-core/src/main/scala/scalafix/internal/config/LintConfig.scala b/scalafix-core/src/main/scala/scalafix/internal/config/LintConfig.scala
@@ -3,7 +3,6 @@ package scalafix.internal.config
 import metaconfig.ConfDecoder
 import metaconfig.generic
 import metaconfig.generic.Surface
-import scalafix.internal.util.MetaconfigCompatMacros
 import scalafix.lint.LintSeverity
 
 case class LintConfig(
@@ -22,8 +21,7 @@ case class LintConfig(
 }
 
 object LintConfig {
-  implicit val surface: Surface[LintConfig] =
-    MetaconfigCompatMacros.deriveSurfaceOrig[LintConfig]
+  implicit val surface: Surface[LintConfig] = generic.deriveSurface[LintConfig]
   lazy val default: LintConfig = LintConfig()
   implicit val decoder: ConfDecoder[LintConfig] =
     generic.deriveDecoder[LintConfig](default)

diff --git a/scalafix-core/src/main/scala/scalafix/internal/config/ScalafixConfig.scala b/scalafix-core/src/main/scala/scalafix/internal/config/ScalafixConfig.scala
@@ -6,7 +6,6 @@ import metaconfig._
 import metaconfig.generic.Surface
 import scalafix.Versions
 import scalafix.internal.config.ScalafixConfig._
-import scalafix.internal.util.MetaconfigCompatMacros
 
 case class ScalafixConfig(
     version: String = Versions.version,
@@ -39,7 +38,7 @@ object ScalafixConfig {
   def decoder(default: ScalafixConfig): ConfDecoder[ScalafixConfig] =
     generic.deriveDecoder[ScalafixConfig](default)
   implicit lazy val surface: Surface[ScalafixConfig] =
-    MetaconfigCompatMacros.deriveSurfaceOrig[ScalafixConfig]
+    generic.deriveSurface[ScalafixConfig]
   implicit lazy val ScalafixConfigDecoder: ConfDecoder[ScalafixConfig] =
     decoder(default)
 

diff --git a/scalafix-core/src/main/scala/scalafix/internal/util/MetaconfigCompatMacros.scala b/scalafix-core/src/main/scala/scalafix/internal/util/MetaconfigCompatMacros.scala