Skip to content

Use a better span for an anonymous class #24640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hamzaremmal merged 1 commit into from
Dec 3, 2025
Merged

Use a better span for an anonymous class #24640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion compiler/src/dotty/tools/dotc/typer/Typer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,11 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
typedAhead(parent, tree => inferTypeParams(typedType(tree), pt))
val anon = tpnme.ANON_CLASS
val clsDef = TypeDef(anon, templ1).withFlags(Final | Synthetic)
typed(cpy.Block(tree)(clsDef :: Nil, New(Ident(anon), Nil)), pt)
typed(
cpy.Block(tree)(
clsDef :: Nil,
New(Ident(anon), Nil).withSpan(tree.span)),
pt)
case _ =>
var tpt1 = typedType(tree.tpt)
val tsym = tpt1.tpe.underlyingClassRef(refinementOK = false).typeSymbol
Expand Down
13 changes: 7 additions & 6 deletions tests/neg-custom-args/captures/capt1.check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@
| Note that capability x is not included in capture set {}.
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:28:40 ----------------------------------------
28 | def m() = if x == null then y else y // error
| ^
| Found: A^{x}
| Required: A
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:27:2 -----------------------------------------
27 | new A: // error
| ^
| Found: A^{x}
| Required: A
|
| Note that capability x is not included in capture set {}.
| Note that capability x is not included in capture set {}.
28 | def m() = if x == null then y else y
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:36:24 ----------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions tests/neg-custom-args/captures/capt1.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ def h3(x: Cap): A =
F(22) // error

def h4(x: Cap, y: Int): A =
new A:
def m() = if x == null then y else y // error
new A: // error
def m() = if x == null then y else y

def f1(c: Cap): () ->{c} c.type = () => c // ok

Expand Down
4 changes: 2 additions & 2 deletions tests/neg-custom-args/captures/method-uses.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ def test3(xs: List[() => Unit]): () ->{xs*} Unit = () =>
def test4(xs: List[() => Unit]) = () => xs.head // error, ok under deferredReaches

def test5(xs: List[() => Unit]) = new:
println(xs.head) // error, ok under deferredReaches // error
println(xs.head) // error, ok under deferredReaches

