Avoid double blank line in front of error notes

odersky · odersky · commit 4e9ebec77976 · 2025-05-26T11:33:54.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala b/compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala
@@ -1300,7 +1300,6 @@ class CheckCaptures extends Recheck, SymTransformer:
               i"""the existential capture root in ${ex.originalBinder.resType}
                  |cannot subsume the capability $other$since"""
           i"""
-             |
              |Note that ${msg.toString}"""
 
 
diff --git a/tests/neg-custom-args/captures/cc-existential-conformance.check b/tests/neg-custom-args/captures/cc-existential-conformance.check
@@ -19,7 +19,6 @@
   |                           where:    ^  refers to a fresh root capability in the type of value y
   |                                     ^² refers to a root capability associated with the result type of (x: A): B^²
   |
-  |
   |                           Note that the existential capture root in B^
   |                           cannot subsume the capability cap
   |
@@ -45,7 +44,6 @@
    |                        where:    ^  refers to a fresh root capability in the type of value y
    |                                  ^² refers to a root capability associated with the result type of (x: A): B^²
    |
-   |
    |                        Note that the existential capture root in B^
    |                        cannot subsume the capability cap
    |
diff --git a/tests/neg-custom-args/captures/effect-swaps-explicit.check b/tests/neg-custom-args/captures/effect-swaps-explicit.check
@@ -24,7 +24,6 @@
    |where:    ?=> refers to a fresh root capability created in method fail4 when checking argument to parameter body of method make
    |          ^   refers to the universal root capability
    |
-   |
    |Note that reference contextual$9.type
    |cannot be included in outer capture set ?
 70 |            fr.await.ok
diff --git a/tests/neg-custom-args/captures/effect-swaps.check b/tests/neg-custom-args/captures/effect-swaps.check
@@ -24,7 +24,6 @@
    |where:    ?=> refers to a fresh root capability created in method fail4 when checking argument to parameter body of method make
    |          cap is the universal root capability
    |
-   |
    |Note that reference contextual$9.type
    |cannot be included in outer capture set ?
 70 |            fr.await.ok
diff --git a/tests/neg-custom-args/captures/erased-methods2.check b/tests/neg-custom-args/captures/erased-methods2.check
@@ -8,7 +8,6 @@
    |          ?=>² refers to a root capability associated with the result type of (using erased x$1: CT[Ex3]^): (erased x$2: CT[Ex2]^) ?=>² Unit
    |          ^    refers to the universal root capability
    |
-   |
    |Note that the existential capture root in (erased x$2: CT[Ex2]^) ?=> Unit
    |cannot subsume the capability x$1.type since that capability is not a SharedCapability
 21 |     ?=> (x$2: CT[Ex2]^)
@@ -28,7 +27,6 @@
    |          ?=>³ refers to a root capability associated with the result type of (using erased x$1: CT[Ex2]^): (erased x$2: CT[Ex1]^) ?=>³ Unit
    |          ^    refers to the universal root capability
    |
-   |
    |Note that the existential capture root in (erased x$1: CT[Ex2]^) ?=> (erased x$2: CT[Ex1]^) ?=> Unit
    |cannot subsume the capability x$1.type since that capability is not a SharedCapability
 32 |     ?=> (erased x$2: CT[Ex2]^)
diff --git a/tests/neg-custom-args/captures/filevar.check b/tests/neg-custom-args/captures/filevar.check
@@ -7,7 +7,6 @@
    |where:    =>  refers to a root capability associated with the result type of (using l: scala.caps.Capability^{cap.rd}): (f: File^{l}) => Unit
    |          cap is the universal root capability
    |
-   |
    |Note that reference l.type
    |cannot be included in outer capture set ? of parameter f
 16 |    val o = Service()
diff --git a/tests/neg-custom-args/captures/heal-tparam-cs.check b/tests/neg-custom-args/captures/heal-tparam-cs.check
@@ -7,7 +7,6 @@
    |where:    => refers to a fresh root capability created in value test1 when checking argument to parameter op of method localCap
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference c.type
    |cannot be included in outer capture set ?
 11 |    () => { c.use() }
