Merge pull request #2371 from kitbellew/2371

Stop using long-deprecated scala.meta code

Author: bjaglin

scalafix-core/src/main/scala-2/scalafix/internal/util/PrettyType.scala

@@ -518,7 +518,7 @@ class PrettyType private (
       def targs: List[Type] =
         typeArguments.iterator.map {
           case TypeExtractors.Wildcard() =>
-            Type.Placeholder(Type.Bounds(None, None))
+            Type.Wildcard(Type.Bounds.empty)
           case targ =>
             toType(targ)
         }.toList

scalafix-core/src/main/scala/scalafix/internal/util/DenotationOps.scala

@@ -14,14 +14,8 @@ object DenotationOps {
       dialect: Dialect
   ): Option[Type] = {
     def getDeclType(tpe: Type): Type = tpe match {
-      case Type.Method(_, tpe) if denot.isMethod => tpe
-      case Type.Lambda(_, tpe) if denot.isMethod => getDeclType(tpe)
-      case Type.Method((Term.Param(_, _, Some(tpe), _) :: Nil) :: Nil, _)
-          if denot.isVar =>
-        // Workaround for https://github.com/scalameta/scalameta/issues/1100
-        tpe
-      case x =>
-        x
+      case x: Type.Lambda if denot.isMethod => getDeclType(x.tpe)
+      case x => x
     }
     val signature =
       if (denot.isVal || denot.isMethod || denot.isVar) {

scalafix-tests/integration/src/test/scala/scalafix/tests/reflect/RuleDecoderSuite.scala

@@ -76,6 +76,7 @@ class RuleDecoderSuite extends AnyFunSuite {
     assert(!class1.isAssignableFrom(class2))
   }
 
+  /*
   test("deprecation warnings do not prevent rule loading") {
     val tmp = Files.createTempFile("scalafix", "CustomRule.scala")
 
@@ -97,6 +98,7 @@ class RuleDecoderSuite extends AnyFunSuite {
       decoder.read(Conf.Str(tmp.toUri.toString)).get
     assert(rules.rules.nonEmpty)
   }
+   */
 
   test("compilation errors are properly exposed") {
     val tmp = Files.createTempFile("scalafix", "BrokenRule.scala")