add test for rename with un-compiled build target

scalameta · Mar 26, 2024 · 363234b · 363234b
1 parent 8db6722
commit 363234b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 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
@@ -361,10 +361,8 @@ final class ReferenceProvider(
       input = Input.String(text)
       pos <- position.toMeta(input)
       tree <- trees.get(path)
-      token <- tree.tokens.find { t => t.pos.encloses(pos) }
-      ident <- token match {
-        case _: Ident => Some(token)
-        case _ => None
+      ident <- tree.tokens.collectFirst {
+        case t: Ident if t.pos.encloses(pos) => t
       }
     } yield ident.text
 

diff --git a/tests/unit/src/test/scala/tests/RenameLspSuite.scala b/tests/unit/src/test/scala/tests/RenameLspSuite.scala
@@ -894,6 +894,34 @@ class RenameLspSuite extends BaseRenameLspSuite(s"rename") {
     expectedError = true,
   )
 
+  renamed(
+    "renames-in-related-build-targets",
+    """|/a/src/main/scala/a/Main.scala
+       |package a
+       |trait <<@@A>>
+       |/a/src/main/scala/a/B.scala
+       |package a
+       |trait B extends <<A>>
+       |/b/src/main/scala/b/B.scala
+       |package b
+       |import a.A
+       |trait B extends <<A>>
+       |""".stripMargin,
+    metalsJson = Some(
+      s"""|{
+          |  "a" : {
+          |    "scalaVersion": "${BuildInfo.scalaVersion}"
+          |  },
+          |  "b" : {
+          |    "scalaVersion": "${BuildInfo.scalaVersion}",
+          |    "dependsOn": ["a"]
+          |  }
+          |}""".stripMargin
+    ),
+    newName = "C",
+    nonOpened = Set("b/src/main/scala/b/B.scala"),
+  )
+
   override protected def libraryDependencies: List[String] =
     List("org.scalatest::scalatest:3.2.12", "io.circe::circe-generic:0.14.1")