@@ -23,7 +22,6 @@
    |    where:    => refers to a root capability associated with the result type of (c: Capp^): () => Unit
    |              ^  refers to the universal root capability
    |
-   |
    |    Note that the existential capture root in () => Unit
    |    cannot subsume the capability x$0.type since that capability is not a SharedCapability
 16 |      (c1: Capp^) => () => { c1.use() }
diff --git a/tests/neg-custom-args/captures/i15923.check b/tests/neg-custom-args/captures/i15923.check
@@ -8,7 +8,6 @@
    |          cap  is the universal root capability
    |          cap² is a root capability associated with the result type of (x$0: Cap^{lcap}): box Id[box Cap^{cap².rd}]^?
    |
-   |
    |Note that reference <cap of (x$0: Cap^{lcap}): box Id[box Cap^{cap.rd}]^?>.rd
    |cannot be included in outer capture set ?
    |
diff --git a/tests/neg-custom-args/captures/i15923a.check b/tests/neg-custom-args/captures/i15923a.check
@@ -9,7 +9,6 @@
   |          ^   refers to the universal root capability
   |          ^²  refers to a root capability associated with the result type of (): box Id[box Cap^²]^?
   |
-  |
   |Note that reference <cap of (): box Id[box Cap^]^?>
   |cannot be included in outer capture set ?
   |
diff --git a/tests/neg-custom-args/captures/i15923b.check b/tests/neg-custom-args/captures/i15923b.check
@@ -7,7 +7,6 @@
   |where:    => refers to a fresh root capability created in value leak when checking argument to parameter op of method withCap
   |          ^  refers to the universal root capability
   |
-  |
   |Note that reference lcap.type
   |cannot be included in outer capture set ?
   |
diff --git a/tests/neg-custom-args/captures/i16226.check b/tests/neg-custom-args/captures/i16226.check
@@ -21,7 +21,6 @@
    |          =>³ refers to a fresh root capability in the result type of method mapd
    |          ^   refers to a root capability associated with the result type of (ref: LazyRef[A]^{io}, f: A => B): LazyRef[B]^
    |
-   |
    |Note that the existential capture root in LazyRef[B]^
    |cannot subsume the capability f1.type since that capability is not a SharedCapability
    |
diff --git a/tests/neg-custom-args/captures/i21614.check b/tests/neg-custom-args/captures/i21614.check
@@ -16,7 +16,6 @@
    |where:    =>  refers to a fresh root capability created in method mkLoggers2 when checking argument to parameter f of method map
    |          cap is a root capability associated with the result type of (_$1: box File^{files*}): box Logger{val f: File^{_$1}}^{cap.rd, _$1}
    |
-   |
    |Note that reference <cap of (_$1: box File^{files*}): box Logger{val f: File^?}^?>.rd
    |cannot be included in outer capture set ?
    |
diff --git a/tests/neg-custom-args/captures/i21920.check b/tests/neg-custom-args/captures/i21920.check
@@ -7,7 +7,6 @@
    |where:    => refers to a fresh root capability created in value cell when checking argument to parameter f of method open
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference <cap of (): IterableOnce[box File^?]^>
    |cannot be included in outer capture set ?
    |
diff --git a/tests/neg-custom-args/captures/leaking-iterators.check b/tests/neg-custom-args/captures/leaking-iterators.check
@@ -7,7 +7,6 @@
    |where:    => refers to a fresh root capability created in method test when checking argument to parameter op of method usingLogFile
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference log.type
    |cannot be included in outer capture set ?
 57 |    xs.iterator.map: x =>
diff --git a/tests/neg-custom-args/captures/reaches.check b/tests/neg-custom-args/captures/reaches.check
@@ -86,7 +86,6 @@
    |                  where:    ^  refers to the universal root capability
    |                            ^² refers to a root capability associated with the result type of (x: File^): File^²
    |
-   |
    |                  Note that the existential capture root in File^
    |                  cannot subsume the capability x.type since that capability is not a SharedCapability
    |
