Skip to content

Commit 0d6a57c

Browse files
committed
Don't compactify Java inner class names
1 parent c00fbc6 commit 0d6a57c

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ object SymDenotations {
481481
prefix = prefix.exclude(ModuleClassName)
482482
def qualify(n: SimpleName) =
483483
val qn = kind(prefix.toTermName, if (filler.isEmpty) n else termName(filler + n))
484-
if kind == FlatName then qn.compactified else qn
484+
if kind == FlatName && !encl.is(JavaDefined) then qn.compactified else qn
485485
val fn = name replace {
486486
case name: SimpleName => qualify(name)
487487
case name @ AnyQualifiedName(_, _) => qualify(name.mangled.toSimpleName)

tests/run/java-longnames/Long_1.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package p;
2+
3+
public class Long_1 {
4+
public static class ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ_1 {
5+
}
6+
}

tests/run/java-longnames/Test_2.scala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import p._
2+
3+
object Test extends App {
4+
println(
5+
new Long_1.ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ_1()
6+
.getClass
7+
.getName
8+
)
9+
}

0 commit comments

Comments
 (0)