bugfix: highlight enum cases correctly (#18362)

backport from metals: https://github.com/scalameta/metals/pull/5529/files CC: @tgodzik
scala · Aug 9, 2023 · 5fc691a · 5fc691a
2 parents 5383ff6 + aca2503
commit 5fc691a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala b/presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
@@ -194,6 +194,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/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/highlight/DocumentHighlightSuite.scala
@@ -998,3 +998,23 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite:
          |    def double2(ys: List[EF]) = <<xs>> ++ ys
          |end extension""".stripMargin
     )
+
+  @Test def `enum-cases` =
+    check(
+      """|enum MyOption:
+         |  case <<My@@Some>>(value: Int)
+         |  case MyNone
+         |
+         |val alpha = MyOption.<<MySome>>(1)
+         |""".stripMargin
+    )
+
+  @Test def `enum-cases2` =
+    check(
+      """|enum MyOption:
+         |  case <<My@@Some>>[U](value: U)
+         |  case MyNone
+         |
+         |val alpha = MyOption.<<MySome>>(1)
+         |""".stripMargin,
+    )