If there is an import selection for an indent, attach the original name

Author: noti0na1

compiler/src/dotty/tools/dotc/transform/CheckUnused.scala

@@ -96,7 +96,8 @@ class CheckUnused private (phaseMode: CheckUnused.PhaseMode, suffix: String, _ke
       ctx
 
   override def prepareForSelect(tree: tpd.Select)(using Context): Context =
-    unusedDataApply(_.registerUsed(tree.symbol, Some(tree.name)))
+    val name = tree.getAttachment(OriginalName).orElse(Some(tree.name))
+    unusedDataApply(_.registerUsed(tree.symbol, name))
 
   override def prepareForBlock(tree: tpd.Block)(using Context): Context =
     pushInBlockTemplatePackageDef(tree)
@@ -327,6 +328,8 @@ object CheckUnused:
    */
   private val _key = Property.StickyKey[UnusedData]
 
+  val OriginalName = Property.StickyKey[Name]
+
   class PostTyper extends CheckUnused(PhaseMode.Aggregate, "PostTyper", _key)
 
   class PostInlining extends CheckUnused(PhaseMode.Report, "PostInlining", _key)

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -51,6 +51,7 @@ import NullOpsDecorator.*
 import cc.{CheckCaptures, isRetainsLike}
 import config.Config
 import config.MigrationVersion
+import transform.CheckUnused.OriginalName
 
 import scala.annotation.constructorOnly
 
@@ -629,7 +630,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
       val checkedType = checkNotShadowed(ownType)
       val tree1 = checkedType match
         case checkedType: NamedType if !prefixIsElidable(checkedType) =>
-          ref(checkedType).withSpan(tree.span)
+          ref(checkedType).withSpan(tree.span).withAttachment(OriginalName, name)
         case _ =>
           def isScalaModuleRef = checkedType match
             case moduleRef: TypeRef if moduleRef.symbol.is(ModuleClass, butNot = JavaDefined) => true