Skip to content

Commit 29f7f37

Browse files
tgodziktgodzik
authored
Merge pull request #481 from scala/backport-lts-3.3-23453
Backport "Improve error message for conflicting definitions" to 3.3 LTS
2 parents 5cc3e37 + ee58684 commit 29f7f37

15 files changed

+87
-40
lines changed

‎compiler/src/dotty/tools/dotc/reporting/messages.scala

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2303,7 +2303,9 @@ class DoubleDefinition(decl: Symbol, previousDecl: Symbol, base: Symbol)(using C
23032303
extends NamingMsg(DoubleDefinitionID) {
23042304
def msg(using Context) = {
23052305
def nameAnd = if (decl.name != previousDecl.name) " name and" else ""
2306-
def erasedType = if ctx.erasedTypes then i" ${decl.info}" else ""
2306+
def erasedType: Type =
2307+
if ctx.erasedTypes then decl.info
2308+
else TypeErasure.transformInfo(decl, decl.info)
23072309
def details(using Context): String =
23082310
if (decl.isRealMethod && previousDecl.isRealMethod) {
23092311
import Signature.MatchDegree.*
@@ -2331,7 +2333,7 @@ extends NamingMsg(DoubleDefinitionID) {
23312333
|Consider adding a @targetName annotation to one of the conflicting definitions
23322334
|for disambiguation."""
23332335
else ""
2334-
i"have the same$nameAnd type$erasedType after erasure.$hint"
2336+
i"have the same$nameAnd type $erasedType after erasure.$hint"
23352337
}
23362338
}
23372339
else ""
@@ -2344,7 +2346,7 @@ extends NamingMsg(DoubleDefinitionID) {
23442346
}
23452347
val clashDescription =
23462348
if (decl.owner eq previousDecl.owner)
2347-
"Double definition"
2349+
"Conflicting definitions"
23482350
else if ((decl.owner eq base) || (previousDecl eq base))
23492351
"Name clash between defined and inherited member"
23502352
else
@@ -3266,4 +3268,4 @@ final class NamedPatternNotApplicable(selectorType: Type)(using Context) extends
32663268
override protected def msg(using Context): String =
32673269
i"Named patterns cannot be used with $selectorType, because it is not a named tuple or case class"
32683270

3269-
override protected def explain(using Context): String = ""
3271+
override protected def explain(using Context): String = ""

‎tests/neg/doubleDefinition.check

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,130 @@
11
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:14:5 ----------------------------------------------------------
22
14 | def foo(x: List[B]): Function1[B, B] = ??? // error: same jvm signature
33
| ^
4-
| Double definition:
4+
| Conflicting definitions:
55
| def foo(x: List[A]): A => A in class Test2 at line 13 and
66
| def foo(x: List[B]): B => B in class Test2 at line 14
7-
| have the same type after erasure.
7+
| have the same type (x: List): Function1 after erasure.
88
|
99
| Consider adding a @targetName annotation to one of the conflicting definitions
1010
| for disambiguation.
1111
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:21:5 ----------------------------------------------------------
1212
21 | def foo(x: List[A]): Function2[B, B, B] = ??? // error
1313
| ^
14-
| Double definition:
14+
| Conflicting definitions:
1515
| def foo(x: List[A]): A => A in class Test3 at line 20 and
1616
| def foo(x: List[A]): (B, B) => B in class Test3 at line 21
1717
| have matching parameter types.
1818
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:26:5 ----------------------------------------------------------
1919
26 | def foo = 2 // error
2020
| ^
21-
| Double definition:
21+
| Conflicting definitions:
2222
| val foo: Int in class Test4 at line 25 and
2323
| def foo: Int in class Test4 at line 26
2424
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:31:5 ----------------------------------------------------------
2525
31 | val foo = 1 // error
2626
| ^
27-
| Double definition:
27+
| Conflicting definitions:
2828
| def foo: Int in class Test4b at line 30 and
2929
| val foo: Int in class Test4b at line 31
3030
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:36:5 ----------------------------------------------------------
3131
36 | var foo = 1 // error
3232
| ^
33-
| Double definition:
33+
| Conflicting definitions:
3434
| def foo: Int in class Test4c at line 35 and
3535
| var foo: Int in class Test4c at line 36
3636
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:41:5 ----------------------------------------------------------
3737
41 | def foo = 2 // error
3838
| ^
39-
| Double definition:
39+
| Conflicting definitions:
4040
| var foo: Int in class Test4d at line 40 and
4141
| def foo: Int in class Test4d at line 41
4242
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:55:5 ----------------------------------------------------------
4343
55 | def foo(x: List[B]): Function1[B, B] = ??? // error: same jvm signature
4444
| ^
45-
| Double definition:
45+
| Conflicting definitions:
4646
| def foo(x: List[A]): A => A in trait Test6 at line 54 and
4747
| def foo(x: List[B]): B => B in trait Test6 at line 55
48-
| have the same type after erasure.
48+
| have the same type (x: List): Function1 after erasure.
4949
|
5050
| Consider adding a @targetName annotation to one of the conflicting definitions
5151
| for disambiguation.
5252
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:62:5 ----------------------------------------------------------
5353
62 | def foo(x: List[A]): Function2[B, B, B] = ??? // error
5454
| ^
55-
| Double definition:
55+
| Conflicting definitions:
5656
| def foo(x: List[A]): A => A in trait Test7 at line 61 and
5757
| def foo(x: List[A]): (B, B) => B in trait Test7 at line 62
5858
| have matching parameter types.
5959
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:67:5 ----------------------------------------------------------
6060
67 | def foo = 2 // error
6161
| ^
62-
| Double definition:
62+
| Conflicting definitions:
6363
| val foo: Int in class Test8 at line 66 and
6464
| def foo: Int in class Test8 at line 67
6565
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:72:5 ----------------------------------------------------------
6666
72 | val foo = 1 // error
6767
| ^
68-
| Double definition:
68+
| Conflicting definitions:
6969
| def foo: Int in class Test8b at line 71 and
7070
| val foo: Int in class Test8b at line 72
7171
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:77:5 ----------------------------------------------------------
7272
77 | var foo = 1 // error
7373
| ^
74-
| Double definition:
74+
| Conflicting definitions:
7575
| def foo: Int in class Test8c at line 76 and
7676
| var foo: Int in class Test8c at line 77
7777
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:82:5 ----------------------------------------------------------
7878
82 | def foo = 2 // error
7979
| ^
80-
| Double definition:
80+
| Conflicting definitions:
8181
| var foo: Int in class Test8d at line 81 and
8282
| def foo: Int in class Test8d at line 82
8383
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:88:5 ----------------------------------------------------------
8484
88 | def foo: String // error
8585
| ^
86-
| Double definition:
86+
| Conflicting definitions:
8787
| val foo: Int in class Test9 at line 87 and
8888
| def foo: String in class Test9 at line 88
8989
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:92:5 ----------------------------------------------------------
9090
92 | def foo: Int // error
9191
| ^
92-
| Double definition:
92+
| Conflicting definitions:
9393
| val foo: Int in class Test10 at line 91 and
9494
| def foo: Int in class Test10 at line 92
9595
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:96:5 ----------------------------------------------------------
9696
96 | def foo: String // error
9797
| ^
98-
| Double definition:
98+
| Conflicting definitions:
9999
| val foo: Int in class Test11 at line 95 and
100100
| def foo: String in class Test11 at line 96
101101
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:100:5 ---------------------------------------------------------
102102
100 | def foo: Int // error
103103
| ^
104-
| Double definition:
104+
| Conflicting definitions:
105105
| val foo: Int in class Test12 at line 99 and
106106
| def foo: Int in class Test12 at line 100
107107
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:104:5 ---------------------------------------------------------
108108
104 | def foo: String // error
109109
| ^
110-
| Double definition:
110+
| Conflicting definitions:
111111
| var foo: Int in class Test13 at line 103 and
112112
| def foo: String in class Test13 at line 104
113113
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:108:5 ---------------------------------------------------------
114114
108 | def foo: Int // error
115115
| ^
116-
| Double definition:
116+
| Conflicting definitions:
117117
| var foo: Int in class Test14 at line 107 and
118118
| def foo: Int in class Test14 at line 108
119119
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:112:5 ---------------------------------------------------------
120120
112 | def foo: String // error
121121
| ^
122-
| Double definition:
122+
| Conflicting definitions:
123123
| var foo: Int in class Test15 at line 111 and
124124
| def foo: String in class Test15 at line 112
125125
-- [E120] Naming Error: tests/neg/doubleDefinition.scala:116:5 ---------------------------------------------------------
126126
116 | def foo: Int // error
127127
| ^
128-
| Double definition:
128+
| Conflicting definitions:
129129
| var foo: Int in class Test16 at line 115 and
130130
| def foo: Int in class Test16 at line 116

‎tests/neg/exports.check

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@
1515
-- [E120] Naming Error: tests/neg/exports.scala:23:33 ------------------------------------------------------------------
1616
23 | export printUnit.{stat => _, _} // error: double definition
1717
| ^
18-
| Double definition:
18+
| Conflicting definitions:
1919
| def status: List[String] in class Copier at line 28 and
2020
| final def status: List[String] in class Copier at line 23
21-
| have the same type after erasure.
21+
| have the same type (): List after erasure.
2222
|
2323
| Consider adding a @targetName annotation to one of the conflicting definitions
2424
| for disambiguation.
2525
-- [E120] Naming Error: tests/neg/exports.scala:24:20 ------------------------------------------------------------------
2626
24 | export scanUnit._ // error: double definition
2727
| ^
28-
| Double definition:
28+
| Conflicting definitions:
2929
| final def status: List[String] in class Copier at line 23 and
3030
| final def status: List[String] in class Copier at line 24
31-
| have the same type after erasure.
31+
| have the same type (): List after erasure.
3232
|
3333
| Consider adding a @targetName annotation to one of the conflicting definitions
3434
| for disambiguation.
3535
-- [E120] Naming Error: tests/neg/exports.scala:26:21 ------------------------------------------------------------------
3636
26 | export printUnit.status // error: double definition
3737
| ^
38-
| Double definition:
38+
| Conflicting definitions:
3939
| final def status: List[String] in class Copier at line 24 and
4040
| final def status: List[String] in class Copier at line 26
41-
| have the same type after erasure.
41+
| have the same type (): List after erasure.
4242
|
4343
| Consider adding a @targetName annotation to one of the conflicting definitions
4444
| for disambiguation.
@@ -55,7 +55,7 @@
5555
-- [E120] Naming Error: tests/neg/exports.scala:46:15 ------------------------------------------------------------------
5656
46 | export bar._ // error: double definition
5757
| ^
58-
| Double definition:
58+
| Conflicting definitions:
5959
| val bar: Bar in class Baz at line 45 and
6060
| final def bar: (Baz.this.bar.bar : => (Baz.this.bar.baz.bar : Bar)) in class Baz at line 46
6161
-- [E083] Type Error: tests/neg/exports.scala:57:11 --------------------------------------------------------------------

‎tests/neg/i14966a.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- [E120] Naming Error: tests/neg/i14966a.scala:3:6 --------------------------------------------------------------------
22
3 | def f(x: List[Int]): String = ??? // error
33
| ^
4-
| Double definition:
4+
| Conflicting definitions:
55
| def f[X <: String](x: List[X]): String in class Test at line 2 and
66
| def f(x: List[Int]): String in class Test at line 3
77
| have the same type (x: scala.collection.immutable.List): String after erasure.

‎tests/neg/i23402.check

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-- [E120] Naming Error: tests/neg/i23402.scala:4:5 ---------------------------------------------------------------------
2+
4 | def apply(p1: String)(p2: Int): A = A(p1, p2) // error
3+
| ^
4+
| Conflicting definitions:
5+
| def apply(p1: String, p2: Int): A in object A at line 3 and
6+
| def apply(p1: String)(p2: Int): A in object A at line 4
7+
| have the same type (p1: String, p2: Int): A after erasure.
8+
|
9+
| Consider adding a @targetName annotation to one of the conflicting definitions
10+
| for disambiguation.

‎tests/neg/i23402.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class A(p1: String, p2: Int)
2+
object A {
3+
def apply(p1: String, p2: Int): A = A(p1, p2)
4+
def apply(p1: String)(p2: Int): A = A(p1, p2) // error
5+
}

‎tests/neg/i23402b.check

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-- [E120] Naming Error: tests/neg/i23402b.scala:4:5 --------------------------------------------------------------------
2+
4 | def apply[T](p1: String)(p2: Int): A = A(p1, p2) // error
3+
| ^
4+
| Conflicting definitions:
5+
| def apply[T](p1: String, p2: Int): A in object A at line 3 and
6+
| def apply[T](p1: String)(p2: Int): A in object A at line 4
7+
| have the same type (p1: String, p2: Int): A after erasure.
8+
|
9+
| Consider adding a @targetName annotation to one of the conflicting definitions
10+
| for disambiguation.

‎tests/neg/i23402b.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class A(p1: String, p2: Int)
2+
object A {
3+
def apply[T](p1: String, p2: Int): A = A(p1, p2)
4+
def apply[T](p1: String)(p2: Int): A = A(p1, p2) // error
5+
}

‎tests/neg/i23402c.check

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-- [E120] Naming Error: tests/neg/i23402c.scala:4:5 --------------------------------------------------------------------
2+
4 | def apply[T](p1: String)(p2: Int): A = A(p1, p2) // error
3+
| ^
4+
| Conflicting definitions:
5+
| def apply(p1: String, p2: Int): A in object A at line 3 and
6+
| def apply[T](p1: String)(p2: Int): A in object A at line 4
7+
| have the same type (p1: String, p2: Int): A after erasure.
8+
|
9+
| Consider adding a @targetName annotation to one of the conflicting definitions
10+
| for disambiguation.

‎tests/neg/i23402c.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class A(p1: String, p2: Int)
2+
object A {
3+
def apply(p1: String, p2: Int): A = A(p1, p2)
4+
def apply[T](p1: String)(p2: Int): A = A(p1, p2) // error
5+
}

0 commit comments

Comments
 (0)