Be even less precise about renaming with imports

Renaming a symbol that has been import-renamed will now rename all
occurrences of that symbol with the new name in the whole file,
regardless of scope.

Author: Duhemm

compiler/src/dotty/tools/dotc/interactive/Interactive.scala

@@ -675,36 +675,10 @@ object Interactive {
    * @return All the references to the symbol under the cursor that are using `toName`.
    */
   def findTreesMatchingRenaming(toName: Name,
-                                enclosing: Option[Tree],
                                 syms: List[Symbol],
-                                allTrees: List[Tree],
-                                source: SourceFile
+                                trees: List[SourceTree]
                                )(implicit ctx: Context): List[SourceNamedTree] = {
 
-    val trees = {
-      val enclosedTrees = enclosing match {
-        case Some(pkg: PackageDef) =>
-          pkg.stats
-        case Some(template: Template) =>
-          template.body
-        case Some(block: Block) =>
-          block.expr :: block.stats
-        case _ =>
-          // No enclosing tree; we'll search in the whole file.
-          allTrees
-      }
-
-      // Some of these trees may not be `NameTrees`. Those that are not are wrapped in a
-      // synthetic val def, so that everything can go inside `SourceNamedTree`s.
-      enclosedTrees.map {
-        case tree: NameTree =>
-          SourceNamedTree(tree, source)
-        case tree =>
-          val valDef = tpd.SyntheticValDef(NameKinds.UniqueName.fresh(), tree)
-          SourceNamedTree(valDef, source)
-      }
-    }
-
     val includes =
       Include.references | Include.imports | Include.renamingImports
 

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -358,24 +358,11 @@ class DottyLanguageServer extends LanguageServer
       path match {
         // Selected a renaming in an import node
         case Thicket(_ :: (rename: Ident) :: Nil) :: (_: Import) :: rest if rename.pos.contains(pos.pos) =>
-          val allTrees = uriTrees.map(_.tree)
-          val source = uriTrees.head.source
-          Interactive.findTreesMatchingRenaming(rename.name, rest.headOption, syms, allTrees, source)
+          Interactive.findTreesMatchingRenaming(rename.name, syms, uriTrees)
 
         // Selected a reference that has been renamed
         case (nameTree: NameTree) :: rest if Interactive.isRenamed(nameTree) =>
-          val enclosing = rest.find {
-            // If we selected one of the parents or the selftype of this Template for doing the
-            // renaming, then this Template cannot immediately enclose the rename we're interesting
-            // in (the renaming happening inside its body cannot be used on the parents or selftype).
-            case template: Template if template.parents.exists(_.pos.contains(pos.pos)) || template.self.pos.contains(pos.pos) =>
-              false
-            case tree =>
-              Interactive.immediatelyEnclosesRenaming(nameTree.name, tree)
-          }
-          val allTrees = uriTrees.map(_.tree)
-          val source = uriTrees.head.source
-          Interactive.findTreesMatchingRenaming(nameTree.name, enclosing, syms, allTrees, source)
+          Interactive.findTreesMatchingRenaming(nameTree.name, syms, uriTrees)
 
         case _ =>
           val includes =

language-server/test/dotty/tools/languageserver/RenameTest.scala

@@ -132,22 +132,22 @@ class RenameTest {
     testRename(m5, Set(m1 to m2, m3 to m4, m5 to m6, m13 to m14))
     testRename(m6, Set(m1 to m2, m3 to m4, m5 to m6, m13 to m14))
 
-    testRename(m7, Set(m7 to m8, m9 to m10, m11 to m12))
-    testRename(m8, Set(m7 to m8, m9 to m10, m11 to m12))
-    testRename(m9, Set(m7 to m8, m9 to m10, m11 to m12))
-    testRename(m10, Set(m7 to m8, m9 to m10, m11 to m12))
-    testRename(m11, Set(m7 to m8, m9 to m10, m11 to m12))
-    testRename(m12, Set(m7 to m8, m9 to m10, m11 to m12))
+    testRename(m7, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m8, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m9, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m10, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m11, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m12, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
 
     testRename(m13, Set(m1 to m2, m3 to m4, m5 to m6, m13 to m14))
     testRename(m14, Set(m1 to m2, m3 to m4, m5 to m6, m13 to m14))
 
-    testRename(m15, Set(m15 to m16, m17 to m18, m19 to m20))
-    testRename(m16, Set(m15 to m16, m17 to m18, m19 to m20))
-    testRename(m17, Set(m15 to m16, m17 to m18, m19 to m20))
-    testRename(m18, Set(m15 to m16, m17 to m18, m19 to m20))
-    testRename(m19, Set(m15 to m16, m17 to m18, m19 to m20))
-    testRename(m20, Set(m15 to m16, m17 to m18, m19 to m20))
+    testRename(m15, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m16, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m17, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m18, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m19, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
+    testRename(m20, Set(m7 to m8, m9 to m10, m11 to m12, m15 to m16, m17 to m18, m19 to m20))
 
   }
 
@@ -176,20 +176,20 @@ class RenameTest {
 
     testRename(m1, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
     testRename(m2, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
-    testRename(m3, Set(m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
-    testRename(m4, Set(m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
-    testRename(m5, Set(m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
-    testRename(m6, Set(m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
-    testRename(m7, Set(m7 to m8))
-    testRename(m8, Set(m7 to m8))
-    testRename(m9, Set(m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
-    testRename(m10, Set(m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
-    testRename(m11, Set(m11 to m12, m13 to m14))
-    testRename(m12, Set(m11 to m12, m13 to m14))
-    testRename(m13, Set(m11 to m12, m13 to m14))
-    testRename(m14, Set(m11 to m12, m13 to m14))
-    testRename(m15, Set(m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
-    testRename(m16, Set(m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m3, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m4, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m5, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m6, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m7, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m8, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m9, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m10, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m11, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m12, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m13, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m14, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m15, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
+    testRename(m16, Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8, m9 to m10, m11 to m12, m13 to m14, m15 to m16))
   }
 
   @Test def renameImportWithRenaming: Unit = {