Be less precise about renaming and imports

 This commit makes the renaming less precise for the (probably rare)
 case of an imports being imported multiple times with the same
 renaming.

 When doing a renaming of a symbol that is import-renamed, we would
 exclude subscope where the same symbol was imported again with the same
 name. This commit changes the logic so that we no longer exclude those
 subscope, and keep renaming.

 See RenameTest#renameRenamingImportNested for an example where the
 langauge server will now behave differently.

Author: Duhemm

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

@@ -681,28 +681,6 @@ object Interactive {
                                 source: SourceFile
                                )(implicit ctx: Context): List[SourceNamedTree] = {
 
-    /**
-     * Remove the blocks that immediately enclose a renaming to `toName` in `inTree`.
-     *
-     * @param toName The target name of renamings.
-     * @param inTree The tree in which to remove the blocks that have such a renaming.
-     * @return A tree that has no children containing a renaming to `toName`.
-     */
-    def removeBlockWithRenaming(toName: Name, inTree: Tree): Tree = {
-      new TreeMap {
-        override def transform(tree: Tree)(implicit ctx: Context): Tree = tree match {
-          case pkg: PackageDef if immediatelyEnclosesRenaming(toName, pkg) =>
-            EmptyTree
-          case template: Template if immediatelyEnclosesRenaming(toName, template) =>
-            cpy.Template(template)(constr = DefDef(template.constr.symbol.asTerm), body = Nil)
-          case block @ Block(stats, expr) if immediatelyEnclosesRenaming(toName, block) =>
-            EmptyTree
-          case other =>
-            super.transform(other)
-        }
-      }.transform(inTree)
-    }
-
     val trees = {
       val enclosedTrees = enclosing match {
         case Some(pkg: PackageDef) =>
@@ -716,13 +694,9 @@ object Interactive {
           allTrees
       }
 
-      // These trees may contain a new renaming of the same symbol to the same name, so we may
-      // have to cut some branches
-      val trimmedTrees = enclosedTrees.map(removeBlockWithRenaming(toName, _))
-
       // 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.
-      trimmedTrees.map {
+      enclosedTrees.map {
         case tree: NameTree =>
           SourceNamedTree(tree, source)
         case tree =>

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

@@ -174,22 +174,22 @@ class RenameTest {
     def testRename(m: CodeMarker, expectations: Set[CodeRange]) =
       sources.rename(m, "NewName", expectations)
 
-    testRename(m1, Set(m1 to m2))
-    testRename(m2, Set(m1 to m2))
-    testRename(m3, Set(m3 to m4, m5 to m6, m9 to m10, m15 to m16))
-    testRename(m4, Set(m3 to m4, m5 to m6, m9 to m10, m15 to m16))
-    testRename(m5, Set(m3 to m4, m5 to m6, m9 to m10, m15 to m16))
-    testRename(m6, Set(m3 to m4, m5 to m6, m9 to m10, m15 to m16))
+    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, m9 to m10, m15 to m16))
-    testRename(m10, Set(m3 to m4, m5 to m6, m9 to m10, m15 to m16))
+    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, m9 to m10, m15 to m16))
-    testRename(m16, Set(m3 to m4, m5 to m6, m9 to m10, m15 to m16))
+    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))
   }
 
   @Test def renameImportWithRenaming: Unit = {