Skip to content

Commit

Permalink
Added correctness check of test data + fixed huge amount of incorrect…
Browse files Browse the repository at this point in the history 
… code in test data
  • Loading branch information
@valentinkip
valentinkip committed Apr 17, 2020
1 parent c19a16f commit f0d4d7b
Show file tree
Hide file tree
Showing 139 changed files with 535 additions and 448 deletions.
2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/defaultGetterFieldInSetter.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// FLOW: IN

class A(var b: Boolean) {
var foo: Int
var foo: Int = 0
set(value) {
field = if (b) value else 0
}
Expand Down
9 changes: 4 additions & 5 deletions idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
6 field = if (b) value else <bold>0</bold>
4 var foo: Int = <bold>0</bold>
10 val x = <bold>foo</bold>
4 var <bold>foo: Int</bold>
6 field = <bold>if (b) value else 0</bold>
6 field = if (b) value else <bold>0</bold>
4 var <bold>foo: Int = 0</bold>
4 var foo: Int = <bold>0</bold>

11 foo = <bold>1</bold>
10 val x = <bold>foo</bold>
4 var <bold>foo: Int</bold>
4 var <bold>foo: Int = 0</bold>
6 field = <bold>if (b) value else 0</bold>
6 field = if (b) <bold>value</bold> else 0
5 set(<bold>value</bold>) {
Expand Down
3 changes: 2 additions & 1 deletion idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
10 val x = <bold>foo</bold>
4 var <bold>foo: Int</bold>
4 var <bold>foo: Int = 0</bold>
4 var foo: Int = <bold>0</bold>
6 field = <bold>if (b) value else 0</bold>
6 field = if (b) <bold>value</bold> else 0
5 set(<bold>value</bold>) {
Expand Down
2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/delegateToJavaGetter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class D {
class D {
public static D INSTANCE = new D();

int getValue(@Nullable Object thisRef, @NotNull KProperty<?> property) {
Expand Down
2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ open class B : A {
override fun foo() = 2
}

fun test(a: A, b: B, c: C, d: D) {
internal fun test(a: A, b: B, c: C, d: D) {
val x = a.foo()
val <caret>y = b.foo()
val z = c.foo()
Expand Down
2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ interface A {
public int foo();
}

class B extends A {
class B implements A {
public int foo() {
return 2;
}
Expand Down
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.kt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// FLOW: IN

interface C : A {
internal interface C : A {
override fun foo() = 3
}

fun test(a: A, b: B, c: C, d: D) {
internal fun test(a: A, b: B, c: C, d: D) {
val x = a.foo()
val y = b.foo()
val <caret>z = c.foo()
Expand Down
2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ interface A {
fun foo() = 1
}

fun test(a: A, b: B, c: C, d: D) {
internal fun test(a: A, b: B, c: C, d: D) {
val <caret>x = a.foo()
val y = b.foo()
val z = c.foo()
Expand Down
2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/extensionLambdaImplicitParameter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fun foo(f: String.(Int) -> Unit) {

fun test() {
foo {
println(<caret>it)
val v = <caret>it
}
}

Expand Down
6 changes: 3 additions & 3 deletions idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
4 f("", <bold>1</bold>)
15 println(<bold>it</bold>)
15 val v = <bold>it</bold>
14 [LAMBDA CALLS] foo <bold>{</bold>
3 [LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
4 f("", <bold>1</bold>)

6 "".f(<bold>2</bold>)
15 println(<bold>it</bold>)
15 val v = <bold>it</bold>
14 [LAMBDA CALLS] foo <bold>{</bold>
3 [LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
6 "".f(<bold>2</bold>)

9 f(<bold>3</bold>)
15 println(<bold>it</bold>)
15 val v = <bold>it</bold>
14 [LAMBDA CALLS] foo <bold>{</bold>
3 [LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
9 f(<bold>3</bold>)
Expand Down
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/extensionLambdaImplicitParameter.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[NotNull Values]
15 println(<bold>it</bold>)
15 println(<bold>it</bold>)
15 val v = <bold>it</bold>
15 val v = <bold>it</bold>

2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
15 println(<bold>it</bold>)
15 val v = <bold>it</bold>
14 [LAMBDA CALLS] foo <bold>{</bold>
3 [LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
4 f("", <bold>1</bold>)
Expand Down
2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/extensionLambdaParameter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fun foo(f: String.(Int) -> Unit) {

fun test() {
foo { i ->
println(<caret>i)
val v = <caret>i
}
}

Expand Down
6 changes: 3 additions & 3 deletions idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
4 f("", <bold>1</bold>)
15 println(<bold>i</bold>)
15 val v = <bold>i</bold>
14 foo { <bold>i</bold> ->
14 [LAMBDA CALLS] foo <bold>{ i -></bold>
3 [LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
4 f("", <bold>1</bold>)

6 "".f(<bold>2</bold>)
15 println(<bold>i</bold>)
15 val v = <bold>i</bold>
14 foo { <bold>i</bold> ->
14 [LAMBDA CALLS] foo <bold>{ i -></bold>
3 [LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
6 "".f(<bold>2</bold>)

9 f(<bold>3</bold>)
15 println(<bold>i</bold>)
15 val v = <bold>i</bold>
14 foo { <bold>i</bold> ->
14 [LAMBDA CALLS] foo <bold>{ i -></bold>
3 [LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
Expand Down
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/extensionLambdaParameter.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[NotNull Values]
15 println(<bold>i</bold>)
15 println(<bold>i</bold>)
15 val v = <bold>i</bold>
15 val v = <bold>i</bold>

2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/extensionLambdaParameter.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
15 println(<bold>i</bold>)
15 val v = <bold>i</bold>
14 foo { <bold>i</bold> ->
14 [LAMBDA CALLS] foo <bold>{ i -></bold>
3 [LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
Expand Down
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/funParamerer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class J {
void test() {
FunParamererKt.foo(1):
FunParamererKt.foo(1, "2"):
FunParamererKt.foo(1);
FunParamererKt.foo(1, "2");
}
}
1 change: 1 addition & 0 deletions idea/testData/slicer/inflow/funParamerer.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// FLOW: IN
// WITH_RUNTIME

@JvmOverloads
fun foo(<caret>n: Int, s: String = "???") {
Expand Down
12 changes: 6 additions & 6 deletions idea/testData/slicer/inflow/funParamerer.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
3 FunParamererKt.foo(<bold>1</bold>):
4 fun foo(<bold>n: Int</bold>, s: String = "???") {
3 FunParamererKt.foo(<bold>1</bold>):
3 FunParamererKt.foo(<bold>1</bold>);
5 fun foo(<bold>n: Int</bold>, s: String = "???") {
3 FunParamererKt.foo(<bold>1</bold>);

9 foo(<bold>1</bold>)
4 fun foo(<bold>n: Int</bold>, s: String = "???") {
9 foo(<bold>1</bold>)
10 foo(<bold>1</bold>)
5 fun foo(<bold>n: Int</bold>, s: String = "???") {
10 foo(<bold>1</bold>)

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/funParamerer.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[NotNull Values]
4 fun foo(<bold>n: Int</bold>, s: String = "???") {
4 fun foo(<bold>n: Int</bold>, s: String = "???") {
5 fun foo(<bold>n: Int</bold>, s: String = "???") {
5 fun foo(<bold>n: Int</bold>, s: String = "???") {

16 changes: 8 additions & 8 deletions idea/testData/slicer/inflow/funParamerer.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
4 fun foo(<bold>n: Int</bold>, s: String = "???") {
3 FunParamererKt.foo(<bold>1</bold>):
4 FunParamererKt.foo(<bold>1</bold>, "2"):
9 foo(<bold>1</bold>)
10 foo(<bold>1</bold>, "2")
11 foo(<bold>1</bold>, s = "2")
12 foo(n = <bold>1</bold>, s = "2")
13 foo(s = "2", n = <bold>1</bold>)
5 fun foo(<bold>n: Int</bold>, s: String = "???") {
3 FunParamererKt.foo(<bold>1</bold>);
4 FunParamererKt.foo(<bold>1</bold>, "2");
10 foo(<bold>1</bold>)
11 foo(<bold>1</bold>, "2")
12 foo(<bold>1</bold>, s = "2")
13 foo(n = <bold>1</bold>, s = "2")
14 foo(s = "2", n = <bold>1</bold>)
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/funParamererWithDefault.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class J {
void test() {
FunParamererWithDefaultKt.foo(1):
FunParamererWithDefaultKt.foo(1, "2"):
FunParamererWithDefaultKt.foo(1);
FunParamererWithDefaultKt.foo(1, "2");
}
}
1 change: 1 addition & 0 deletions idea/testData/slicer/inflow/funParamererWithDefault.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// FLOW: IN
// WITH_RUNTIME

@JvmOverloads
fun foo(n: Int, <caret>s: String = "???") {
Expand Down
18 changes: 9 additions & 9 deletions idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
4 FunParamererWithDefaultKt.foo(1, <bold>"2"</bold>):
4 fun foo(n: Int, <bold>s: String = "???"</bold>) {
4 FunParamererWithDefaultKt.foo(1, <bold>"2"</bold>):
4 FunParamererWithDefaultKt.foo(1, <bold>"2"</bold>);
5 fun foo(n: Int, <bold>s: String = "???"</bold>) {
4 FunParamererWithDefaultKt.foo(1, <bold>"2"</bold>);

10 foo(1, <bold>"2"</bold>)
4 fun foo(n: Int, <bold>s: String = "???"</bold>) {
10 foo(1, <bold>"2"</bold>)
11 foo(1, <bold>"2"</bold>)
5 fun foo(n: Int, <bold>s: String = "???"</bold>) {
11 foo(1, <bold>"2"</bold>)

4 fun foo(n: Int, s: String = <bold>"???"</bold>) {
4 fun foo(n: Int, <bold>s: String = "???"</bold>) {
4 fun foo(n: Int, s: String = <bold>"???"</bold>) {
5 fun foo(n: Int, s: String = <bold>"???"</bold>) {
5 fun foo(n: Int, <bold>s: String = "???"</bold>) {
5 fun foo(n: Int, s: String = <bold>"???"</bold>) {

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/funParamererWithDefault.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[NotNull Values]
4 fun foo(n: Int, <bold>s: String = "???"</bold>) {
4 fun foo(n: Int, <bold>s: String = "???"</bold>) {
5 fun foo(n: Int, <bold>s: String = "???"</bold>) {
5 fun foo(n: Int, <bold>s: String = "???"</bold>) {

14 changes: 7 additions & 7 deletions idea/testData/slicer/inflow/funParamererWithDefault.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
4 fun foo(n: Int, <bold>s: String = "???"</bold>) {
4 fun foo(n: Int, s: String = <bold>"???"</bold>) {
10 foo(1, <bold>"2"</bold>)
4 FunParamererWithDefaultKt.foo(1, <bold>"2"</bold>):
11 foo(1, s = <bold>"2"</bold>)
12 foo(n = 1, s = <bold>"2"</bold>)
13 foo(s = <bold>"2"</bold>, n = 1)
5 fun foo(n: Int, <bold>s: String = "???"</bold>) {
5 fun foo(n: Int, s: String = <bold>"???"</bold>) {
4 FunParamererWithDefaultKt.foo(1, <bold>"2"</bold>);
11 foo(1, <bold>"2"</bold>)
12 foo(1, s = <bold>"2"</bold>)
13 foo(n = 1, s = <bold>"2"</bold>)
14 foo(s = <bold>"2"</bold>, n = 1)
2 changes: 1 addition & 1 deletion idea/testData/slicer/inflow/getterAndSetterUsingField.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// FLOW: IN

class A(var b: Boolean) {
var foo: Int
var foo: Int = -1
get() = if (b) field else 0
set(value) {
field = if (b) value else 0
Expand Down
9 changes: 7 additions & 2 deletions idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
4 var foo: Int = <bold>-1</bold>
11 val x = <bold>foo</bold>
4 var <bold>foo: Int = -1</bold>
4 var foo: Int = <bold>-1</bold>

7 field = if (b) value else <bold>0</bold>
11 val x = <bold>foo</bold>
4 var <bold>foo: Int</bold>
4 var <bold>foo: Int = -1</bold>
5 get() = <bold>if (b) field else 0</bold>
5 get() = if (b) <bold>field</bold> else 0
7 field = <bold>if (b) value else 0</bold>
7 field = if (b) value else <bold>0</bold>

12 foo = <bold>1</bold>
11 val x = <bold>foo</bold>
4 var <bold>foo: Int</bold>
4 var <bold>foo: Int = -1</bold>
5 get() = <bold>if (b) field else 0</bold>
5 get() = if (b) <bold>field</bold> else 0
7 field = <bold>if (b) value else 0</bold>
Expand Down
3 changes: 2 additions & 1 deletion idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
11 val x = <bold>foo</bold>
4 var <bold>foo: Int</bold>
4 var <bold>foo: Int = -1</bold>
4 var foo: Int = <bold>-1</bold>
5 get() = <bold>if (b) field else 0</bold>
5 get() = if (b) <bold>field</bold> else 0
7 field = <bold>if (b) value else 0</bold>
Expand Down
6 changes: 3 additions & 3 deletions idea/testData/slicer/inflow/lambdaImplicitParameter.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// FLOW: IN

fun foo(f: (Int) -> Unit): Int {
return f(1)
fun foo(f: (Int) -> Unit) {
f(1)
}

fun test() {
foo {
println(<caret>it)
val v = <caret>it
}
}
8 changes: 4 additions & 4 deletions idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
4 return f(<bold>1</bold>)
9 println(<bold>it</bold>)
4 f(<bold>1</bold>)
9 val v = <bold>it</bold>
8 [LAMBDA CALLS] foo <bold>{</bold>
3 [LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>): Int {
4 return f(<bold>1</bold>)
3 [LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
4 f(<bold>1</bold>)

5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/lambdaImplicitParameter.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
9 println(<bold>it</bold>)
9 println(<bold>it</bold>)
9 val v = <bold>it</bold>
9 val v = <bold>it</bold>

6 changes: 3 additions & 3 deletions idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
9 println(<bold>it</bold>)
9 val v = <bold>it</bold>
8 [LAMBDA CALLS] foo <bold>{</bold>
3 [LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>): Int {
4 return f(<bold>1</bold>)
3 [LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
4 f(<bold>1</bold>)
6 changes: 3 additions & 3 deletions idea/testData/slicer/inflow/lambdaParameter.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// FLOW: IN

fun foo(f: (Int) -> Unit): Int {
return f(1)
fun foo(f: (Int) -> Unit) {
f(1)
}

fun test() {
foo { value ->
println(<caret>value)
val v = <caret>value
}
}
8 changes: 4 additions & 4 deletions idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
4 return f(<bold>1</bold>)
9 println(<bold>value</bold>)
4 f(<bold>1</bold>)
9 val v = <bold>value</bold>
8 foo { <bold>value</bold> ->
8 [LAMBDA CALLS] foo <bold>{ value -></bold>
3 [LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>): Int {
4 return f(<bold>1</bold>)
3 [LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
4 f(<bold>1</bold>)

Loading

0 comments on commit f0d4d7b

Please sign in to comment.