def test6(xs: List[() => Unit]) =
val x= new { println(xs.head) } // error // error
val x= new { println(xs.head) } // error
x
23 changes: 7 additions & 16 deletions tests/neg-custom-args/captures/mut-iterator4.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
-- Error: tests/neg-custom-args/captures/mut-iterator4.scala:9:26 ------------------------------------------------------
9 | update def next() = f(Iterator.this.next()) // error // error
9 | update def next() = f(Iterator.this.next()) // error
| ^^^^^^^^^^^^^
| Read-only method map accesses exclusive capability (Iterator.this : Iterator[T]^);
| method map should be declared an update method to allow this.
|
| where: ^ refers to the universal root capability
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/mut-iterator4.scala:9:47 ---------------------------------
9 | update def next() = f(Iterator.this.next()) // error // error
| ^
|Found: Iterator[U^'s1]^{Iterator.this.rd, f, Iterator.this, cap}
|Required: Iterator[U]^{Iterator.this, f}
|
|Note that capability cap is not included in capture set {Iterator.this, f}.
|
|where: cap is a fresh root capability created in method map when constructing instance Object with (Iterator[U]^{cap².rd}) {...}
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/mut-iterator4.scala:23:34 --------------------------------
23 | update def next() = f(it.next()) // error
| ^
|Found: Iterator[U^'s2]^{it.rd, f, it, cap}
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/mut-iterator4.scala:21:81 --------------------------------
21 |def mappedIterator[T, U](it: Iterator[T]^, f: T => U): Iterator[U]^{it, f} = new Iterator: // error
| ^
|Found: Iterator[U^'s1]^{it.rd, f, it, cap}
|Required: Iterator[U]^{it, f}
|
|Note that capability cap is not included in capture set {it, f}.
|
|where: cap is a fresh root capability created in method mappedIterator when constructing instance Object with (Iterator[U]^{cap².rd}) {...}
22 | def hasNext = it.hasNext
23 | update def next() = f(it.next())
|
| longer explanation available when compiling with `-explain`
6 changes: 3 additions & 3 deletions tests/neg-custom-args/captures/mut-iterator4.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ trait Iterator[T] extends Stateful:

def map[U](f: T => U): Iterator[U]^{Iterator.this, f} = new Iterator:
def hasNext = Iterator.this.hasNext
update def next() = f(Iterator.this.next()) // error // error
update def next() = f(Iterator.this.next()) // error

end Iterator

Expand All @@ -18,9 +18,9 @@ def listIterator[T](xs: List[T]): Iterator[T]^ = new Iterator[T]:
current = xs1
x

def mappedIterator[T, U](it: Iterator[T]^, f: T => U): Iterator[U]^{it, f} = new Iterator:
def mappedIterator[T, U](it: Iterator[T]^, f: T => U): Iterator[U]^{it, f} = new Iterator: // error
def hasNext = it.hasNext
update def next() = f(it.next()) // error
update def next() = f(it.next())

class IO extends SharedCapability:
def write(x: Any): Unit = ()
Expand Down
16 changes: 8 additions & 8 deletions tests/neg/6570-1.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
-- [E007] Type Mismatch Error: tests/neg/6570-1.scala:23:27 ------------------------------------------------------------
-- [E007] Type Mismatch Error: tests/neg/6570-1.scala:23:14 ------------------------------------------------------------
23 | def thing = new Trait1 {} // error
| ^
| Found: Object with Trait1 {...}
| Required: N[Box[Int & String]]
| ^^^^^^^^^^^^^
| Found: Object with Trait1 {...}
| Required: N[Box[Int & String]]
|
| Note: a match type could not be fully reduced:
| Note: a match type could not be fully reduced:
|
| trying to reduce N[Box[Int & String]]
| failed since selector Box[Int & String]
| is uninhabited (there are no values of that type).
| trying to reduce N[Box[Int & String]]
| failed since selector Box[Int & String]
| is uninhabited (there are no values of that type).
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg/6570-1.scala:36:54 ------------------------------------------------------------
Expand Down
80 changes: 40 additions & 40 deletions tests/neg/6570.check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
| x >: Int
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg/6570.scala:29:29 --------------------------------------------------------------
-- [E007] Type Mismatch Error: tests/neg/6570.scala:29:16 --------------------------------------------------------------
29 | def thing = new Trait1 {} // error
| ^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
| ^^^^^^^^^^^^^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
|
| Note: a match type could not be fully reduced:
| Note: a match type could not be fully reduced:
|
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg/6570.scala:47:32 --------------------------------------------------------------
Expand All @@ -46,43 +46,43 @@
| a >: Int
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg/6570.scala:51:29 --------------------------------------------------------------
-- [E007] Type Mismatch Error: tests/neg/6570.scala:51:16 --------------------------------------------------------------
51 | def thing = new Trait1 {} // error
| ^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
| ^^^^^^^^^^^^^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
|
| Note: a match type could not be fully reduced:
| Note: a match type could not be fully reduced:
|
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg/6570.scala:69:29 --------------------------------------------------------------
-- [E007] Type Mismatch Error: tests/neg/6570.scala:69:16 --------------------------------------------------------------
69 | def thing = new Trait1 {} // error
| ^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
| ^^^^^^^^^^^^^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
|
| Note: a match type could not be fully reduced:
| Note: a match type could not be fully reduced:
|
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg/6570.scala:86:29 --------------------------------------------------------------
-- [E007] Type Mismatch Error: tests/neg/6570.scala:86:16 --------------------------------------------------------------
86 | def thing = new Trait1 {} // error
| ^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
| ^^^^^^^^^^^^^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
|
| Note: a match type could not be fully reduced:
| Note: a match type could not be fully reduced:
|
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg/6570.scala:103:32 -------------------------------------------------------------
Expand All @@ -101,16 +101,16 @@
| t >: Int
|
| longer explanation available when compiling with `-explain`
-- [E007] Type Mismatch Error: tests/neg/6570.scala:107:29 -------------------------------------------------------------
-- [E007] Type Mismatch Error: tests/neg/6570.scala:107:16 -------------------------------------------------------------
107 | def thing = new Trait1 {} // error
| ^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
| ^^^^^^^^^^^^^
| Found: Object with Base.Trait1 {...}
| Required: Base.N[String & Int]
|
| Note: a match type could not be fully reduced:
| Note: a match type could not be fully reduced:
|
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
| trying to reduce Base.N[String & Int]
| failed since selector String & Int
| is uninhabited (there are no values of that type).
|
| longer explanation available when compiling with `-explain`
8 changes: 4 additions & 4 deletions tests/neg/i13703.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- [E007] Type Mismatch Error: tests/neg/i13703.scala:3:78 -------------------------------------------------------------
-- [E007] Type Mismatch Error: tests/neg/i13703.scala:3:52 -------------------------------------------------------------
3 |val f2: Foo { val i: Int; def i_=(x: Int): Unit } = new Foo { var i: Int = 0 } // error
| ^
| Found: Object with Foo {...}
| Required: Foo{val i: Int; def i_=(x: Int): Unit}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
| Found: Object with Foo {...}
| Required: Foo{val i: Int; def i_=(x: Int): Unit}
|
| longer explanation available when compiling with `-explain`
Loading