Improve presentation compiler fixes

Author: HarrisL2

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -483,6 +483,7 @@ private sealed trait YSettings:
   val YexplainLowlevel: Setting[Boolean] = BooleanSetting(ForkSetting, "Yexplain-lowlevel", "When explaining type errors, show types at a lower level.")
   val YnoDoubleBindings: Setting[Boolean] = BooleanSetting(ForkSetting, "Yno-double-bindings", "Assert no namedtype is bound twice (should be enabled only if program is error-free).")
   val YshowVarBounds: Setting[Boolean] = BooleanSetting(ForkSetting, "Yshow-var-bounds", "Print type variables with their bounds.")
+  val YhideFlexibleTypes: Setting[Boolean] = BooleanSetting(ForkSetting, "Yhide-flexible-types", "Print flexible types as their base type. (T instead of (T)?)")
 
   val Yinstrument: Setting[Boolean] = BooleanSetting(ForkSetting, "Yinstrument", "Add instrumentation code that counts allocations and closure creations.")
   val YinstrumentDefs: Setting[Boolean] = BooleanSetting(ForkSetting, "Yinstrument-defs", "Add instrumentation code that counts method calls; needs -Yinstrument to be set, too.")

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

@@ -336,7 +336,10 @@ class PlainPrinter(_ctx: Context) extends Printer {
           case _ =>
             toTextLocal(tpe) ~ " " ~ toText(annot)
       case FlexibleType(_, tpe) =>
-        "(" ~ toText(tpe) ~ ")?"
+        if (ctx.settings.YhideFlexibleTypes.value) then
+          toText(tpe)
+        else
+          "(" ~ toText(tpe) ~ ")?"
       case tp: TypeVar =>
         def toTextCaret(tp: Type) = if printDebug then toTextLocal(tp) ~ Str("^") else toText(tp)
         if (tp.isInstantiated)

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

@@ -68,7 +68,11 @@ final class InferredMethodProvider(
       Interactive.pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)
 
     given locatedCtx: Context = driver.localContext(params)
-    val indexedCtx = IndexedContext(pos)(using locatedCtx)
+    val locatedCtx2 = locatedCtx.fresh.setSettings(ctx.settings.YhideFlexibleTypes.updateIn(
+      ctx.settingsState.reinitializedCopy(),
+      true
+    ))
+    val indexedCtx = IndexedContext(pos)(using locatedCtx2)
 
     val autoImportsGen = AutoImports.generator(
       pos,

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

@@ -75,7 +75,11 @@ final class InferredTypeProvider(
       Interactive.pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)
 
     given locatedCtx: Context = driver.localContext(params)
-    val indexedCtx = IndexedContext(pos)(using locatedCtx)
+    val locatedCtx2 = locatedCtx.fresh.setSettings(ctx.settings.YhideFlexibleTypes.updateIn(
+      ctx.settingsState.reinitializedCopy(),
+      true
+    ))
+    val indexedCtx = IndexedContext(pos)(using locatedCtx2)
     val autoImportsGen = AutoImports.generator(
       pos,
       sourceText,

presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala

@@ -82,6 +82,7 @@ class CompletionProvider(
       case Some(unit) =>
         val newctx = ctx.fresh
           .setCompilationUnit(unit)
+          .setSettings(ctx.settings.YhideFlexibleTypes.updateIn(ctx.settingsState.reinitializedCopy(), true))
           .setProfiler(Profiler()(using ctx))
           .withPhase(Phases.typerPhase(using ctx))
         val tpdPath0 = Interactive.pathTo(unit.tpdTree, pos.span)(using newctx)

presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionDocSuite.scala

@@ -62,8 +62,8 @@ class CompletionDocSuite extends BaseCompletionSuite:
         |  "".substrin@@
         |}
       """.stripMargin,
-      """|substring(beginIndex: Int): (String)?
-         |substring(beginIndex: Int, endIndex: Int): (String)?
+      """|substring(beginIndex: Int): String
+         |substring(beginIndex: Int, endIndex: Int): String
          |""".stripMargin
     )
 
@@ -74,7 +74,7 @@ class CompletionDocSuite extends BaseCompletionSuite:
         |  String.join@@
         |}
       """.stripMargin,
-      """|join(delimiter: (CharSequence)?, elements: ((CharSequence)?*)?): (String)?
+      """|join(delimiter: CharSequence, elements: CharSequence*): String
          |""".stripMargin,
       topLines = Some(1)
     )