diff --git a/tests/neg-custom-args/captures/scoped-caps.check b/tests/neg-custom-args/captures/scoped-caps.check
@@ -19,7 +19,6 @@
   |                                   ^² refers to a fresh root capability in the type of value g
   |                                   ^³ refers to a root capability associated with the result type of (x: A^): B^³
   |
-  |
   |                         Note that the existential capture root in B^
   |                         cannot subsume the capability cap
   |
@@ -54,7 +53,6 @@
    |                        where:    ^  refers to the universal root capability
    |                                  ^² refers to a root capability associated with the result type of (x: A^): B^²
    |
-   |
    |                        Note that the existential capture root in B^
    |                        cannot subsume the capability x.type since that capability is not a SharedCapability
    |
@@ -69,7 +67,6 @@
    |                         ^²  refers to a root capability associated with the result type of (x: S^{cap.rd}): B^²
    |                         cap is the universal root capability
    |
-   |
    |               Note that the existential capture root in B^
    |               cannot subsume the capability cap
    |
diff --git a/tests/neg-custom-args/captures/simple-using.check b/tests/neg-custom-args/captures/simple-using.check
@@ -7,7 +7,6 @@
   |where:    => refers to a fresh root capability created in method test when checking argument to parameter op of method usingLogFile
   |          ^  refers to the universal root capability
   |
-  |
   |Note that reference f.type
   |cannot be included in outer capture set ?
   |
diff --git a/tests/neg-custom-args/captures/try.check b/tests/neg-custom-args/captures/try.check
@@ -39,7 +39,6 @@
    |where:    => refers to a fresh root capability created in value xx when checking argument to parameter op of method handle
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference x.type
    |cannot be included in outer capture set ?
 36 |    (x: CanThrow[Exception]) =>
@@ -58,7 +57,6 @@
    |where:    => refers to a fresh root capability created in value global when checking argument to parameter op of method handle
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference x.type
    |cannot be included in outer capture set ?
 48 |  (x: CanThrow[Exception]) =>
diff --git a/tests/neg-custom-args/captures/usingLogFile.check b/tests/neg-custom-args/captures/usingLogFile.check
@@ -7,7 +7,6 @@
    |where:    => refers to a fresh root capability created in value later when checking argument to parameter op of method usingLogFile
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference f.type
    |cannot be included in outer capture set ?
    |
@@ -21,7 +20,6 @@
    |where:    => refers to a fresh root capability created in value later2 when checking argument to parameter op of method usingLogFile
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference f.type
    |cannot be included in outer capture set ?
    |
@@ -35,7 +33,6 @@
    |where:    => refers to a fresh root capability created in value later when checking argument to parameter op of method usingFile
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference f.type
    |cannot be included in outer capture set ?
    |
@@ -49,7 +46,6 @@
    |where:    => refers to a fresh root capability created in value later when checking argument to parameter op of method usingFile
    |          ^  refers to the universal root capability
    |
-   |
    |Note that reference _$1.type
    |cannot be included in outer capture set ?
    |
diff --git a/tests/neg-custom-args/captures/vars.check b/tests/neg-custom-args/captures/vars.check
@@ -27,7 +27,6 @@
    |
    |        where:    ^ refers to the universal root capability
    |
-   |
    |        Note that reference cap3.type
    |        cannot be included in outer capture set ?
 37 |    def g(x: String): String = if cap3 == cap3 then "" else "a"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`\| where: ^ refers to a fresh root capability in the type of value y`
