Omit more prefixes in non-package module printing (#17758)

nicolasstucki · web-flow · commit 2712b40ecb5d · 2023-06-06T09:27:38.000+02:00
When we pretty-print a type in a module class, we end up printing the
module class's symbol.  For instance in a reduction failure of
Tuple.Union, we end up printing Tuple.Fold, with Tuple being an internal
(ThisType) reference to the Tuple module class.  I tweaked the logic in
fullNameString so that we omit more prefixes, if the module is
non-package (and make it consistent across -Ytest-pickler).  The package
part is important, because we want to continue to get "import
scala.concurrent.duration..." instead of "import concurrent.duration..".
diff --git a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala
@@ -92,7 +92,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     nameString(if (ctx.property(XprintMode).isEmpty) sym.initial.name else sym.name)
 
   override def fullNameString(sym: Symbol): String =
-    if !sym.exists || isEmptyPrefix(sym.effectiveOwner) then nameString(sym)
+    if !sym.exists
+      || isEmptyPrefix(sym.effectiveOwner)
+      || !homogenizedView && !sym.is(Package) && isOmittablePrefix(sym.effectiveOwner)
+    then nameString(sym)
     else super.fullNameString(sym)
 
   override protected def fullNameOwner(sym: Symbol): Symbol = {
@@ -106,6 +109,9 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         if (tp.cls.isAnonymousClass) keywordStr("this")
         if (tp.cls.is(ModuleClass)) fullNameString(tp.cls.sourceModule)
         else super.toTextRef(tp)
+      case tp: TermRef if !printDebug =>
+        if tp.symbol.is(Package) then fullNameString(tp.symbol)
+        else super.toTextRef(tp)
       case _ =>
         super.toTextRef(tp)
     }
diff --git a/compiler/test-resources/repl-macros/i15104c b/compiler/test-resources/repl-macros/i15104c
@@ -1,6 +1,6 @@
 scala> import scala.quoted._
 scala> def macroImpl(using Quotes) = Expr(1)
-def macroImpl(using x$1: quoted.Quotes): quoted.Expr[Int]
+def macroImpl(using x$1: scala.quoted.Quotes): scala.quoted.Expr[Int]
 scala> inline def foo = ${ macroImpl }
 def foo: Int
 scala> foo
diff --git a/compiler/test-resources/repl-macros/i5551 b/compiler/test-resources/repl-macros/i5551
@@ -1,7 +1,8 @@
 scala> import scala.quoted._
 scala> def assertImpl(expr: Expr[Boolean])(using q: Quotes) = '{ if !($expr) then throw new AssertionError("failed assertion")}
 def assertImpl
-  (expr: quoted.Expr[Boolean])(using q: quoted.Quotes): scala.quoted.Expr[Unit]
+  (expr: scala.quoted.Expr[Boolean])
+    (using q: scala.quoted.Quotes): scala.quoted.Expr[Unit]
 scala>   inline def assert(expr: => Boolean): Unit =  ${ assertImpl('{expr}) }
 def assert(expr: => Boolean): Unit
 
diff --git a/compiler/test-resources/repl/i10355 b/compiler/test-resources/repl/i10355
@@ -1,7 +1,9 @@
 scala> import scala.quoted._
 scala> def foo(expr: Expr[Any])(using Quotes) = expr match { case '{ $x: t } => '{ $x: Any } }
 def foo
-  (expr: quoted.Expr[Any])(using x$2: quoted.Quotes): scala.quoted.Expr[Any]
+  (expr: scala.quoted.Expr[Any])
+    (using x$2: scala.quoted.Quotes): scala.quoted.Expr[Any]
 scala> def bar(expr: Expr[Any])(using Quotes) = expr match { case '{ $x: t } => '{ val a: t = ??? ; ???} }
 def bar
-  (expr: quoted.Expr[Any])(using x$2: quoted.Quotes): scala.quoted.Expr[Nothing]
+  (expr: scala.quoted.Expr[Any])
+    (using x$2: scala.quoted.Quotes): scala.quoted.Expr[Nothing]
diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala
@@ -32,29 +32,29 @@ class CompletionTest {
 
   @Test def completionFromScalaPackage: Unit = {
     code"class Foo { val foo: Conv${m1} }"
-      .completion(("Conversion", Class, "scala.Conversion"))
+      .completion(("Conversion", Class, "Conversion"))
   }
 
   @Test def completionFromScalaPackageObject: Unit = {
     code"class Foo { val foo: BigD${m1} }"
       .completion(
-        ("BigDecimal", Field, "scala.BigDecimal"),
-        ("BigDecimal", Method, "=> math.BigDecimal.type"),
+        ("BigDecimal", Field, "BigDecimal"),
+        ("BigDecimal", Method, "=> scala.math.BigDecimal.type"),
       )
   }
 
   @Test def completionFromSyntheticPackageObject: Unit = {
     code"class Foo { val foo: IArr${m1} }"
       .completion(
         ("IArray", Module, "IArray"),
-        ("IArray", Field, "scala.IArray"),
+        ("IArray", Field, "IArray"),
       )
   }
 
   @Test def completionFromJavaDefaults: Unit = {
     code"class Foo { val foo: Runn${m1} }"
       .completion(
-        ("Runnable", Class, "java.lang.Runnable"),
+        ("Runnable", Class, "Runnable"),
         ("Runnable", Module, "Runnable"),
       )
   }
@@ -971,7 +971,7 @@ class CompletionTest {
           ("implicitNotFound", Module, "scala.annotation.implicitNotFound"),
       )
       .completion(m2,
-          ("main", Class, "scala.main"),
+          ("main", Class, "main"),
           ("main", Module, "main"),
       )
 
diff --git a/staging/test-resources/repl-staging/i6007 b/staging/test-resources/repl-staging/i6007
@@ -1,9 +1,9 @@
 scala> import scala.quoted._
 scala> import quoted.staging.{Compiler => StagingCompiler, _}
 scala> implicit def compiler: StagingCompiler = StagingCompiler.make(getClass.getClassLoader)
-def compiler: quoted.staging.Compiler
+def compiler: scala.quoted.staging.Compiler
 scala> def v(using Quotes) = '{ (if true then Some(1) else None).map(v => v+1) }
-def v(using x$1: quoted.Quotes): scala.quoted.Expr[Option[Int]]
+def v(using x$1: scala.quoted.Quotes): scala.quoted.Expr[Option[Int]]
 scala> scala.quoted.staging.withQuotes(v.show)
 val res0: String = (if (true) scala.Some.apply[scala.Int](1) else scala.None).map[scala.Int](((v: scala.Int) => v.+(1)))
 scala> scala.quoted.staging.run(v)
diff --git a/staging/test-resources/repl-staging/i6263 b/staging/test-resources/repl-staging/i6263
@@ -1,9 +1,9 @@
 scala> import quoted._
 scala> import quoted.staging.{Compiler => StagingCompiler, _}
 scala> implicit def compiler: StagingCompiler = StagingCompiler.make(getClass.getClassLoader)
-def compiler: quoted.staging.Compiler
+def compiler: scala.quoted.staging.Compiler
 scala> def fn[T : Type](v : T) = println("ok")
-def fn[T](v: T)(implicit evidence$1: quoted.Type[T]): Unit
+def fn[T](v: T)(implicit evidence$1: scala.quoted.Type[T]): Unit
 scala> withQuotes { fn("foo") }
 ok
 scala> withQuotes { fn((1,2)) }
diff --git a/tests/neg-custom-args/captures/cc-this2.check b/tests/neg-custom-args/captures/cc-this2.check
@@ -2,5 +2,5 @@
 -- Error: tests/neg-custom-args/captures/cc-this2/D_2.scala:2:6 --------------------------------------------------------
 2 |class D extends C: // error
   |^
-  |reference (scala.caps.cap : Any) is not included in allowed capture set {} of pure base class class C
+  |reference (caps.cap : Any) is not included in allowed capture set {} of pure base class class C
 3 |  this: D^ =>
diff --git a/tests/neg-custom-args/captures/exception-definitions.check b/tests/neg-custom-args/captures/exception-definitions.check
@@ -1,7 +1,7 @@
 -- Error: tests/neg-custom-args/captures/exception-definitions.scala:2:6 -----------------------------------------------
 2 |class Err extends Exception: // error
   |^
-  |reference (scala.caps.cap : Any) is not included in allowed capture set {} of pure base class class Throwable
+  |reference (caps.cap : Any) is not included in allowed capture set {} of pure base class class Throwable
 3 |  self: Err^ =>
 -- Error: tests/neg-custom-args/captures/exception-definitions.scala:10:6 ----------------------------------------------
 10 |class Err4(c: Any^) extends AnyVal // error
diff --git a/tests/neg-custom-args/explain/i16888.check b/tests/neg-custom-args/explain/i16888.check
@@ -1,7 +1,7 @@
 -- [E172] Type Error: tests/neg-custom-args/explain/i16888.scala:1:38 --------------------------------------------------
 1 |def test = summon[scala.quoted.Quotes] // error
   |                                      ^
-  |               No given instance of type quoted.Quotes was found for parameter x of method summon in object Predef
+  |         No given instance of type scala.quoted.Quotes was found for parameter x of method summon in object Predef
   |---------------------------------------------------------------------------------------------------------------------
   | Explanation (enabled by `-explain`)
   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/tests/neg/i14025.check b/tests/neg/i14025.check
@@ -1,8 +1,8 @@
 -- [E172] Type Error: tests/neg/i14025.scala:1:88 ----------------------------------------------------------------------
 1 |val foo = summon[deriving.Mirror.Product { type MirroredType = [X] =>> [Y] =>> (X, Y) }] // error
   |                                                                                        ^
-  |No given instance of type deriving.Mirror.Product{type MirroredType[X] = [Y] =>> (X, Y)} was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Product{type MirroredType[X] = [Y] =>> (X, Y)}: type `[X] =>> [Y] =>> (X, Y)` is not a generic product because its subpart `[X] =>> [Y] =>> (X, Y)` is not a supported kind (either `*` or `* -> *`)
+  |No given instance of type scala.deriving.Mirror.Product{type MirroredType[X] = [Y] =>> (X, Y)} was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Product{type MirroredType[X] = [Y] =>> (X, Y)}: type `[X] =>> [Y] =>> (X, Y)` is not a generic product because its subpart `[X] =>> [Y] =>> (X, Y)` is not a supported kind (either `*` or `* -> *`)
 -- [E172] Type Error: tests/neg/i14025.scala:2:90 ----------------------------------------------------------------------
 2 |val bar = summon[deriving.Mirror.Sum { type MirroredType = [X] =>> [Y] =>> List[(X, Y)] }] // error
   |                                                                                          ^
-  |No given instance of type deriving.Mirror.Sum{type MirroredType[X] = [Y] =>> List[(X, Y)]} was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Sum{type MirroredType[X] = [Y] =>> List[(X, Y)]}: type `[X] =>> [Y] =>> List[(X, Y)]` is not a generic sum because its subpart `[X] =>> [Y] =>> List[(X, Y)]` is not a supported kind (either `*` or `* -> *`)
+  |No given instance of type scala.deriving.Mirror.Sum{type MirroredType[X] = [Y] =>> List[(X, Y)]} was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Sum{type MirroredType[X] = [Y] =>> List[(X, Y)]}: type `[X] =>> [Y] =>> List[(X, Y)]` is not a generic sum because its subpart `[X] =>> [Y] =>> List[(X, Y)]` is not a supported kind (either `*` or `* -> *`)
diff --git a/tests/neg/i14127.check b/tests/neg/i14127.check
@@ -1,8 +1,8 @@
 -- [E172] Type Error: tests/neg/i14127.scala:6:55 ----------------------------------------------------------------------
 6 |    *: Int *: Int *: Int *: Int *: Int *: EmptyTuple)]] // error
   |                                                       ^
-  |No given instance of type deriving.Mirror.Of[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int,
-  |  Int, Int, Int)] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int,
-  |  Int, Int, Int)]:
+  |No given instance of type scala.deriving.Mirror.Of[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int,
+  |  Int, Int, Int, Int, Int)] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int,
+  |  Int, Int, Int, Int, Int)]:
   |	* class *: is not a generic product because it reduces to a tuple with arity 23, expected arity <= 22
   |	* class *: is not a generic sum because it does not have subclasses
