improvement: Always find all references

I think we did it previously on purpose, but it seems it's mostly just confusing to users. Fixes #6776
scalameta · Oct 31, 2024 · e3812b3 · e3812b3
1 parent bcba920
commit e3812b3
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/ReferenceProvider.scala b/metals/src/main/scala/scala/meta/internal/metals/ReferenceProvider.scala
@@ -371,7 +371,6 @@ final class ReferenceProvider(
 
         def candidates(check: SymbolInformation => Boolean) = for {
           info <- definitionDoc.symbols
-          if info.symbol != name
           if check(info)
         } yield info.symbol
 
@@ -384,6 +383,7 @@ final class ReferenceProvider(
             candidates { info =>
               alternatives.isVarSetter(info) ||
               alternatives.isCompanionObject(info) ||
+              alternatives.isCompanionClass(info) ||
               alternatives.isCopyOrApplyParam(info) ||
               alternatives.isContructorParam(info)
             }.toSet
@@ -408,9 +408,9 @@ final class ReferenceProvider(
         if (defPath.isJava)
           isCandidate
         else if (isSyntheticSymbol)
-          isCandidate -- nonSyntheticSymbols ++ additionalAlternativesForSynthetic
+          isCandidate ++ additionalAlternativesForSynthetic
         else
-          isCandidate -- nonSyntheticSymbols
+          isCandidate
       case None => Set.empty
     }
   }

diff --git a/tests/unit/src/test/scala/tests/ReferenceLspSuite.scala b/tests/unit/src/test/scala/tests/ReferenceLspSuite.scala
@@ -84,6 +84,38 @@ class ReferenceLspSuite extends BaseRangesSuite("reference") {
        |""".stripMargin,
   )
 
+  check(
+    "companion-object",
+    """|/Main.scala
+       |case class <<Rend@@erTile>>(
+       |    lowBits: Int,
+       |    highBits: Int,
+       |    // 2 bits
+       |    attrBits: Int
+       |)
+       |
+       |object <<RenderTile>>{
+       |  val zero = <<RenderTile>>(0, 0, 0)
+       |}
+       |""".stripMargin,
+  )
+
+  check(
+    "companion-class",
+    """|/Main.scala
+       |case class <<RenderTile>>(
+       |    lowBits: Int,
+       |    highBits: Int,
+       |    // 2 bits
+       |    attrBits: Int
+       |)
+       |
+       |object <<Rende@@rTile>>{
+       |  val zero = <<RenderTile>>(0, 0, 0)
+       |}
+       |""".stripMargin,
+  )
+
   test("synthetic") {
     cleanWorkspace()
     for {