Improve renaming with overridden symbols

When renaming a symbol that overrides other symbols, the overridden
symbols and all their overrides will be renamed too.

Author: Duhemm

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

@@ -353,7 +353,9 @@ class DottyLanguageServer extends LanguageServer
     val uriTrees = driver.openedTrees(uri)
     val pos = sourcePosition(driver, uri, params.getPosition)
     val path = Interactive.pathTo(uriTrees, pos)
-    val syms = Interactive.enclosingSourceSymbols(path, pos)
+    val syms = Interactive.enclosingSourceSymbols(path, pos).flatMap { sym =>
+      sym :: sym.allOverriddenSymbols.toList
+    }
     val newName = params.getNewName
 
     def findRenamedReferences(trees: List[SourceTree], syms: List[Symbol], withName: Name): List[SourceTree] = {
@@ -374,10 +376,13 @@ class DottyLanguageServer extends LanguageServer
           findRenamedReferences(uriTrees, syms, nameTree.name)
 
         case _ =>
-          val includes = Include.all.except(Include.overridden)
+          val names = syms.map(_.name.sourceModuleName).toSet
+          val trees = names.flatMap(name => driver.allTreesContaining(name.toString)).toList
           syms.flatMap { sym =>
-            val trees = driver.allTreesContaining(sym.name.sourceModuleName.toString)
-            Interactive.findTreesMatching(trees, includes, sym, t => Interactive.sameName(t.name, sym.name))
+            Interactive.findTreesMatching(trees,
+                                          Include.all,
+                                          sym,
+                                          t => names.exists(Interactive.sameName(t.name, _)))
           }
       }
 

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

@@ -215,4 +215,23 @@ class RenameTest {
     testRename(m8)
   }
 
+  @Test def renameOverridden: Unit = {
+    def testRename(m: CodeMarker) =
+      withSources(
+        code"""class A { def ${m1}foo${m2}: Int = 0 }
+               class B extends A { override def ${m3}foo${m4}: Int = 1 }
+               class C extends A { override def ${m5}foo${m6}: Int = 2 }"""
+      ).rename(m, "NewName", Set(m1 to m2, m3 to m4, m5 to m6))
+
+    testRename(m1)
+    testRename(m2)
+    testRename(m3)
+    testRename(m4)
+    testRename(m5)
+    testRename(m6)
+
+  }
+
+
+
 }