azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests by adding missing 'init' keywords to testdata

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-27 13:23:15 +02:00
parent 98b8784ab0
commit f93eeeb563
130 changed files with 277 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg-variables/basic/InitializedNotDeclared.instructions
+1 -1
View File
@@ -1,6 +1,6 @@
== A == == A ==
class A { class A {
{ init {
x = 1 x = 1
} }
val x: Int val x: Int
compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A { class A {
{ init {
x = 1 x = 1
} }
val x: Int val x: Int
compiler/testData/cfg-variables/basic/InitializedNotDeclared.values
+1 -1
View File
@@ -1,6 +1,6 @@
== A == == A ==
class A { class A {
{ init {
x = 1 x = 1
} }
val x: Int val x: Int
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.instructions
+15 -15
View File
@@ -69,7 +69,7 @@ sink:
== TestObjectLiteral == == TestObjectLiteral ==
class TestObjectLiteral { class TestObjectLiteral {
val obj: A = object: A(obj) { val obj: A = object: A(obj) {
{ init {
val x = obj val x = obj
} }
fun foo() { fun foo() {
@@ -79,29 +79,29 @@ class TestObjectLiteral {
} }
--------------------- ---------------------
L0: L0:
1 <START> INIT: in: {} out: {} 1 <START> INIT: in: {} out: {}
v(val obj: A = object: A(obj) { { val x = obj } fun foo() { val y = obj } }) INIT: in: {} out: {obj=D} v(val obj: A = object: A(obj) { init { val x = obj } fun foo() { val y = obj } }) INIT: in: {} out: {obj=D}
mark(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) INIT: in: {obj=D} out: {obj=D} mark(object: A(obj) { init { val x = obj } fun foo() { val y = obj } }) INIT: in: {obj=D} out: {obj=D}
magic[IMPLICIT_RECEIVER](obj) -> <v0> magic[IMPLICIT_RECEIVER](obj) -> <v0>
r(obj|<v0>) -> <v1> r(obj|<v0>) -> <v1>
mark(A(obj)) mark(A(obj))
call(A(obj), <init>|<v1>) -> <v2> call(A(obj), <init>|<v1>) -> <v2>
2 mark({ val x = obj }) 2 mark({ val x = obj })
v(val x = obj) INIT: in: {obj=D} out: {obj=D, x=D} v(val x = obj) INIT: in: {obj=D} out: {obj=D, x=D}
magic[IMPLICIT_RECEIVER](obj) -> <v3> INIT: in: {obj=D, x=D} out: {obj=D, x=D} magic[IMPLICIT_RECEIVER](obj) -> <v3> INIT: in: {obj=D, x=D} out: {obj=D, x=D}
r(obj|<v3>) -> <v4> r(obj|<v3>) -> <v4>
w(x|<v4>) INIT: in: {obj=D, x=D} out: {obj=D, x=ID} w(x|<v4>) INIT: in: {obj=D, x=D} out: {obj=D, x=ID}
1 jmp?(L2) INIT: in: {obj=D} out: {obj=D} 1 jmp?(L2) INIT: in: {obj=D} out: {obj=D}
d(fun foo() { val y = obj }) USE: in: {obj=READ} out: {obj=READ} d(fun foo() { val y = obj }) USE: in: {obj=READ} out: {obj=READ}
L2 [after local declaration]: L2 [after local declaration]:
r(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) -> <v5> r(object: A(obj) { init { val x = obj } fun foo() { val y = obj } }) -> <v5>
w(obj|<v5>) INIT: in: {obj=D} out: {obj=ID} w(obj|<v5>) INIT: in: {obj=D} out: {obj=ID}
L1: L1:
<END> INIT: in: {obj=ID} out: {obj=ID} <END> INIT: in: {obj=ID} out: {obj=ID}
error: error:
<ERROR> INIT: in: {} out: {} <ERROR> INIT: in: {} out: {}
sink: sink:
<SINK> INIT: in: {obj=D} out: {obj=D} USE: in: {} out: {} <SINK> INIT: in: {obj=D} out: {obj=D} USE: in: {} out: {}
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
@@ -142,4 +142,4 @@ error:
<ERROR> INIT: in: {} out: {} <ERROR> INIT: in: {} out: {}
sink: sink:
<SINK> INIT: in: {x=ID} out: {x=ID} USE: in: {} out: {} <SINK> INIT: in: {x=ID} out: {x=ID} USE: in: {} out: {}
===================== =====================
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt
+1 -1
View File
@@ -8,7 +8,7 @@ open class A(val a: A)
class TestObjectLiteral { class TestObjectLiteral {
val obj: A = object: A(obj) { val obj: A = object: A(obj) {
{ init {
val x = obj val x = obj
} }
fun foo() { fun foo() {
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.values
+7 -7
View File
@@ -31,7 +31,7 @@ open class A(val a: A)
== TestObjectLiteral == == TestObjectLiteral ==
class TestObjectLiteral { class TestObjectLiteral {
val obj: A = object: A(obj) { val obj: A = object: A(obj) {
{ init {
val x = obj val x = obj
} }
fun foo() { fun foo() {
@@ -40,12 +40,12 @@ class TestObjectLiteral {
} }
} }
--------------------- ---------------------
<v0>: TestObjectLiteral NEW: magic[IMPLICIT_RECEIVER](obj) -> <v0> <v0>: TestObjectLiteral NEW: magic[IMPLICIT_RECEIVER](obj) -> <v0>
<v3>: TestObjectLiteral NEW: magic[IMPLICIT_RECEIVER](obj) -> <v3> <v3>: TestObjectLiteral NEW: magic[IMPLICIT_RECEIVER](obj) -> <v3>
obj <v1>: {<: A} NEW: r(obj|<v0>) -> <v1> obj <v1>: {<: A} NEW: r(obj|<v0>) -> <v1>
A(obj) <v2>: * NEW: call(A(obj), <init>|<v1>) -> <v2> A(obj) <v2>: * NEW: call(A(obj), <init>|<v1>) -> <v2>
obj <v4>: {<: A} NEW: r(obj|<v3>) -> <v4> obj <v4>: {<: A} NEW: r(obj|<v3>) -> <v4>
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v5>: {<: A} NEW: r(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) -> <v5> object: A(obj) { init { val x = obj } fun foo() { val y = obj } } <v5>: {<: A} NEW: r(object: A(obj) { init { val x = obj } fun foo() { val y = obj } }) -> <v5>
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
compiler/testData/cfg-variables/lexicalScopes/localClass.instructions
+15 -15
View File
@@ -2,7 +2,7 @@
fun foo() { fun foo() {
"before" "before"
class A(val x: Int) { class A(val x: Int) {
{ init {
val a = x val a = x
} }
fun foo() { fun foo() {
@@ -13,29 +13,29 @@ fun foo() {
} }
--------------------- ---------------------
L0: L0:
1 <START> INIT: in: {} out: {} 1 <START> INIT: in: {} out: {}
2 mark({ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" }) 2 mark({ "before" class A(val x: Int) { init { val a = x } fun foo() { val b = x } } "after" })
mark("before") mark("before")
r("before") -> <v0> r("before") -> <v0>
v(val x: Int) INIT: in: {} out: {x=D} v(val x: Int) INIT: in: {} out: {x=D}
magic[FAKE_INITIALIZER](val x: Int) -> <v1> INIT: in: {x=D} out: {x=D} magic[FAKE_INITIALIZER](val x: Int) -> <v1> INIT: in: {x=D} out: {x=D}
w(x|<v1>) INIT: in: {x=D} out: {x=ID} w(x|<v1>) INIT: in: {x=D} out: {x=ID}
3 mark({ val a = x }) INIT: in: {x=ID} out: {x=ID} 3 mark({ val a = x }) INIT: in: {x=ID} out: {x=ID}
v(val a = x) INIT: in: {x=ID} out: {a=D, x=ID} v(val a = x) INIT: in: {x=ID} out: {a=D, x=ID}
magic[IMPLICIT_RECEIVER](x) -> <v2> INIT: in: {a=D, x=ID} out: {a=D, x=ID} magic[IMPLICIT_RECEIVER](x) -> <v2> INIT: in: {a=D, x=ID} out: {a=D, x=ID}
r(x|<v2>) -> <v3> r(x|<v2>) -> <v3>
w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID} w(a|<v3>) INIT: in: {a=D, x=ID} out: {a=ID, x=ID}
2 jmp?(L2) INIT: in: {x=ID} out: {x=ID} 2 jmp?(L2) INIT: in: {x=ID} out: {x=ID}
d(fun foo() { val b = x }) USE: in: {x=READ} out: {x=READ} d(fun foo() { val b = x }) USE: in: {x=READ} out: {x=READ}
L2 [after local declaration]: L2 [after local declaration]:
mark("after") mark("after")
r("after") -> <v4> r("after") -> <v4>
L1: L1:
1 <END> INIT: in: {} out: {} 1 <END> INIT: in: {} out: {}
error: error:
<ERROR> <ERROR>
sink: sink:
<SINK> USE: in: {} out: {} <SINK> USE: in: {} out: {}
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
@@ -55,4 +55,4 @@ error:
<ERROR> <ERROR>
sink: sink:
<SINK> USE: in: {} out: {} <SINK> USE: in: {} out: {}
===================== =====================
compiler/testData/cfg-variables/lexicalScopes/localClass.kt
+1 -1
View File
@@ -1,7 +1,7 @@
fun foo() { fun foo() {
"before" "before"
class A(val x: Int) { class A(val x: Int) {
{ init {
val a = x val a = x
} }
fun foo() { fun foo() {
compiler/testData/cfg-variables/lexicalScopes/localClass.values
+7 -7
View File
@@ -2,7 +2,7 @@
fun foo() { fun foo() {
"before" "before"
class A(val x: Int) { class A(val x: Int) {
{ init {
val a = x val a = x
} }
fun foo() { fun foo() {
@@ -12,12 +12,12 @@ fun foo() {
"after" "after"
} }
--------------------- ---------------------
<v1>: Int NEW: magic[FAKE_INITIALIZER](val x: Int) -> <v1> <v1>: Int NEW: magic[FAKE_INITIALIZER](val x: Int) -> <v1>
<v2>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v2> <v2>: A NEW: magic[IMPLICIT_RECEIVER](x) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0> "before" <v0>: * NEW: r("before") -> <v0>
x <v3>: Int NEW: r(x|<v2>) -> <v3> x <v3>: Int NEW: r(x|<v2>) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4> "after" <v4>: * NEW: r("after") -> <v4>
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY { "before" class A(val x: Int) { init { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
compiler/testData/cfg-variables/lexicalScopes/localObject.instructions
+9 -9
View File
@@ -2,7 +2,7 @@
fun foo() { fun foo() {
"before" "before"
object A { object A {
{ init {
val a = 1 val a = 1
} }
fun foo() { fun foo() {
@@ -13,15 +13,15 @@ fun foo() {
} }
--------------------- ---------------------
L0: L0:
1 <START> INIT: in: {} out: {} 1 <START> INIT: in: {} out: {}
2 mark({ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" }) 2 mark({ "before" object A { init { val a = 1 } fun foo() { val b = 2 } } "after" })
mark("before") mark("before")
r("before") -> <v0> r("before") -> <v0>
3 mark({ val a = 1 }) 3 mark({ val a = 1 })
v(val a = 1) INIT: in: {} out: {a=D} v(val a = 1) INIT: in: {} out: {a=D}
r(1) -> <v1> INIT: in: {a=D} out: {a=D} r(1) -> <v1> INIT: in: {a=D} out: {a=D}
w(a|<v1>) INIT: in: {a=D} out: {a=ID} w(a|<v1>) INIT: in: {a=D} out: {a=ID}
2 jmp?(L2) INIT: in: {} out: {} 2 jmp?(L2) INIT: in: {} out: {}
d(fun foo() { val b = 2 }) d(fun foo() { val b = 2 })
L2 [after local declaration]: L2 [after local declaration]:
mark("after") mark("after")
@@ -31,7 +31,7 @@ L1:
error: error:
<ERROR> <ERROR>
sink: sink:
<SINK> USE: in: {} out: {} <SINK> USE: in: {} out: {}
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
@@ -50,4 +50,4 @@ error:
<ERROR> <ERROR>
sink: sink:
<SINK> USE: in: {} out: {} <SINK> USE: in: {} out: {}
===================== =====================
compiler/testData/cfg-variables/lexicalScopes/localObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
fun foo() { fun foo() {
"before" "before"
object A { object A {
{ init {
val a = 1 val a = 1
} }
fun foo() { fun foo() {
compiler/testData/cfg-variables/lexicalScopes/localObject.values
+5 -5
View File
@@ -2,7 +2,7 @@
fun foo() { fun foo() {
"before" "before"
object A { object A {
{ init {
val a = 1 val a = 1
} }
fun foo() { fun foo() {
@@ -12,10 +12,10 @@ fun foo() {
"after" "after"
} }
--------------------- ---------------------
"before" <v0>: * NEW: r("before") -> <v0> "before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1> 1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2> "after" <v2>: * NEW: r("after") -> <v2>
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY { "before" object A { init { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.instructions
+14 -14
View File
@@ -2,7 +2,7 @@
fun foo() { fun foo() {
"before" "before"
val bar = object { val bar = object {
{ init {
val x = 1 val x = 1
} }
fun foo() { fun foo() {
@@ -13,29 +13,29 @@ fun foo() {
} }
--------------------- ---------------------
L0: L0:
1 <START> INIT: in: {} out: {} 1 <START> INIT: in: {} out: {}
2 mark({ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" }) 2 mark({ "before" val bar = object { init { val x = 1 } fun foo() { val a = 2 } } "after" })
mark("before") mark("before")
r("before") -> <v0> r("before") -> <v0>
v(val bar = object { { val x = 1 } fun foo() { val a = 2 } }) INIT: in: {} out: {bar=D} v(val bar = object { init { val x = 1 } fun foo() { val a = 2 } }) INIT: in: {} out: {bar=D}
mark(object { { val x = 1 } fun foo() { val a = 2 } }) INIT: in: {bar=D} out: {bar=D} mark(object { init { val x = 1 } fun foo() { val a = 2 } }) INIT: in: {bar=D} out: {bar=D}
3 mark({ val x = 1 }) 3 mark({ val x = 1 })
v(val x = 1) INIT: in: {bar=D} out: {bar=D, x=D} v(val x = 1) INIT: in: {bar=D} out: {bar=D, x=D}
r(1) -> <v1> INIT: in: {bar=D, x=D} out: {bar=D, x=D} r(1) -> <v1> INIT: in: {bar=D, x=D} out: {bar=D, x=D}
w(x|<v1>) INIT: in: {bar=D, x=D} out: {bar=D, x=ID} w(x|<v1>) INIT: in: {bar=D, x=D} out: {bar=D, x=ID}
2 jmp?(L2) INIT: in: {bar=D} out: {bar=D} 2 jmp?(L2) INIT: in: {bar=D} out: {bar=D}
d(fun foo() { val a = 2 }) d(fun foo() { val a = 2 })
L2 [after local declaration]: L2 [after local declaration]:
r(object { { val x = 1 } fun foo() { val a = 2 } }) -> <v2> r(object { init { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
w(bar|<v2>) INIT: in: {bar=D} out: {bar=ID} w(bar|<v2>) INIT: in: {bar=D} out: {bar=ID}
mark("after") INIT: in: {bar=ID} out: {bar=ID} mark("after") INIT: in: {bar=ID} out: {bar=ID}
r("after") -> <v3> r("after") -> <v3>
L1: L1:
1 <END> INIT: in: {} out: {} 1 <END> INIT: in: {} out: {}
error: error:
<ERROR> <ERROR>
sink: sink:
<SINK> USE: in: {} out: {} <SINK> USE: in: {} out: {}
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt
+1 -1
View File
@@ -1,7 +1,7 @@
fun foo() { fun foo() {
"before" "before"
val bar = object { val bar = object {
{ init {
val x = 1 val x = 1
} }
fun foo() { fun foo() {
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.values
+6 -6
View File
@@ -2,7 +2,7 @@
fun foo() { fun foo() {
"before" "before"
val bar = object { val bar = object {
{ init {
val x = 1 val x = 1
} }
fun foo() { fun foo() {
@@ -12,11 +12,11 @@ fun foo() {
"after" "after"
} }
--------------------- ---------------------
"before" <v0>: * NEW: r("before") -> <v0> "before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1> 1 <v1>: Int NEW: r(1) -> <v1>
object { { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW: r(object { { val x = 1 } fun foo() { val a = 2 } }) -> <v2> object { init { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW: r(object { init { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3> "after" <v3>: * NEW: r("after") -> <v3>
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY { "before" val bar = object { init { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.instructions
+2 -2
View File
@@ -3,14 +3,14 @@ class AnonymousInitializers() {
val k = 34 val k = 34
val i: Int val i: Int
{ init {
$i = 12 $i = 12
} }
val j: Int val j: Int
get() = 20 get() = 20
{ init {
$i = 13 $i = 13
} }
} }
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt
+2 -2
View File
@@ -2,14 +2,14 @@ class AnonymousInitializers() {
val k = 34 val k = 34
val i: Int val i: Int
{ init {
$i = 12 $i = 12
} }
val j: Int val j: Int
get() = 20 get() = 20
{ init {
$i = 13 $i = 13
} }
} }
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.values
+2 -2
View File
@@ -3,14 +3,14 @@ class AnonymousInitializers() {
val k = 34 val k = 34
val i: Int val i: Int
{ init {
$i = 12 $i = 12
} }
val j: Int val j: Int
get() = 20 get() = 20
{ init {
$i = 13 $i = 13
} }
} }
compiler/testData/cfg/declarations/local/LocalDeclarations.instructions
+32 -32
View File
@@ -5,7 +5,7 @@ class C() {
companion object { companion object {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
@@ -50,7 +50,7 @@ sink:
fun test1() { fun test1() {
val a = object { val a = object {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
} }
@@ -58,27 +58,27 @@ fun test1() {
--------------------- ---------------------
L0: L0:
1 <START> 1 <START>
2 mark({ val a = object { val x : Int { $x = 1 } } }) 2 mark({ val a = object { val x : Int init { $x = 1 } } })
v(val a = object { val x : Int { $x = 1 } }) v(val a = object { val x : Int init { $x = 1 } })
mark(object { val x : Int { $x = 1 } }) mark(object { val x : Int init { $x = 1 } })
v(val x : Int) v(val x : Int)
3 mark({ $x = 1 }) 3 mark({ $x = 1 })
magic[IMPLICIT_RECEIVER]($x) -> <v0> magic[IMPLICIT_RECEIVER]($x) -> <v0>
r(1) -> <v1> r(1) -> <v1>
w($x|<v0>, <v1>) w($x|<v0>, <v1>)
2 r(object { val x : Int { $x = 1 } }) -> <v3> 2 r(object { val x : Int init { $x = 1 } }) -> <v3>
w(a|<v3>) w(a|<v3>)
L1: L1:
1 <END> NEXT:[<SINK>] 1 <END> NEXT:[<SINK>]
error: error:
<ERROR> PREV:[] <ERROR> PREV:[]
sink: sink:
<SINK> PREV:[<ERROR>, <END>] <SINK> PREV:[<ERROR>, <END>]
===================== =====================
== O == == O ==
object O { object O {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
} }
@@ -176,7 +176,7 @@ fun test4() {
val a = object { val a = object {
val x : Int val x : Int
val y : Int val y : Int
{ init {
$x = 1 $x = 1
} }
fun ggg() { fun ggg() {
@@ -187,26 +187,26 @@ fun test4() {
--------------------- ---------------------
L0: L0:
1 <START> 1 <START>
2 mark({ val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } }) 2 mark({ val a = object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } } })
v(val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) v(val a = object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } })
mark(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) mark(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } })
v(val x : Int) v(val x : Int)
v(val y : Int) v(val y : Int)
3 mark({ $x = 1 }) 3 mark({ $x = 1 })
magic[IMPLICIT_RECEIVER]($x) -> <v0> magic[IMPLICIT_RECEIVER]($x) -> <v0>
r(1) -> <v1> r(1) -> <v1>
w($x|<v0>, <v1>) w($x|<v0>, <v1>)
2 jmp?(L2) NEXT:[r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v3>, d(fun ggg() { y = 10 })] 2 jmp?(L2) NEXT:[r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3>, d(fun ggg() { y = 10 })]
d(fun ggg() { y = 10 }) NEXT:[<SINK>] d(fun ggg() { y = 10 }) NEXT:[<SINK>]
L2 [after local declaration]: L2 [after local declaration]:
r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v3> PREV:[jmp?(L2)] r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3> PREV:[jmp?(L2)]
w(a|<v3>) w(a|<v3>)
L1: L1:
1 <END> NEXT:[<SINK>] 1 <END> NEXT:[<SINK>]
error: error:
<ERROR> PREV:[] <ERROR> PREV:[]
sink: sink:
<SINK> PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 })] <SINK> PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 })]
===================== =====================
== ggg == == ggg ==
fun ggg() { fun ggg() {
@@ -230,7 +230,7 @@ sink:
fun test5() { fun test5() {
val a = object { val a = object {
var x = 1 var x = 1
{ init {
$x = 2 $x = 2
} }
fun foo() { fun foo() {
@@ -244,9 +244,9 @@ fun test5() {
--------------------- ---------------------
L0: L0:
1 <START> 1 <START>
2 mark({ val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } }) 2 mark({ val a = object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } })
v(val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) v(val a = object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
mark(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) mark(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
v(var x = 1) v(var x = 1)
r(1) -> <v0> r(1) -> <v0>
w(x|<v0>) w(x|<v0>)
@@ -254,20 +254,20 @@ L0:
magic[IMPLICIT_RECEIVER]($x) -> <v1> magic[IMPLICIT_RECEIVER]($x) -> <v1>
r(2) -> <v2> r(2) -> <v2>
w($x|<v1>, <v2>) w($x|<v1>, <v2>)
2 jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })] 2 jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })]
d(fun foo() { x = 3 }) NEXT:[<SINK>] d(fun foo() { x = 3 }) NEXT:[<SINK>]
L2 [after local declaration]: L2 [after local declaration]:
jmp?(L5) NEXT:[r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>, d(fun bar() { x = 4 })] PREV:[jmp?(L2)] jmp?(L5) NEXT:[r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>, d(fun bar() { x = 4 })] PREV:[jmp?(L2)]
d(fun bar() { x = 4 }) NEXT:[<SINK>] d(fun bar() { x = 4 }) NEXT:[<SINK>]
L5 [after local declaration]: L5 [after local declaration]:
r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4> PREV:[jmp?(L5)] r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4> PREV:[jmp?(L5)]
w(a|<v4>) w(a|<v4>)
L1: L1:
1 <END> NEXT:[<SINK>] 1 <END> NEXT:[<SINK>]
error: error:
<ERROR> PREV:[] <ERROR> PREV:[]
sink: sink:
<SINK> PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }), d(fun bar() { x = 4 })] <SINK> PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }), d(fun bar() { x = 4 })]
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
compiler/testData/cfg/declarations/local/LocalDeclarations.kt
+5 -5
View File
@@ -4,7 +4,7 @@ class C() {
companion object { companion object {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
@@ -21,7 +21,7 @@ fun doSmth(i: Int) {}
fun test1() { fun test1() {
val a = object { val a = object {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
} }
@@ -29,7 +29,7 @@ fun test1() {
object O { object O {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
} }
@@ -52,7 +52,7 @@ fun test4() {
val a = object { val a = object {
val x : Int val x : Int
val y : Int val y : Int
{ init {
$x = 1 $x = 1
} }
fun ggg() { fun ggg() {
@@ -64,7 +64,7 @@ fun test4() {
fun test5() { fun test5() {
val a = object { val a = object {
var x = 1 var x = 1
{ init {
$x = 2 $x = 2
} }
fun foo() { fun foo() {
compiler/testData/cfg/declarations/local/LocalDeclarations.values
+21 -21
View File
@@ -5,7 +5,7 @@ class C() {
companion object { companion object {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
@@ -28,22 +28,22 @@ fun doSmth(i: Int) {}
fun test1() { fun test1() {
val a = object { val a = object {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
} }
} }
--------------------- ---------------------
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0> <v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1> 1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: * $x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY { $x = 1 } !<v2>: * COPY
object { val x : Int { $x = 1 } } <v3>: <no name provided> NEW: r(object { val x : Int { $x = 1 } }) -> <v3> object { val x : Int init { $x = 1 } } <v3>: <no name provided> NEW: r(object { val x : Int init { $x = 1 } }) -> <v3>
===================== =====================
== O == == O ==
object O { object O {
val x : Int val x : Int
{ init {
$x = 1 $x = 1
} }
} }
@@ -92,7 +92,7 @@ fun test4() {
val a = object { val a = object {
val x : Int val x : Int
val y : Int val y : Int
{ init {
$x = 1 $x = 1
} }
fun ggg() { fun ggg() {
@@ -101,11 +101,11 @@ fun test4() {
} }
} }
--------------------- ---------------------
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0> <v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1> 1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: * $x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY { $x = 1 } !<v2>: * COPY
object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } <v3>: <no name provided> NEW: r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v3> object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } } <v3>: <no name provided> NEW: r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3>
===================== =====================
== ggg == == ggg ==
fun ggg() { fun ggg() {
@@ -121,7 +121,7 @@ y = 10 !<v2>: *
fun test5() { fun test5() {
val a = object { val a = object {
var x = 1 var x = 1
{ init {
$x = 2 $x = 2
} }
fun foo() { fun foo() {
@@ -133,12 +133,12 @@ fun test5() {
} }
} }
--------------------- ---------------------
<v1>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v1> <v1>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0> 1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2> 2 <v2>: Int NEW: r(2) -> <v2>
$x = 2 !<v3>: * $x = 2 !<v3>: *
{ $x = 2 } !<v3>: * COPY { $x = 2 } !<v3>: * COPY
object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v4>: <no name provided> NEW: r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4> object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v4>: <no name provided> NEW: r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
compiler/testData/cfg/declarations/properties/backingFieldAccess.instructions
+1 -1
View File
@@ -3,7 +3,7 @@ class C {
val a: Int val a: Int
get() = 1 get() = 1
{ init {
$a $a
} }
} }
compiler/testData/cfg/declarations/properties/backingFieldAccess.kt
+1 -1
View File
@@ -2,7 +2,7 @@ class C {
val a: Int val a: Int
get() = 1 get() = 1
{ init {
$a $a
} }
} }
compiler/testData/cfg/declarations/properties/backingFieldAccess.values
+1 -1
View File
@@ -3,7 +3,7 @@ class C {
val a: Int val a: Int
get() = 1 get() = 1
{ init {
$a $a
} }
} }
compiler/testData/cfg/expressions/chainedQualifiedExpression.instructions
+1 -1
View File
@@ -12,7 +12,7 @@ sink:
===================== =====================
== JetKeywordCompletionContributor == == JetKeywordCompletionContributor ==
public open class JetKeywordCompletionContributor() { public open class JetKeywordCompletionContributor() {
{ init {
val inTopLevel = 1.0 val inTopLevel = 1.0
BunchKeywordRegister() BunchKeywordRegister()
compiler/testData/cfg/expressions/chainedQualifiedExpression.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
class JetToken class JetToken
public open class JetKeywordCompletionContributor() { public open class JetKeywordCompletionContributor() {
{ init {
val inTopLevel = 1.0 val inTopLevel = 1.0
BunchKeywordRegister() BunchKeywordRegister()
compiler/testData/cfg/expressions/chainedQualifiedExpression.values
+1 -1
View File
@@ -4,7 +4,7 @@ class JetToken
===================== =====================
== JetKeywordCompletionContributor == == JetKeywordCompletionContributor ==
public open class JetKeywordCompletionContributor() { public open class JetKeywordCompletionContributor() {
{ init {
val inTopLevel = 1.0 val inTopLevel = 1.0
BunchKeywordRegister() BunchKeywordRegister()
compiler/testData/resolve/Basic.resolve
+1 -1
View File
@@ -6,7 +6,7 @@
~foo~fun foo(~foo.a~a : `kotlin::Char`Char) = `foo.a`a`:kotlin::Char` ~foo~fun foo(~foo.a~a : `kotlin::Char`Char) = `foo.a`a`:kotlin::Char`
~fooB~fun fooB() = `foo`foo('1')`:kotlin::Char` ~fooB~fun fooB() = `foo`foo('1')`:kotlin::Char`
~foo.1~fun foo() : Int = (1.`kotlin::Int.plus(Int)`plus(1))`:kotlin::Int` ~foo.1~fun foo() : Int = (1.`kotlin::Int.plus(Int)`plus(1))`:kotlin::Int`
~foo1~fun foo1() : `B`B = `B`B()`:B` ~foo91~fun foo1() : `B`B = `B`B()`:B`
~A.a~val a : `kotlin::Int`Int ~A.a~val a : `kotlin::Int`Int
} }
compiler/testData/resolve/Objects.resolve
+1 -1
View File
@@ -18,7 +18,7 @@ object B : A {}
fun f() { fun f() {
~y~val y = object : Foo(`ns.x`x) { ~y~val y = object : Foo(`ns.x`x) {
{ init {
`ns.x`x + 12 `ns.x`x + 12
} }
compiler/testData/resolve/PrimaryConstructorParameters.resolve
+1 -1
View File
@@ -6,7 +6,7 @@ class C(~x~x : Int, ~y~val y : Int) : Base(`x`x /*parameter*/), Base1 by Base1(`
var zy = `y`y // parameter var zy = `y`y // parameter
get() = `y`y // property get() = `y`y // property
{ init {
val wx = `x`x val wx = `x`x
val wy = `y`y val wy = `y`y
} }
compiler/testData/resolve/PrimaryConstructors.resolve
+1 -1
View File
@@ -11,7 +11,7 @@ fun test() {
} }
class Foo(~bar~var bar : Int, ~barr~barr : Int, ~barrr~val barrr : Int) { class Foo(~bar~var bar : Int, ~barr~barr : Int, ~barrr~val barrr : Int) {
{ init {
`bar`bar = 1 `bar`bar = 1
`barr`barr = 1 `barr`barr = 1
`barrr`barrr = 1 `barrr`barrr = 1
idea/idea-completion/testData/basic/common/InClassInitializer.kt
+1 -1
View File
@@ -3,7 +3,7 @@ val testExternal
class Some(testParam : Int) { class Some(testParam : Int) {
private val myVal : Int private val myVal : Int
{ init {
val testing = 12 val testing = 12
myVal = test<caret> myVal = test<caret>
} }
idea/idea-completion/testData/basic/common/InFunInClassInitializer.kt
+1 -1
View File
@@ -1,6 +1,6 @@
val some = 12 val some = 12
class Some(someParam : Int) { class Some(someParam : Int) {
{ init {
fun internalFun(someInternal : Int) : Int { fun internalFun(someInternal : Int) : Int {
return some<caret> return some<caret>
} }
idea/idea-completion/testData/basic/common/InInitializerInPropertyAccessor.kt
+1 -1
View File
@@ -2,7 +2,7 @@ val testGlobal = 12
val test : Int get() { val test : Int get() {
class SomeMore(testParam : Int) { class SomeMore(testParam : Int) {
{ init {
tes<caret> tes<caret>
} }
} }
idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructor.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class A<in I> {
private fun foo(): I = null!! private fun foo(): I = null!!
{ init {
<caret> <caret>
} }
} }
idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructorWithThis.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class A<in I> {
private fun foo(): I = null!! private fun foo(): I = null!!
{ init {
this.<caret> this.<caret>
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer1.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
<caret>class B { <caret>class B {
} }
{ init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer1.kt.after
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: down // MOVE: down
// class A // class A
class A { class A {
{ init {
} }
// class B // class B
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer2.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: up // MOVE: up
// class A // class A
class A { class A {
{ init {
} }
// class B // class B
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer2.kt.after
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
<caret>class B { <caret>class B {
} }
{ init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace1.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: down // MOVE: down
// IS_APPLICABLE: false // IS_APPLICABLE: false
class B { class B {
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace2.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: up // MOVE: up
// IS_APPLICABLE: false // IS_APPLICABLE: false
class B { class B {
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass1.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// MOVE: down // MOVE: down
class A { class A {
<caret>{ <caret>init {
} }
class B { class B {
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass1.kt.after
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: down // MOVE: down
class A { class A {
class B { class B {
<caret>{ <caret>init {
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass2.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class A {
class B { class B {
} }
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass2.kt.after
+1 -1
View File
@@ -2,7 +2,7 @@
class A { class A {
class B { class B {
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt
+2 -2
View File
@@ -1,9 +1,9 @@
// MOVE: down // MOVE: down
class A { class A {
<caret>{ <caret>init {
} }
{ init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt.after
+2 -2
View File
@@ -1,9 +1,9 @@
// MOVE: down // MOVE: down
class A { class A {
{ init {
} }
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt
+2 -2
View File
@@ -1,9 +1,9 @@
// MOVE: up // MOVE: up
class A { class A {
{ init {
} }
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt.after
+2 -2
View File
@@ -1,9 +1,9 @@
// MOVE: up // MOVE: up
class A { class A {
<caret>{ <caret>init {
} }
{ init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine1.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// MOVE: down // MOVE: down
class A { class A {
<caret>{ <caret>init {
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine1.kt.after
+1 -1
View File
@@ -2,7 +2,7 @@
class A { class A {
val y = "" val y = ""
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine2.kt
+1 -1
View File
@@ -2,7 +2,7 @@
class A { class A {
val x = "" val x = ""
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine2.kt.after
+1 -1
View File
@@ -1,6 +1,6 @@
// MOVE: up // MOVE: up
class A { class A {
<caret>{ <caret>init {
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction1.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// MOVE: down // MOVE: down
class A { class A {
<caret>{ <caret>init {
} }
fun foo() { fun foo() {
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction1.kt.after
+1 -1
View File
@@ -3,7 +3,7 @@ class A {
fun foo() { fun foo() {
} }
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction2.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class A {
fun foo() { fun foo() {
} }
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction2.kt.after
+1 -1
View File
@@ -1,6 +1,6 @@
// MOVE: up // MOVE: up
class A { class A {
<caret>{ <caret>init {
} }
fun foo() { fun foo() {
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty1.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// MOVE: down // MOVE: down
class A { class A {
<caret>{ <caret>init {
} }
val y = "" val y = ""
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty1.kt.after
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: down // MOVE: down
class A { class A {
val y = "" val y = ""
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty2.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: up // MOVE: up
class A { class A {
val y = "" val y = ""
<caret>{ <caret>init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty2.kt.after
+1 -1
View File
@@ -1,6 +1,6 @@
// MOVE: up // MOVE: up
class A { class A {
<caret>{ <caret>init {
} }
val y = "" val y = ""
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer1.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
<caret>fun foo() { <caret>fun foo() {
} }
{ init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer1.kt.after
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: down // MOVE: down
// class A // class A
class A { class A {
{ init {
} }
// fun foo // fun foo
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer2.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: up // MOVE: up
// class A // class A
class A { class A {
{ init {
} }
// fun foo // fun foo
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer2.kt.after
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
<caret>fun foo() { <caret>fun foo() {
} }
{ init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer1.kt
+1 -1
View File
@@ -3,7 +3,7 @@
class A { class A {
// val x // val x
<caret>val x = "" <caret>val x = ""
{ init {
} }
} }
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer1.kt.after
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: down // MOVE: down
// class A // class A
class A { class A {
{ init {
} }
// val x // val x
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer2.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// MOVE: up // MOVE: up
// class A // class A
class A { class A {
{ init {
} }
// val x // val x
idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer2.kt.after
+1 -1
View File
@@ -3,7 +3,7 @@
class A { class A {
// val x // val x
<caret>val x = "" <caret>val x = ""
{ init {
} }
} }
idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.1.kt
+1 -1
View File
@@ -2,7 +2,7 @@ public class X(bar: String? = A.BAR): A() {
var next: A? = A() var next: A? = A()
val myBar: String? = A.BAR val myBar: String? = A.BAR
{ init {
A.BAR = "" A.BAR = ""
A.foos() A.foos()
} }
idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.1.kt
+1 -1
View File
@@ -2,7 +2,7 @@ public class X(bar: String? = A.BAR): A() {
var next: A? = A() var next: A? = A()
val myBar: String? = A.BAR val myBar: String? = A.BAR
{ init {
A.BAR = "" A.BAR = ""
A.foos() A.foos()
} }
idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.1.kt
+1 -1
View File
@@ -2,7 +2,7 @@ public class X(bar: String? = A.BAR): A() {
var next: A? = A() var next: A? = A()
val myBar: String? = A.BAR val myBar: String? = A.BAR
{ init {
A.BAR = "" A.BAR = ""
A.foos() A.foos()
} }
idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.1.kt
+1 -1
View File
@@ -2,7 +2,7 @@ public class X(bar: String? = A.BAR): A() {
var next: A? = A() var next: A? = A()
val myBar: String? = A.BAR val myBar: String? = A.BAR
{ init {
A.BAR = "" A.BAR = ""
A.foos() A.foos()
} }
idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.1.kt
+1 -1
View File
@@ -3,7 +3,7 @@ public class KOuter: Outer() {
var next: Outer.A? = (this@KOuter : Outer).A() var next: Outer.A? = (this@KOuter : Outer).A()
val myBar: String? = (this@KOuter : Outer).A().bar val myBar: String? = (this@KOuter : Outer).A().bar
{ init {
(this@KOuter : Outer).A().bar = "" (this@KOuter : Outer).A().bar = ""
} }
idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.1.kt
+1 -1
View File
@@ -2,7 +2,7 @@ public class X(bar: String? = Outer.A.BAR): Outer.A() {
var next: Outer.A? = Outer.A() var next: Outer.A? = Outer.A()
val myBar: String? = Outer.A.BAR val myBar: String? = Outer.A.BAR
{ init {
Outer.A.BAR = "" Outer.A.BAR = ""
Outer.A.foos() Outer.A.foos()
} }
idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.1.kt
+1 -1
View File
@@ -6,7 +6,7 @@ public class X(bar: String? = Inner.A.bar): Inner.A() {
var next: Inner.A? = Inner.A() var next: Inner.A? = Inner.A()
val myBar: String? = Inner.A.bar val myBar: String? = Inner.A.bar
{ init {
Inner.A.bar = "" Inner.A.bar = ""
Inner.A.foo() Inner.A.foo()
} }
idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.1.kt
+1 -1
View File
@@ -7,7 +7,7 @@ public class KOuter: Outer() {
var next: Outer.A? = (this@KOuter : Outer).A() var next: Outer.A? = (this@KOuter : Outer).A()
val myBar: String? = (this@KOuter : Outer).A().bar val myBar: String? = (this@KOuter : Outer).A().bar
{ init {
(this@KOuter : Outer).A().bar = "" (this@KOuter : Outer).A().bar = ""
} }
idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.1.kt
+1 -1
View File
@@ -6,7 +6,7 @@ public class X(bar: String? = Outer.A.bar): Outer.A() {
var next: Outer.A? = Outer.A() var next: Outer.A? = Outer.A()
val myBar: String? = Outer.A.bar val myBar: String? = Outer.A.bar
{ init {
Outer.A.bar = "" Outer.A.bar = ""
Outer.A.foo() Outer.A.foo()
} }
idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt
+3 -3
View File
@@ -1,7 +1,7 @@
// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction
// OPTIONS: usages // OPTIONS: usages
enum class E { enum class E {
{ init {
foo(1) foo(1)
} }
@@ -9,14 +9,14 @@ enum class E {
O O
A { A {
{ init {
foo(1) foo(1)
} }
override fun foo(n: Int): Int = n + 1 override fun foo(n: Int): Int = n + 1
} }
B { B {
{ init {
foo(1) foo(1)
} }
idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetParameter
// OPTIONS: usages // OPTIONS: usages
open class A<T>(<caret>foo: T) { open class A<T>(<caret>foo: T) {
{ init {
println(foo) println(foo)
} }
idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetTypeParameter // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetTypeParameter
// OPTIONS: usages // OPTIONS: usages
open class A<<caret>T>(foo: T, list: List<T>) { open class A<<caret>T>(foo: T, list: List<T>) {
{ init {
fun T.bar() {} fun T.bar() {}
foo.bar() foo.bar()
idea/testData/formatter/AnonymousInitializers.after.kt
+2 -8
View File
@@ -1,12 +1,6 @@
annotation class Ann annotation class Ann
class A { class A {
{ init {
}
{
}
{
} }
fun foo1() { fun foo1() {
@@ -34,7 +28,7 @@ class A {
} }
{ init {
} }
constructor() { constructor() {
idea/testData/formatter/AnonymousInitializers.kt
+2 -2
View File
@@ -1,6 +1,6 @@
annotation class Ann annotation class Ann
class A { class A {
{}{}{} init{}
fun foo1() { fun foo1() {
} }
@@ -18,7 +18,7 @@ class A {
} }
{} init {}
constructor() { constructor() {
idea/testData/formatter/AnonymousInitializersLineBreak.after.inv.kt
-9
View File
@@ -1,11 +1,5 @@
annotation class Ann annotation class Ann
class A { class A {
{
}
{
}
init { init {
} }
@@ -15,9 +9,6 @@ class A {
init { init {
} }
{
}
/* abcde */init { /* abcde */init {
} }
idea/testData/formatter/AnonymousInitializersLineBreak.after.kt
-9
View File
@@ -1,12 +1,6 @@
annotation class Ann annotation class Ann
class A class A
{ {
{
}
{
}
init init
{ {
} }
@@ -19,9 +13,6 @@ class A
{ {
} }
{
}
/* abcde */init /* abcde */init
{ {
idea/testData/formatter/AnonymousInitializersLineBreak.kt
-4
View File
@@ -1,15 +1,11 @@
annotation class Ann annotation class Ann
class A { class A {
{}{}
init{} init{}
init {} init {}
init {} init {}
{}
/* abcde */init { /* abcde */init {
} }
idea/testData/hierarchy/calls/callees/kotlinClass/main0.kt
+1 -1
View File
@@ -12,7 +12,7 @@ open class KClientBase {
} }
class <caret>KClient(): KClientBase() { class <caret>KClient(): KClientBase() {
{ init {
fun localFun(s: String): String = packageFun(s) fun localFun(s: String): String = packageFun(s)
idea/testData/hierarchy/calls/callees/kotlinObject/main0.kt
+1 -1
View File
@@ -12,7 +12,7 @@ open class KClientBase {
} }
object <caret>KClient: KClientBase() { object <caret>KClient: KClientBase() {
{ init {
fun localFun(s: String): String = packageFun(s) fun localFun(s: String): String = packageFun(s)
idea/testData/hierarchy/calls/callers/kotlinClass/main0.kt
+1 -1
View File
@@ -8,7 +8,7 @@ fun packageFun(s: String): String = s + KA().name
val packageVal = KA().name val packageVal = KA().name
class KClient { class KClient {
{ init {
KA() KA()
} }
idea/testData/hierarchy/calls/callers/kotlinFunction/main0.kt
+1 -1
View File
@@ -12,7 +12,7 @@ fun packageFun(s: String): String = KBase().foo("") + KA().foo(s)
val packageVal = KBase().foo("") + KA().foo("") val packageVal = KBase().foo("") + KA().foo("")
class KClient { class KClient {
{ init {
KA().foo("") KA().foo("")
KBase().foo("") KBase().foo("")
} }
idea/testData/hierarchy/calls/callers/kotlinNestedClass/main0.kt
+1 -1
View File
@@ -10,7 +10,7 @@ fun packageFun(s: String): String = s + T.KA().name
val packageVal = T.KA().name val packageVal = T.KA().name
class KClient { class KClient {
{ init {
T.KA() T.KA()
} }
idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/main0.kt
+1 -1
View File
@@ -10,7 +10,7 @@ fun packageFun(s: String): String = s + T().KA().name
val packageVal = T().KA().name val packageVal = T().KA().name
class KClient { class KClient {
{ init {
T().KA() T().KA()
} }
idea/testData/hierarchy/calls/callers/kotlinPackageFunction/main0.kt
+1 -1
View File
@@ -3,7 +3,7 @@ fun <caret>packageFun(s: String): String = s
val packageVal = packageFun("") val packageVal = packageFun("")
class KClient { class KClient {
{ init {
packageFun("") packageFun("")
} }
idea/testData/hierarchy/calls/callers/kotlinPackageProperty/main0.kt
+2 -2
View File
@@ -3,7 +3,7 @@ var <caret>packageVal = ""
fun packageFun(s: String): String = packageVal + s fun packageFun(s: String): String = packageVal + s
class KClient { class KClient {
{ init {
packageVal = "" packageVal = ""
} }
@@ -24,7 +24,7 @@ class KClient {
object KClientObj { object KClientObj {
val a = packageVal val a = packageVal
{ init {
packageVal = "" packageVal = ""
} }
} }
idea/testData/hierarchy/calls/callers/kotlinProperty/main0.kt
+2 -2
View File
@@ -12,7 +12,7 @@ fun packageFun(s: String): String = KBase().name + KA().name
val packageVal = KBase().name + KA().name val packageVal = KBase().name + KA().name
class KClient { class KClient {
{ init {
KBase().name = "" KBase().name = ""
KA().name = "" KA().name = ""
} }
@@ -37,7 +37,7 @@ class KClient {
object KClientObj { object KClientObj {
val a = KBase().name + KA().name val a = KBase().name + KA().name
{ init {
KBase().name = "" KBase().name = ""
KA().name = "" KA().name = ""
} }
idea/testData/hierarchy/class/sub/ClassFromClass/main.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class B: A() {}
class MyClass(a: A = run { class X: A(); object: A() {} }) { class MyClass(a: A = run { class X: A(); object: A() {} }) {
inner class G: A() {} inner class G: A() {}
{ init {
class C: A() class C: A()
} }
idea/testData/hierarchy/class/sub/ClassFromTrait/main.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class B: A
class MyClass(a: A = run { class X: A; object: A {} }) { class MyClass(a: A = run { class X: A; object: A {} }) {
inner class G: A {} inner class G: A {}
{ init {
class C: A class C: A
} }
idea/testData/hierarchy/class/sub/ObjectFromClass/main.kt
+1 -1
View File
@@ -3,7 +3,7 @@ open class <caret>A
object B: A() object B: A()
class MyClass(a: A = run { object: A() {} }) { class MyClass(a: A = run { object: A() {} }) {
{ init {
object C: A() object C: A()
} }
idea/testData/hierarchy/class/sub/ObjectFromTrait/main.kt
+1 -1
View File
@@ -3,7 +3,7 @@ trait <caret>A
object B: A object B: A
class MyClass(a: A = run { object: A {} }) { class MyClass(a: A = run { object: A {} }) {
{ init {
object C: A object C: A
} }

Some files were not shown because too many files have changed in this diff Show More