diff --git a/tests/neg/i14363.check b/tests/neg/i14363.check
@@ -9,8 +9,8 @@
   |
   |             One of the following imports might fix the problem:
   |
-  |               import math.BigDecimal.int2bigDecimal
-  |               import math.BigInt.int2bigInt
+  |               import scala.math.BigDecimal.int2bigDecimal
+  |               import scala.math.BigInt.int2bigInt
   |
   |
   | longer explanation available when compiling with `-explain`
diff --git a/tests/neg/i14432.check b/tests/neg/i14432.check
@@ -1,6 +1,6 @@
 -- [E172] Type Error: tests/neg/i14432.scala:13:33 ---------------------------------------------------------------------
 13 |val mFoo = summon[Mirror.Of[Foo]] // error: no mirror found
    |                                 ^
-   |No given instance of type deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[example.Foo]:
+   |No given instance of type scala.deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[example.Foo]:
    |	* class Foo is not a generic product because the constructor of class Foo is innaccessible from the calling scope.
    |	* class Foo is not a generic sum because it is not a sealed class
diff --git a/tests/neg/i14432a.check b/tests/neg/i14432a.check
@@ -1,6 +1,6 @@
 -- [E172] Type Error: tests/neg/i14432a.scala:14:43 --------------------------------------------------------------------
 14 |  val mFoo = summon[Mirror.Of[example.Foo]] // error: no mirror found
    |                                           ^
