Skip to content

Commit df412c6

Browse files
committed
Better job of stripping module class names
The lack of this caused a spurious pickling error in i11914a.scala when proxy generation changed.
1 parent 279c185 commit df412c6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
7878
}
7979

8080
override def nameString(name: Name): String =
81-
if ctx.settings.YdebugNames.value then name.debugString
81+
def strippedName = if printDebug then name else name.stripModuleClassSuffix
82+
if ctx.settings.YdebugNames.value then strippedName.debugString
8283
else if name.isTypeName && name.is(WildcardParamName) && !printDebug then "_"
83-
else super.nameString(name)
84+
else super.nameString(strippedName)
8485

8586
override protected def simpleNameString(sym: Symbol): String =
8687
nameString(if (ctx.property(XprintMode).isEmpty) sym.initial.name else sym.name)

tests/neg/exports.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
25 | export printUnit.bitmap // error: no eligible member
1212
| ^
1313
| non-private given instance bitmap in class Copier refers to private value printUnit
14-
| in its type signature => Copier.this.printUnit.bitmap$
14+
| in its type signature => Copier.this.printUnit.bitmap
1515
-- [E120] Naming Error: tests/neg/exports.scala:23:33 ------------------------------------------------------------------
1616
23 | export printUnit.{stat => _, _} // error: double definition
1717
| ^

0 commit comments

Comments
 (0)