bugfix: highlight enum cases correctly

scalameta · Aug 10, 2023 · 4c33849 · 4c33849
1 parent 1f4c43f
commit 4c33849
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/PcCollector.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/PcCollector.scala
@@ -195,6 +195,13 @@ abstract class PcCollector[T](
       case (df: NamedDefTree) :: _
           if df.nameSpan.contains(pos.span) && !isGeneratedGiven(df) =>
         Some(symbolAlternatives(df.symbol), pos.withSpan(df.nameSpan))
+      /* enum cases with params
+       * enum Foo:
+       *  case B@@ar[A](i: A)
+       */
+      case (df: NamedDefTree) :: Template(_, _, self, _) :: _
+          if (df.name == nme.apply || df.name == nme.unapply) && df.nameSpan.isZeroExtent =>
+        Some(symbolAlternatives(self.tpt.symbol), self.sourcePos)
       /**
        * For traversing annotations:
        * @JsonNo@@tification("")

diff --git a/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala b/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala
@@ -247,4 +247,24 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |end extension""".stripMargin,
   )
 
+  check(
+    "enum-cases".tag(IgnoreScala2),
+    """|enum MyOption:
+       |  case <<My@@Some>>(value: Int)
+       |  case MyNone
+       |
+       |val alpha = MyOption.<<MySome>>(1)
+       |""".stripMargin,
+  )
+
+  check(
+    "enum-cases2".tag(IgnoreScala2),
+    """|enum MyOption:
+       |  case <<My@@Some>>[U](value: U)
+       |  case MyNone
+       |
+       |val alpha = MyOption.<<MySome>>(1)
+       |""".stripMargin,
+  )
+
 }