chore: Adjust to changes in this names

scalameta · Jul 6, 2023 · b82e54d · b82e54d
1 parent 77f3e79
commit b82e54d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -311,6 +311,8 @@ val mtagsSettings = List(
         .cross(CrossVersion.for3Use2_13)
         .exclude("org.scala-lang", "scala-reflect")
         .exclude("org.scala-lang", "scala-compiler")
+        // the correct one should be brought in by the scala 3 compiler
+        .exclude("org.scala-lang", "scala-library")
         .exclude(
           "com.lihaoyi",
           "geny_2.13",

diff --git a/mtags/src/main/scala/scala/meta/internal/mtags/MtagsIndexer.scala b/mtags/src/main/scala/scala/meta/internal/mtags/MtagsIndexer.scala
@@ -112,7 +112,7 @@ trait MtagsIndexer {
       properties: Int
   ): String = {
     val methodName = name match {
-      case Name.Anonymous() => Names.Constructor.value
+      case Name.This() => Names.Constructor.value
       case _ => name.value
     }
     addSignature(

diff --git a/mtags/src/main/scala/scala/meta/internal/mtags/ScalaMtags.scala b/mtags/src/main/scala/scala/meta/internal/mtags/ScalaMtags.scala
@@ -172,7 +172,7 @@ class ScalaMtags(val input: Input.VirtualFile, dialect: Dialect)
         case _: Source => continue()
         case t: Template =>
           val overloads = new OverloadDisambiguator()
-          overloads.disambiguator("") // primary constructor
+          overloads.disambiguator("this") // primary constructor
           t.stats.foreach {
             case t: Ctor.Secondary =>
               disambiguatedMethod(

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
@@ -1280,6 +1280,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     topLines = Some(5),
     compat = Map(
+      // higherKinds was deprecated
       "2.13.11" ->
         """|dynamics scala.languageFeature
            |existentials scala.languageFeature