bugfix: Fix enumeration issues when Value is imported

This is still not a perfect fix, since we add the full prefix, but that's the current status quo. Making prefixes shorter is something we need to work on separately.

Author: tgodzik

presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala

@@ -136,7 +136,6 @@ final class InferredTypeProvider(
             findNamePos(sourceText, vl, keywordOffset).endPos.toLsp
           adjustOpt.foreach(adjust => endPos.setEnd(adjust.adjustedEndPos))
           val spaceBefore = name.isOperatorName
-
           new TextEdit(
             endPos,
             printTypeAscription(optDealias(tpt.typeOpt), spaceBefore) + {

presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala

@@ -174,7 +174,6 @@ class ShortenedTypePrinter(
         res.toPrefixText
     }
 
-
   override def toTextPrefixOf(tp: NamedType): Text = controlled {
     val maybeRenamedPrefix: Option[Text] = findRename(tp)
     def trimmedPrefix: Text =
@@ -188,7 +187,7 @@ class ShortenedTypePrinter(
               missingImports += ImportSel.Direct(tp.symbol)
               Text()
           // the symbol is in scope, we can omit the prefix
-          case Result.InScope => Text()
+          case Result.InScope if !isPathDependent(tp) => Text()
           // the symbol is in conflict, we have to include prefix to avoid ambiguity
           case Result.Conflict =>
             maybeRenamedPrefix.getOrElse(super.toTextPrefixOf(tp))
@@ -197,6 +196,13 @@ class ShortenedTypePrinter(
     optionalRootPrefix(tp.symbol) ~ maybeRenamedPrefix.getOrElse(trimmedPrefix)
   }
 
+  /* If the owner is different from the type symbol, it means that the type is defined in a parent*/
+  private def isPathDependent(tp: NamedType) = tp match {
+    case TypeRef(tt @ ThisType(_), _)  =>
+      tp.symbol.isClass && tt.typeSymbol != NoSymbol && tp.symbol.owner != tt.typeSymbol
+    case _ => false
+  }
+
   override protected def selectionString(tp: NamedType): String =
     indexedCtx.rename(tp.symbol) match
       case Some(value) =>

presentation-compiler/test/dotty/tools/pc/tests/edit/InsertInferredTypeSuite.scala

@@ -990,6 +990,72 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite:
          |""".stripMargin
     )
 
+  @Test def `enums` =
+    checkEdit(
+      """|object EnumerationValue:
+         |  object Day extends Enumeration {
+         |    type Day = Value
+         |    val Weekday, Weekend = Value
+         |  }
+         |  object Bool extends Enumeration {
+         |    type Bool = Value
+         |    val True, False = Value
+         |  }
+         |  import Bool._
+         |  def day(d: Day.Value): Unit = ???
+         |  val <<d>> =
+         |    if (true) Day.Weekday
+         |    else Day.Weekend
+         |""".stripMargin,
+      """|object EnumerationValue:
+         |  object Day extends Enumeration {
+         |    type Day = Value
+         |    val Weekday, Weekend = Value
+         |  }
+         |  object Bool extends Enumeration {
+         |    type Bool = Value
+         |    val True, False = Value
+         |  }
+         |  import Bool._
+         |  def day(d: Day.Value): Unit = ???
+         |  val d: EnumerationValue.Day.Value =
+         |    if (true) Day.Weekday
+         |    else Day.Weekend
+         |""".stripMargin
+    )
+
+  @Test def `enums2` =
+    checkEdit(
+      """|object EnumerationValue:
+         |  object Day extends Enumeration {
+         |    type Day = Value
+         |    val Weekday, Weekend = Value
+         |  }
+         |  object Bool extends Enumeration {
+         |    type Bool = Value
+         |    val True, False = Value
+         |  }
+         |  import Bool._
+         |  val <<b>> =
+         |    if (true) True
+         |    else False
+         |""".stripMargin,
+      """|object EnumerationValue:
+         |  object Day extends Enumeration {
+         |    type Day = Value
+         |    val Weekday, Weekend = Value
+         |  }
+         |  object Bool extends Enumeration {
+         |    type Bool = Value
+         |    val True, False = Value
+         |  }
+         |  import Bool._
+         |  val b: EnumerationValue.Bool.Value =
+         |    if (true) True
+         |    else False
+         |""".stripMargin
+    )
+
   def checkEdit(
       original: String,
       expected: String