Fixed CAPTURED_IN_CLOSURE marker for primary constructor argument

#KT-7131 Fixed
This commit is contained in:
Stanislav Erokhin
2015-03-31 21:47:03 +03:00
parent 9247f4f096
commit 4efb0dbf9a
4 changed files with 85 additions and 18 deletions
@@ -0,0 +1,52 @@
trait T
class T1(<warning>t</warning>: Int): T
inline fun <T> run(f: () -> T) = f()
class Delegate(<warning>d</warning>: Int) {
fun get(k: Any, m: PropertyMetadata) {}
}
class A(y: Int, t: Int, d: Int): T <info>by</info> T1(t) {
val <info>a</info> = y
val b <info>by</info> Delegate(d)
}
class A2<T>(x: Int, y: Int, t: T) {
val <info>t1</info>: T = t
val <info>x1</info> = run { x }
<info>init</info> {
run {
y
}
}
}
//captured
class B(
<info descr="Value captured in a closure">x</info>: Int,
<info descr="Value captured in a closure">y</info>: Int,
<info descr="Value captured in a closure">t</info>: Int,
<info descr="Value captured in a closure">d</info>: Int
) {
<info>init</info> {
class C(<warning>a</warning>: Int = <info>x</info>): T <info>by</info> T1(<info>t</info>) {
val <info>a</info> = <info>y</info>
val b <info>by</info> Delegate(<info>d</info>)
}
}
}
class B2(<info descr="Value captured in a closure">x</info>: Int, <info descr="Value captured in a closure">y</info>: Int) {
val <info>x1</info> = { <info>x</info> }()
<info>init</info> {
{
<info>y</info>
}()
}
}
@@ -42,12 +42,12 @@
<info>open</info> class Super(<warning>i</warning> : Int)
class TestPCParameters(<info>w</info> : Int, <warning>x</warning> : Int, val <info>y</info> : Int, var <info>z</info> : Int) : Super(<info>w</info>) {
class TestPCParameters(w : Int, <warning>x</warning> : Int, val <info>y</info> : Int, var <info>z</info> : Int) : Super(w) {
val <info>xx</info> = <info descr="Value captured in a closure">w</info>
val <info>xx</info> = w
<info>init</info> {
<info>w</info> + 1
w + 1
}
fun foo() = <error>x</error>