-   |No given instance of type deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[example.Foo]:
+   |No given instance of type scala.deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[example.Foo]:
    |	* class Foo is not a generic product because the constructor of class Foo is innaccessible from the calling scope.
    |	* class Foo is not a generic sum because it is not a sealed class
diff --git a/tests/neg/i14432b.check b/tests/neg/i14432b.check
@@ -1,6 +1,6 @@
 -- [E172] Type Error: tests/neg/i14432b.scala:15:43 --------------------------------------------------------------------
 15 |  val mFoo = summon[Mirror.Of[example.Foo]] // error: no mirror found
    |                                           ^
-   |No given instance of type deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[example.Foo]:
+   |No given instance of type scala.deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[example.Foo]:
    |	* class Foo is not a generic product because the constructor of class Foo is innaccessible from the calling scope.
    |	* class Foo is not a generic sum because it is not a sealed class
diff --git a/tests/neg/i14432c.check b/tests/neg/i14432c.check
@@ -5,6 +5,6 @@
 -- [E172] Type Error: tests/neg/i14432c.scala:16:43 --------------------------------------------------------------------
 16 |  val mFoo = summon[Mirror.Of[example.Foo]] // error: no mirror
    |                                           ^
-   |No given instance of type deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[example.Foo]:
+   |No given instance of type scala.deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[example.Foo]:
    |	* class Foo is not a generic product because the constructor of class Foo is innaccessible from the calling scope.
    |	* class Foo is not a generic sum because it is not a sealed class