@@ -89,7 +89,7 @@ class CompletionDocSuite extends BaseCompletionSuite:
         |  }
         |}
       """.stripMargin,
-      """|setValue(value: (Int)?): (Int)?
+      """|setValue(value: Int): Int
          |""".stripMargin
     )
 
@@ -100,7 +100,7 @@ class CompletionDocSuite extends BaseCompletionSuite:
         |  java.util.Collections.singletonLis@@
         |}
       """.stripMargin,
-      """|singletonList[T](o: (T)?): (java.util.List[T])?
+      """|singletonList[T](o: T): java.util.List[T]
          |""".stripMargin
     )
 

presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionOverrideSuite.scala

@@ -133,7 +133,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite:
          |
          |object Main {
          |  new java.nio.file.SimpleFileVisitor[java.nio.file.Path] {
-         |    override def visitFile(file: (Path)?, attrs: (BasicFileAttributes)?): (FileVisitResult)? = ${0:???}
+         |    override def visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult = ${0:???}
          |  }
          |}
          |""".stripMargin,

presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala

@@ -469,7 +469,7 @@ class CompletionSuite extends BaseCompletionSuite:
         |  new java.util.ArrayList[String]().forEach(p => p.toChar@@)
         |}
       """.stripMargin,
-      """|toCharArray(): (Array[Char])?
+      """|toCharArray(): Array[Char]
          |""".stripMargin
     )
 
@@ -505,8 +505,8 @@ class CompletionSuite extends BaseCompletionSuite:
         |  java.nio.file.Files.readAttributes@@
         |}
       """.stripMargin,
-      """|readAttributes(path: (Path)?, attributes: (String)?, options: ((LinkOption)?*)?): (java.util.Map[String, Object])?
-         |readAttributes[A <: BasicFileAttributes](path: (Path)?, type: (Class[A])?, options: ((LinkOption)?*)?): (A)?
+      """|readAttributes(path: Path, attributes: String, options: LinkOption*): java.util.Map[String, Object]
+         |readAttributes[A <: BasicFileAttributes](path: Path, type: Class[A], options: LinkOption*): A
          |""".stripMargin
     )
 
@@ -841,8 +841,8 @@ class CompletionSuite extends BaseCompletionSuite:
           |  "".substring@@
           |}
           |""".stripMargin,
-      """substring(beginIndex: Int): (String)?
-        |substring(beginIndex: Int, endIndex: Int): (String)?
+      """substring(beginIndex: Int): String
+        |substring(beginIndex: Int, endIndex: Int): String
         |""".stripMargin,
       filterText = "substring"
     )

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

@@ -220,7 +220,7 @@ class InsertInferredMethodSuite extends BaseCodeActionSuite:
        |  def main() = {
        |    def method1(s : String) = 123
        |      val path = Files.createTempDirectory("")
-       |      def otherMethod(arg0: (Path)?): String = ???
+       |      def otherMethod(arg0: Path): String = ???
        |      method1(otherMethod(path))
        |    }
        |}
@@ -550,7 +550,7 @@ class InsertInferredMethodSuite extends BaseCodeActionSuite:
          |
          |object Main:
          |  val p = Paths.get("test")
-         |  extension (x: (Path)?)
+         |  extension (x: Path)
          |    def newMethod = ???
          |  p.newMethod
          |""".stripMargin

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

@@ -467,7 +467,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite:
          |    object inner {
          |      val nio: java.nio.file.Path = path
          |      object inner {
-         |        val java: (_root_.java.nio.file.Path)? = path
+         |        val java: _root_.java.nio.file.Path = path
          |      }
          |    }
          |  }