Skip to content

Commit 1c0165d

Browse files
committed
Show all kinds of package objects as packages
We missed package objects created for top-level definitions.
1 parent f2e6d47 commit 1c0165d

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
11051105
nameString(sym)
11061106
else if sym.is(Package) then
11071107
fullNameString(sym)
1108-
else if (sym.is(ModuleClass) && sym.isPackageObject && sym.name.stripModuleClassSuffix == tpnme.PACKAGE)
1108+
else if (sym.is(ModuleClass) && sym.isPackageObject && sym.name.isPackageObjectName)
11091109
nameString(sym.owner.name)
11101110
else if (sym.is(ModuleClass))
11111111
nameString(sym.name.stripModuleClassSuffix) + idString(sym)

tests/neg/i12573.check

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
-- [E008] Not Found Error: tests/neg/i12573.scala:23:38 ----------------------------------------------------------------
22
23 |val w: Value[8] = DFBits(Value[8](8)).getDFType.width // error
33
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4-
| value getDFType is not a member of DFBits[(8 : Int)].
5-
| Extension methods were tried, but the search failed with:
4+
| value getDFType is not a member of DFBits[(8 : Int)].
5+
| Extension methods were tried, but the search failed with:
66
|
7-
| method getDFType cannot be accessed as a member of DFType.type from package object i12573$package.
8-
| Access to protected method getDFType not permitted because enclosing package object i12573$package
9-
| is not a subclass of object DFType where target is defined
7+
| method getDFType cannot be accessed as a member of DFType.type from package object <empty>.
8+
| Access to protected method getDFType not permitted because enclosing package object <empty>
9+
| is not a subclass of object DFType where target is defined

tests/neg/not-accessible.check

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
-- [E173] Reference Error: tests/neg/not-accessible.scala:13:23 --------------------------------------------------------
1010
13 | def test(a: A) = a.x // error
1111
| ^^^
12-
| value x cannot be accessed as a member of (a : foo.A) from package object not-accessible$package.
12+
| value x cannot be accessed as a member of (a : foo.A) from package object bar.
1313
-- [E173] Reference Error: tests/neg/not-accessible.scala:5:21 ---------------------------------------------------------
1414
5 | def test(a: A) = a.x // error
1515
| ^^^
16-
| value x cannot be accessed as a member of (a : foo.A) from package object not-accessible$package.
16+
| value x cannot be accessed as a member of (a : foo.A) from package object foo.
1717
-- [E173] Reference Error: tests/neg/not-accessible.scala:15:23 --------------------------------------------------------
1818
15 |def test(a: foo.A) = a.x // error
1919
| ^^^
20-
| value x cannot be accessed as a member of (a : foo.A) from package object not-accessible$package.
20+
| value x cannot be accessed as a member of (a : foo.A) from package object <empty>.

0 commit comments

Comments
 (0)