diff --git a/tests/neg/i14432d.check b/tests/neg/i14432d.check
@@ -1,6 +1,6 @@
 -- [E172] Type Error: tests/neg/i14432d.scala:17:45 --------------------------------------------------------------------
 17 |    val mFoo = summon[Mirror.Of[example.Foo]] // error
    |                                             ^
-   |No given instance of type deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[example.Foo]:
+   |No given instance of type scala.deriving.Mirror.Of[example.Foo] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[example.Foo]:
    |	* class Foo is not a generic product because the constructor of class Foo is innaccessible from the calling scope.
    |	* class Foo is not a generic sum because it is not a sealed class
diff --git a/tests/neg/i14564.check b/tests/neg/i14564.check
@@ -11,7 +11,7 @@
   |
   |                  One of the following imports might make progress towards fixing the problem:
   |
-  |                    import math.Fractional.Implicits.infixFractionalOps
-  |                    import math.Integral.Implicits.infixIntegralOps
-  |                    import math.Numeric.Implicits.infixNumericOps
+  |                    import scala.math.Fractional.Implicits.infixFractionalOps
+  |                    import scala.math.Integral.Implicits.infixIntegralOps
+  |                    import scala.math.Numeric.Implicits.infixNumericOps
   |
diff --git a/tests/neg/i14823.check b/tests/neg/i14823.check
@@ -1,6 +1,6 @@
 -- [E172] Type Error: tests/neg/i14823.scala:8:50 ----------------------------------------------------------------------
 8 |val baz = summon[Mirror.Of[SubA[Int] | SubB[Int]]] // error
   |                                                  ^
