From d97fd1f11d89130283e2b7d6f14da2402378fd85 Mon Sep 17 00:00:00 2001
From: Jakub Ciesluk <323892@uwr.edu.pl>
Date: Mon, 19 Jun 2023 12:56:29 +0200
Subject: [PATCH] fix: Highlight for named arguments in Scala 2

Previously, we were incorrectly highlighting all named arguments for case class
---
 .../scala/meta/internal/pc/PcCollector.scala  |  1 +
 .../highlight/DocumentHighlightSuite.scala    | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/mtags/src/main/scala-2/scala/meta/internal/pc/PcCollector.scala b/mtags/src/main/scala-2/scala/meta/internal/pc/PcCollector.scala
index a655642c7fb..80c35182739 100644
--- a/mtags/src/main/scala-2/scala/meta/internal/pc/PcCollector.scala
+++ b/mtags/src/main/scala-2/scala/meta/internal/pc/PcCollector.scala
@@ -149,6 +149,7 @@ abstract class PcCollector[T](
                   .filter(_.isConstructor)
                   .flatMap(_.paramss)
                   .flatten
+                  .filter(_.name == id.name)
                   .toSet
                 (
                   (constructorParams ++ Set(
diff --git a/tests/cross/src/test/scala/tests/highlight/DocumentHighlightSuite.scala b/tests/cross/src/test/scala/tests/highlight/DocumentHighlightSuite.scala
index 08c3dfe058e..6a15d995da3 100644
--- a/tests/cross/src/test/scala/tests/highlight/DocumentHighlightSuite.scala
+++ b/tests/cross/src/test/scala/tests/highlight/DocumentHighlightSuite.scala
@@ -51,6 +51,34 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |}""".stripMargin,
   )
 
+  check(
+    "named-arg",
+    """
+      |case class Foo(foo: Int, <<bar>>: Int)
+      |object Main {
+      |  val x = Foo(
+      |    foo = 123,
+      |    <<ba@@r>> = 456
+      |  ) 
+      |
+      |}""".stripMargin,
+  )
+
+  check(
+    "named-arg1",
+    """
+      |case class Foo(<<foo>>: Int, bar: Int)
+      |object Main {
+      |  val x = Foo(
+      |    <<fo@@o>> = 123,
+      |    bar = 456
+      |  )
+      |  val y = x.<<foo>>
+      |  
+      |
+      |}""".stripMargin,
+  )
+
   check(
     "scopes",
     """