`20`	`20`	`\| ^² refers to a root capability associated with the result type of (x: A): B^²`
`21`	`21`	`\|`
`22`		`- \|`
`23`	`22`	`\| Note that the existential capture root in B^`
`24`	`23`	`\| cannot subsume the capability cap`
`25`	`24`	`\|`
`@@ -45,7 +44,6 @@`
`45`	`44`	`\| where: ^ refers to a fresh root capability in the type of value y`
`46`	`45`	`\| ^² refers to a root capability associated with the result type of (x: A): B^²`
`47`	`46`	`\|`
`48`		`- \|`
`49`	`47`	`\| Note that the existential capture root in B^`
`50`	`48`	`\| cannot subsume the capability cap`
`51`	`49`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`\|where: ?=> refers to a fresh root capability created in method fail4 when checking argument to parameter body of method make`
`25`	`25`	`\| ^ refers to the universal root capability`
`26`	`26`	`\|`
`27`		`- \|`
`28`	`27`	`\|Note that reference contextual$9.type`
`29`	`28`	`\|cannot be included in outer capture set ?`
`30`	`29`	`70 \| fr.await.ok`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`\|where: => refers to a root capability associated with the result type of (using l: scala.caps.Capability^{cap.rd}): (f: File^{l}) => Unit`
`8`	`8`	`\| cap is the universal root capability`
`9`	`9`	`\|`
`10`		`- \|`
`11`	`10`	`\|Note that reference l.type`
`12`	`11`	`\|cannot be included in outer capture set ? of parameter f`
`13`	`12`	`16 \| val o = Service()`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`\| cap is the universal root capability`
`9`	`9`	`\| cap² is a root capability associated with the result type of (x$0: Cap^{lcap}): box Id[box Cap^{cap².rd}]^?`
`10`	`10`	`\|`
`11`		`- \|`
`12`	`11`	`\|Note that reference <cap of (x$0: Cap^{lcap}): box Id[box Cap^{cap.rd}]^?>.rd`
`13`	`12`	`\|cannot be included in outer capture set ?`
`14`	`13`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`\| ^ refers to the universal root capability`
`10`	`10`	`\| ^² refers to a root capability associated with the result type of (): box Id[box Cap^²]^?`
`11`	`11`	`\|`
`12`		`- \|`
`13`	`12`	`\|Note that reference <cap of (): box Id[box Cap^]^?>`
`14`	`13`	`\|cannot be included in outer capture set ?`
`15`	`14`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`\|where: => refers to a fresh root capability created in value leak when checking argument to parameter op of method withCap`
`8`	`8`	`\| ^ refers to the universal root capability`
`9`	`9`	`\|`
`10`		`- \|`
`11`	`10`	`\|Note that reference lcap.type`
`12`	`11`	`\|cannot be included in outer capture set ?`
`13`	`12`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`\| =>³ refers to a fresh root capability in the result type of method mapd`
`22`	`22`	`\| ^ refers to a root capability associated with the result type of (ref: LazyRef[A]^{io}, f: A => B): LazyRef[B]^`
`23`	`23`	`\|`
`24`		`- \|`
`25`	`24`	`\|Note that the existential capture root in LazyRef[B]^`
`26`	`25`	`\|cannot subsume the capability f1.type since that capability is not a SharedCapability`
`27`	`26`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`\|where: => refers to a fresh root capability created in method mkLoggers2 when checking argument to parameter f of method map`
`17`	`17`	`\| cap is a root capability associated with the result type of (_$1: box File^{files*}): box Logger{val f: File^{_$1}}^{cap.rd, _$1}`
`18`	`18`	`\|`
`19`		`- \|`
`20`	`19`	`\|Note that reference <cap of (_$1: box File^{files*}): box Logger{val f: File^?}^?>.rd`
`21`	`20`	`\|cannot be included in outer capture set ?`
`22`	`21`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@`
`86`	`86`	`\| where: ^ refers to the universal root capability`
`87`	`87`	`\| ^² refers to a root capability associated with the result type of (x: File^): File^²`
`88`	`88`	`\|`
`89`		`- \|`
`90`	`89`	`\| Note that the existential capture root in File^`
`91`	`90`	`\| cannot subsume the capability x.type since that capability is not a SharedCapability`
`92`	`91`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`\|`
`28`	`28`	`\| where: ^ refers to the universal root capability`
`29`	`29`	`\|`
`30`		`- \|`
`31`	`30`	`\| Note that reference cap3.type`
`32`	`31`	`\| cannot be included in outer capture set ?`
`33`	`32`	`37 \| def g(x: String): String = if cap3 == cap3 then "" else "a"`