-  |No given instance of type deriving.Mirror.Of[SubA[Int] | SubB[Int]] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[SubA[Int] | SubB[Int]]:
+  |No given instance of type scala.deriving.Mirror.Of[SubA[Int] | SubB[Int]] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[SubA[Int] | SubB[Int]]:
   |	* type `SubA[Int] | SubB[Int]` is not a generic product because its subpart `SubA[Int] | SubB[Int]` is a top-level union type.
   |	* type `SubA[Int] | SubB[Int]` is not a generic sum because its subpart `SubA[Int] | SubB[Int]` is a top-level union type.
diff --git a/tests/neg/i14823a.check b/tests/neg/i14823a.check
@@ -1,7 +1,7 @@
 -- [E172] Type Error: tests/neg/i14823a.scala:16:48 --------------------------------------------------------------------
 16 |val foo = summon[Mirror.Of[Box[Int] | Box[Int]]] // error
    |                                                ^
-   |No given instance of type deriving.Mirror.Of[Box[Int] | Box[Int]] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[Box[Int] | Box[Int]]:
+   |No given instance of type scala.deriving.Mirror.Of[Box[Int] | Box[Int]] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[Box[Int] | Box[Int]]:
    |	* type `Box[Int] | Box[Int]` is not a generic product because its subpart `Box[Int] | Box[Int]` is a top-level union type.
    |	* type `Box[Int] | Box[Int]` is not a generic sum because its subpart `Box[Int] | Box[Int]` is a top-level union type.
 -- [E172] Type Error: tests/neg/i14823a.scala:17:58 --------------------------------------------------------------------
@@ -13,12 +13,12 @@
 -- [E172] Type Error: tests/neg/i14823a.scala:18:63 --------------------------------------------------------------------
 18 |def baz = summon[deriving.Mirror.Of[Foo[String] | Foo[String]]] // error
    |                                                               ^
-   |No given instance of type deriving.Mirror.Of[Foo[String] | Foo[String]] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[Foo[String] | Foo[String]]:
+   |No given instance of type scala.deriving.Mirror.Of[Foo[String] | Foo[String]] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[Foo[String] | Foo[String]]:
    |	* type `Foo[String] | Foo[String]` is not a generic product because its subpart `Foo[String] | Foo[String]` is a top-level union type.
    |	* type `Foo[String] | Foo[String]` is not a generic sum because its subpart `Foo[String] | Foo[String]` is a top-level union type.
 -- [E172] Type Error: tests/neg/i14823a.scala:20:66 --------------------------------------------------------------------
 20 |def qux = summon[deriving.Mirror.Of[Option[Int] | Option[String]]] // error
    |                                                                  ^
-   |No given instance of type deriving.Mirror.Of[Option[Int] | Option[String]] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type deriving.Mirror.Of[Option[Int] | Option[String]]:
+   |No given instance of type scala.deriving.Mirror.Of[Option[Int] | Option[String]] was found for parameter x of method summon in object Predef. Failed to synthesize an instance of type scala.deriving.Mirror.Of[Option[Int] | Option[String]]:
    |	* type `Option[Int] | Option[String]` is not a generic product because its subpart `Option[Int] | Option[String]` is a top-level union type.
    |	* type `Option[Int] | Option[String]` is not a generic sum because its subpart `Option[Int] | Option[String]` is a top-level union type.
