Address review comments

Author: Duhemm

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

@@ -624,7 +624,7 @@ object Interactive {
 
   /** Are the two names the same? */
   def sameName(n0: Name, n1: Name): Boolean = {
-    n0.stripModuleClassSuffix.toString == n1.stripModuleClassSuffix.toString
+    n0.stripModuleClassSuffix.toTermName eq n1.stripModuleClassSuffix.toTermName
   }
 
   /**
@@ -640,13 +640,11 @@ object Interactive {
       tree match {
         case Import(_, selectors) =>
           selectors.exists {
-            case Thicket(_ :: Ident(rename) :: Nil) =>
-              rename.stripModuleClassSuffix.toString == toName.stripModuleClassSuffix.toString
-            case _ =>
-              false
+            case Thicket(_ :: Ident(rename) :: Nil) => sameName(rename, toName)
+            case _ => false
           }
-            case _ =>
-              false
+        case _ =>
+          false
       }
     }
 
@@ -696,7 +694,7 @@ object Interactive {
           case pkg: PackageDef if immediatelyEnclosesRenaming(toName, pkg) =>
             EmptyTree
           case template: Template if immediatelyEnclosesRenaming(toName, template) =>
-            cpy.Template(template)(constr = DefDef(template.constr.symbol.asTerm), self = template.self, body = Nil)
+            cpy.Template(template)(constr = DefDef(template.constr.symbol.asTerm), body = Nil)
           case block @ Block(stats, expr) if immediatelyEnclosesRenaming(toName, block) =>
             EmptyTree
           case other =>
@@ -706,7 +704,7 @@ object Interactive {
     }
 
     val trees = {
-      val trees = enclosing match {
+      val enclosedTrees = enclosing match {
         case Some(pkg: PackageDef) =>
           pkg.stats
         case Some(template: Template) =>
@@ -720,7 +718,7 @@ object Interactive {
 
       // 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 = trees.map(removeBlockWithRenaming(toName, _))
+      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.

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

@@ -192,4 +192,27 @@ class RenameTest {
     testRename(m16, Set(m3 to m4, m5 to m6, m9 to m10, m15 to m16))
   }
 
+  @Test def renameImportWithRenaming: Unit = {
+    def testRename(m: CodeMarker) =
+      withSources(
+        code"""object A { class ${m1}C${m2} }""",
+        code"""import A.${m3}C${m4}
+               object O {
+                 class B extends ${m5}C${m6} {
+                   import A.{${m7}C${m8} => Renamed}
+                   def foo = new Renamed
+                 }
+               }"""
+      ).rename(m, "NewName", Set(m1 to m2, m3 to m4, m5 to m6, m7 to m8))
+
+    testRename(m1)
+    testRename(m2)
+    testRename(m3)
+    testRename(m4)
+    testRename(m5)
+    testRename(m6)
+    testRename(m7)
+    testRename(m8)
+  }
+
 }