Skip to content

Commit c04bb4f

Browse files
dwijnanddwijnand
committed
Print full package names, even if they're TermRefs
If you refer to a package by name, e.g. `scala.quoted.Quotes`, the type may have a "quoted" prefix that is a TermRef. Rather than unravel the rest of the prefixes, we print the fully package name.
1 parent fbb08f7 commit c04bb4f

File tree

26 files changed

+60
-54
lines changed

26 files changed

+60
-54
lines changed

‎compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
109109
if (tp.cls.isAnonymousClass) keywordStr("this")
110110
if (tp.cls.is(ModuleClass)) fullNameString(tp.cls.sourceModule)
111111
else super.toTextRef(tp)
112+
case tp: TermRef if !printDebug =>
113+
if tp.symbol.is(Package) then fullNameString(tp.symbol)
114+
else super.toTextRef(tp)
112115
case _ =>
113116
super.toTextRef(tp)
114117
}

‎compiler/test-resources/repl-macros/i15104c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
scala> import scala.quoted._
22
scala> def macroImpl(using Quotes) = Expr(1)
3-
def macroImpl(using x$1: quoted.Quotes): quoted.Expr[Int]
3+
def macroImpl(using x$1: scala.quoted.Quotes): scala.quoted.Expr[Int]
44
scala> inline def foo = ${ macroImpl }
55
def foo: Int
66
scala> foo

‎compiler/test-resources/repl-macros/i5551

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
scala> import scala.quoted._
22
scala> def assertImpl(expr: Expr[Boolean])(using q: Quotes) = '{ if !($expr) then throw new AssertionError("failed assertion")}
33
def assertImpl
4-
(expr: quoted.Expr[Boolean])(using q: quoted.Quotes): scala.quoted.Expr[Unit]
4+
(expr: scala.quoted.Expr[Boolean])
5+
(using q: scala.quoted.Quotes): scala.quoted.Expr[Unit]
56
scala> inline def assert(expr: => Boolean): Unit = ${ assertImpl('{expr}) }
67
def assert(expr: => Boolean): Unit
78

‎compiler/test-resources/repl/i10355

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
scala> import scala.quoted._
22
scala> def foo(expr: Expr[Any])(using Quotes) = expr match { case '{ $x: t } => '{ $x: Any } }
33
def foo
4-
(expr: quoted.Expr[Any])(using x$2: quoted.Quotes): scala.quoted.Expr[Any]
4+
(expr: scala.quoted.Expr[Any])
5+
(using x$2: scala.quoted.Quotes): scala.quoted.Expr[Any]
56
scala> def bar(expr: Expr[Any])(using Quotes) = expr match { case '{ $x: t } => '{ val a: t = ??? ; ???} }
67
def bar
7-
(expr: quoted.Expr[Any])(using x$2: quoted.Quotes): scala.quoted.Expr[Nothing]
8+
(expr: scala.quoted.Expr[Any])
9+
(using x$2: scala.quoted.Quotes): scala.quoted.Expr[Nothing]

‎language-server/test/dotty/tools/languageserver/CompletionTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class CompletionTest {
3939
code"class Foo { val foo: BigD${m1} }"
4040
.completion(
4141
("BigDecimal", Field, "BigDecimal"),
42-
("BigDecimal", Method, "=> math.BigDecimal.type"),
42+
("BigDecimal", Method, "=> scala.math.BigDecimal.type"),
4343
)
4444
}
4545

‎staging/test-resources/repl-staging/i6007

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
scala> import scala.quoted._
22
scala> import quoted.staging.{Compiler => StagingCompiler, _}
33
scala> implicit def compiler: StagingCompiler = StagingCompiler.make(getClass.getClassLoader)
4-
def compiler: quoted.staging.Compiler
4+
def compiler: scala.quoted.staging.Compiler
55
scala> def v(using Quotes) = '{ (if true then Some(1) else None).map(v => v+1) }
6-
def v(using x$1: quoted.Quotes): scala.quoted.Expr[Option[Int]]
6+
def v(using x$1: scala.quoted.Quotes): scala.quoted.Expr[Option[Int]]
77
scala> scala.quoted.staging.withQuotes(v.show)
88
val res0: String = (if (true) scala.Some.apply[scala.Int](1) else scala.None).map[scala.Int](((v: scala.Int) => v.+(1)))
99
scala> scala.quoted.staging.run(v)

‎staging/test-resources/repl-staging/i6263

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
scala> import quoted._
22
scala> import quoted.staging.{Compiler => StagingCompiler, _}
33
scala> implicit def compiler: StagingCompiler = StagingCompiler.make(getClass.getClassLoader)
4-
def compiler: quoted.staging.Compiler
4+
def compiler: scala.quoted.staging.Compiler
55
scala> def fn[T : Type](v : T) = println("ok")
6-
def fn[T](v: T)(implicit evidence$1: quoted.Type[T]): Unit
6+
def fn[T](v: T)(implicit evidence$1: scala.quoted.Type[T]): Unit
77
scala> withQuotes { fn("foo") }
88
ok
99
scala> withQuotes { fn((1,2)) }

‎tests/neg-custom-args/explain/i16888.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- [E172] Type Error: tests/neg-custom-args/explain/i16888.scala:1:38 --------------------------------------------------
22
1 |def test = summon[scala.quoted.Quotes] // error
33
| ^
4-
| No given instance of type quoted.Quotes was found for parameter x of method summon in object Predef
4+
| No given instance of type scala.quoted.Quotes was found for parameter x of method summon in object Predef
55
|---------------------------------------------------------------------------------------------------------------------
66
| Explanation (enabled by `-explain`)
77
|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

‎tests/neg/i14025.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
-- [E172] Type Error: tests/neg/i14025.scala:1:88 ----------------------------------------------------------------------
22
1 |val foo = summon[deriving.Mirror.Product { type MirroredType = [X] =>> [Y] =>> (X, Y) }] // error
33
| ^
4-
|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 `* -> *`)
4+
|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 `* -> *`)
55
-- [E172] Type Error: tests/neg/i14025.scala:2:90 ----------------------------------------------------------------------
66
2 |val bar = summon[deriving.Mirror.Sum { type MirroredType = [X] =>> [Y] =>> List[(X, Y)] }] // error
77
| ^
8-
|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 `* -> *`)
8+
|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 `* -> *`)

‎tests/neg/i14127.check

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
-- [E172] Type Error: tests/neg/i14127.scala:6:55 ----------------------------------------------------------------------
22
6 | *: Int *: Int *: Int *: Int *: Int *: EmptyTuple)]] // error
33
| ^
4-
|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,
5-
| 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,
6-
| Int, Int, Int)]:
4+
|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,
5+
| 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,
6+
| Int, Int, Int, Int, Int)]:
77
| * class *: is not a generic product because it reduces to a tuple with arity 23, expected arity <= 22
88
| * class *: is not a generic sum because it does not have subclasses

0 commit comments

Comments
 (0)