diff --git a/tests/neg/i4986a.check b/tests/neg/i4986a.check
@@ -4,6 +4,6 @@
   |Cannot construct a collection of type List[String] with elements of type Int based on a collection of type List[Int]..
   |I found:
   |
-  |    collection.BuildFrom.buildFromIterableOps[CC, A0, A]
+  |    scala.collection.BuildFrom.buildFromIterableOps[CC, A0, A]
   |
-  |But method buildFromIterableOps in trait BuildFromLowPriority2 does not match type collection.BuildFrom[List[Int], Int, List[String]].
+  |But method buildFromIterableOps in trait BuildFromLowPriority2 does not match type scala.collection.BuildFrom[List[Int], Int, List[String]].
diff --git a/tests/neg/mirror-synthesis-errors-b.check b/tests/neg/mirror-synthesis-errors-b.check
diff --git a/tests/neg/mirror-synthesis-errors.check b/tests/neg/mirror-synthesis-errors.check
diff --git a/tests/neg/missing-implicit-2.check b/tests/neg/missing-implicit-2.check
diff --git a/tests/neg/missing-implicit-3.check b/tests/neg/missing-implicit-3.check
diff --git a/tests/neg/print-tuple-union.check b/tests/neg/print-tuple-union.check
diff --git a/tests/neg/print-tuple-union.scala b/tests/neg/print-tuple-union.scala
diff --git a/tests/neg/singleton-ops-any.check b/tests/neg/singleton-ops-any.check
diff --git a/tests/printing/annot-printing.check b/tests/printing/annot-printing.check
diff --git a/tests/printing/transformed/lazy-vals-new.check b/tests/printing/transformed/lazy-vals-new.check

Original file line number	Diff line number	Diff line change
`@@ -32,29 +32,29 @@ class CompletionTest {`
`32`	`32`
`33`	`33`	`@Test def completionFromScalaPackage: Unit = {`
`34`	`34`	`code"class Foo { val foo: Conv${m1} }"`
`35`		`- .completion(("Conversion", Class, "scala.Conversion"))`
	`35`	`+ .completion(("Conversion", Class, "Conversion"))`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Test def completionFromScalaPackageObject: Unit = {`
`39`	`39`	`code"class Foo { val foo: BigD${m1} }"`
`40`	`40`	`.completion(`
`41`		`- ("BigDecimal", Field, "scala.BigDecimal"),`
`42`		`- ("BigDecimal", Method, "=> math.BigDecimal.type"),`
	`41`	`+ ("BigDecimal", Field, "BigDecimal"),`
	`42`	`+ ("BigDecimal", Method, "=> scala.math.BigDecimal.type"),`
`43`	`43`	`)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Test def completionFromSyntheticPackageObject: Unit = {`
`47`	`47`	`code"class Foo { val foo: IArr${m1} }"`
`48`	`48`	`.completion(`
`49`	`49`	`("IArray", Module, "IArray"),`
`50`		`- ("IArray", Field, "scala.IArray"),`
	`50`	`+ ("IArray", Field, "IArray"),`
`51`	`51`	`)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Test def completionFromJavaDefaults: Unit = {`
`55`	`55`	`code"class Foo { val foo: Runn${m1} }"`
`56`	`56`	`.completion(`
`57`		`- ("Runnable", Class, "java.lang.Runnable"),`
	`57`	`+ ("Runnable", Class, "Runnable"),`
`58`	`58`	`("Runnable", Module, "Runnable"),`
`59`	`59`	`)`
`60`	`60`	`}`
`@@ -971,7 +971,7 @@ class CompletionTest {`
`971`	`971`	`("implicitNotFound", Module, "scala.annotation.implicitNotFound"),`
`972`	`972`	`)`
`973`	`973`	`.completion(m2,`
`974`		`- ("main", Class, "scala.main"),`
	`974`	`+ ("main", Class, "main"),`
`975`	`975`	`("main", Module, "main"),`
`976`	`976`	`)`
`977`	`977`