PSI Pattern Matching: Add equivalence tests for JetPsiUnifier

idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjects.kt

@@ -0,0 +1,34 @@
+// WITH_RUNTIME
+fun foo() {
+    when {
+        true -> <selection>{
+            val a = object: Function0<Int> {
+                override fun invoke(): Int = 1
+            }
+            val b = object: Function0<Int> {
+                override fun invoke(): Int = a() + 1
+            }
+            println(a() - b())
+        }</selection>
+
+        true -> {
+            val b = object: Function0<Int> {
+                override fun invoke(): Int = 1
+            }
+            val a = object: Function0<Int> {
+                override fun invoke(): Int = b() + 1
+            }
+            println(b() - a())
+        }
+
+        true -> {
+            val b = object: Function0<Int> {
+                override fun invoke(): Int = 1
+            }
+            val a = object: Function0<Int> {
+                override fun invoke(): Int = b() + 1
+            }
+            println(a() - b())
+        }
+    }
+}

idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjects.kt.match

@@ -0,0 +1,19 @@
+{
+            val a = object: Function0<Int> {
+                override fun invoke(): Int = 1
+            }
+            val b = object: Function0<Int> {
+                override fun invoke(): Int = a() + 1
+            }
+            println(a() - b())
+        }
+
+{
+            val b = object: Function0<Int> {
+                override fun invoke(): Int = 1
+            }
+            val a = object: Function0<Int> {
+                override fun invoke(): Int = b() + 1
+            }
+            println(b() - a())
+        }

idea/testData/unifier/equivalence/controlStructures/blocks/localFunctions.kt

@@ -0,0 +1,22 @@
+// WITH_RUNTIME
+fun foo() {
+    when {
+        true -> <selection>{
+            fun a() = 1
+            fun b() = a() + 1
+            println(a() - b())
+        }</selection>
+
+        true -> {
+            fun b() = 1
+            fun a() = b() + 1
+            println(b() - a())
+        }
+
+        true -> {
+            fun b() = 1
+            fun a() = b() + 1
+            println(a() - b())
+        }
+    }
+}

idea/testData/unifier/equivalence/controlStructures/blocks/localFunctions.kt.match

@@ -0,0 +1,11 @@
+{
+            fun a() = 1
+            fun b() = a() + 1
+            println(a() - b())
+        }
+
+{
+            fun b() = 1
+            fun a() = b() + 1
+            println(b() - a())
+        }

idea/testData/unifier/equivalence/controlStructures/blocks/localVars.kt

@@ -0,0 +1,22 @@
+// WITH_RUNTIME
+fun foo() {
+    when {
+        true -> <selection>{
+            val a = 1
+            val b = a + 1
+            println(a - b)
+        }</selection>
+
+        true -> {
+            val b = 1
+            val a = b + 1
+            println(b - a)
+        }
+
+        true -> {
+            val b = 1
+            val a = b + 1
+            println(a - b)
+        }
+    }
+}

idea/testData/unifier/equivalence/controlStructures/blocks/localVars.kt.match

@@ -0,0 +1,11 @@
+{
+            val a = 1
+            val b = a + 1
+            println(a - b)
+        }
+
+{
+            val b = 1
+            val a = b + 1
+            println(b - a)
+        }

idea/testData/unifier/equivalence/controlStructures/break.kt

@@ -0,0 +1,16 @@
+fun foo(a: Int) {
+    @A
+    while (true) {
+        @B
+        while (true) {
+            if (a > 0) break@A
+            if (a < 0) <selection>break@B</selection>
+        }
+
+        @B
+        while (true) {
+            if (a > 0) break@A
+            if (a < 0) break@B
+        }
+    }
+}

idea/testData/unifier/equivalence/controlStructures/break.kt.match

@@ -0,0 +1 @@
+break@B

idea/testData/unifier/equivalence/controlStructures/continue.kt

@@ -0,0 +1,16 @@
+fun foo(a: Int) {
+    @A
+    while (true) {
+        @B
+        while (true) {
+            if (a > 0) <selection>continue@A</selection>
+            if (a < 0) continue@B
+        }
+
+        @B
+        while (true) {
+            if (a > 0) continue@A
+            if (a < 0) continue@B
+        }
+    }
+}

idea/testData/unifier/equivalence/controlStructures/continue.kt.match

@@ -0,0 +1,3 @@
+continue@A
+
+continue@A

idea/testData/unifier/equivalence/controlStructures/doWhile.kt

@@ -0,0 +1,24 @@
+// WITH_RUNTIME
+fun foo(a: Int, b: Int) {
+    var t = a
+    <selection>do {
+        println((t))
+        t++
+    } while (t != (a + b))</selection>
+
+    var u = a
+    do {
+        println(t)
+        t++
+    } while (u != a + b)
+
+    while (t != a + b) {
+        println(t)
+        t++
+    }
+
+    do {
+        println(t)
+        t++
+    } while (t != a + b)
+}

idea/testData/unifier/equivalence/controlStructures/doWhile.kt.match

@@ -0,0 +1,9 @@
+do {
+        println((t))
+        t++
+    } while (t != (a + b))
+
+do {
+        println(t)
+        t++
+    } while (t != a + b)

idea/testData/unifier/equivalence/controlStructures/for.kt

@@ -0,0 +1,18 @@
+// WITH_RUNTIME
+fun foo(a: Int, b: Int) {
+    <selection>for (i in a - b..a + b) {
+        println(i*i)
+    }</selection>
+
+    for (k in a - b..a + b) {
+        println(k*k)
+    }
+
+    for (i in a..a + b) {
+        println(i*i)
+    }
+
+    for (i in (a - b..a + b)) {
+        println(i*i)
+    }
+}

idea/testData/unifier/equivalence/controlStructures/for.kt.match

@@ -0,0 +1,11 @@
+for (i in a - b..a + b) {
+        println(i*i)
+    }
+
+for (k in a - b..a + b) {
+        println(k*k)
+    }
+
+for (i in (a - b..a + b)) {
+        println(i*i)
+    }

idea/testData/unifier/equivalence/controlStructures/if.kt

@@ -0,0 +1,19 @@
+// WITH_RUNTIME
+fun foo(a: Int, b: Int) {
+    <selection>if ((a) + b > 0) {
+        println(a*(b))
+    }</selection>
+
+    println(a*b)
+
+    if (a + b > 0) {
+        println(a*(b))
+    }
+
+    if (a + b > 0) {
+        println((a*b))
+    }
+    else {
+        println(a + b)
+    }
+}

idea/testData/unifier/equivalence/controlStructures/if.kt.match

@@ -0,0 +1,7 @@
+if ((a) + b > 0) {
+        println(a*(b))
+    }
+
+if (a + b > 0) {
+        println(a*(b))
+    }

idea/testData/unifier/equivalence/controlStructures/ifElse.kt

@@ -0,0 +1,26 @@
+// WITH_RUNTIME
+fun foo(a: Int, b: Int) {
+    if ((a) + b > 0) {
+        println(a*b)
+    }
+
+    println(a*b)
+
+    if (a + b > (0)) {
+        println(a*(b))
+    }
+    else {
+        println(a + b)
+    }
+
+    if (a + b > 0) {
+        println(a*b)
+    }
+
+    <selection>if (a + (b) > 0) {
+        println(a*b)
+    }
+    else {
+        println((a + b))
+    }</selection>
+}

idea/testData/unifier/equivalence/controlStructures/ifElse.kt.match

@@ -0,0 +1,13 @@
+if (a + b > (0)) {
+        println(a*(b))
+    }
+    else {
+        println(a + b)
+    }
+
+if (a + (b) > 0) {
+        println(a*b)
+    }
+    else {
+        println((a + b))
+    }

idea/testData/unifier/equivalence/controlStructures/labeledReturn.kt

@@ -0,0 +1,11 @@
+inline fun run(f: () -> Unit) = f()
+
+fun foo(a: Int) {
+    run {
+        run {
+            if (a > 0) <selection>return@foo</selection>
+            if (a < 0) return
+            return@foo
+        }
+    }
+}

idea/testData/unifier/equivalence/controlStructures/labeledReturn.kt.match

@@ -0,0 +1,3 @@
+return@foo
+
+return@foo

idea/testData/unifier/equivalence/controlStructures/throw.kt

@@ -0,0 +1,6 @@
+fun foo() {
+    <selection>throw AssertionError()</selection>
+    throw NullPointerException()
+    AssertionError()
+    throw (AssertionError())
+}

idea/testData/unifier/equivalence/controlStructures/throw.kt.match

@@ -0,0 +1,3 @@
+throw AssertionError()
+
+throw (AssertionError())

idea/testData/unifier/equivalence/controlStructures/unitReturn.kt

@@ -0,0 +1,6 @@
+// DISABLE-ERRORS
+fun foo(a: Int) {
+    if (a > 0) <selection>return</selection>
+    if (a < 0) return a
+    return
+}

idea/testData/unifier/equivalence/controlStructures/unitReturn.kt.match

@@ -0,0 +1,3 @@
+return
+
+return

idea/testData/unifier/equivalence/controlStructures/valuedReturn.kt

@@ -0,0 +1,8 @@
+// DISABLE-ERRORS
+fun foo(a: Int): Int {
+    if (a > 0) <selection>return (a) + 1</selection>
+    if (a < 0) return
+    if (a == 0) return a
+    return (a + 1)
+    return
+}

idea/testData/unifier/equivalence/controlStructures/valuedReturn.kt.match

@@ -0,0 +1,3 @@
+return (a) + 1
+
+return (a + 1)

idea/testData/unifier/equivalence/controlStructures/whenWithSubject.kt

@@ -0,0 +1,30 @@
+// WITH_RUNTIME
+fun foo(a: Int, b: Int) {
+    <selection>when((a)) {
+        1 -> println(b)
+        (2) -> println((a - b))
+        else -> println(a + b)
+    }</selection>
+
+    when(a) {
+        1 -> println(b)
+        2 -> println(a - b)
+    }
+
+    when {
+        a == 1 -> println(b)
+        a == 2 -> println(a - b)
+        else -> println(a + b)
+    }
+
+    when(a) {
+        1 -> println(b)
+        2 -> println(a - b)
+        else -> println(a + b)
+    }
+
+    when(a) {
+        2 -> println(a - b)
+        1 -> println(b)
+    }
+}

idea/testData/unifier/equivalence/controlStructures/whenWithSubject.kt.match

@@ -0,0 +1,11 @@
+when((a)) {
+        1 -> println(b)
+        (2) -> println((a - b))
+        else -> println(a + b)
+    }
+
+when(a) {
+        1 -> println(b)
+        2 -> println(a - b)
+        else -> println(a + b)
+    }

idea/testData/unifier/equivalence/controlStructures/whenWithoutSubject.kt

@@ -0,0 +1,24 @@
+// WITH_RUNTIME
+fun foo(a: Int, b: Int) {
+    <selection>when {
+        (a == 1) -> println(b)
+        a == 2 -> println(a - b)
+        else -> println(a + b)
+    }</selection>
+
+    when {
+        a == 1 -> println(b)
+        a == 2 -> println(a - b)
+    }
+
+    when {
+        a == 1 -> println(b)
+        (a == 2) -> println((a - b))
+        else -> println(a + b)
+    }
+
+    when(a) {
+        2 -> println(a - b)
+        1 -> println(b)
+    }
+}

idea/testData/unifier/equivalence/controlStructures/whenWithoutSubject.kt.match

@@ -0,0 +1,11 @@
+when {
+        (a == 1) -> println(b)
+        a == 2 -> println(a - b)
+        else -> println(a + b)
+    }
+
+when {
+        a == 1 -> println(b)
+        (a == 2) -> println((a - b))
+        else -> println(a + b)
+    }

idea/testData/unifier/equivalence/controlStructures/while.kt

@@ -0,0 +1,24 @@
+// WITH_RUNTIME
+fun foo(a: Int, b: Int) {
+    var t = a
+    <selection>while (t != (a + b)) {
+        println(t)
+        t++
+    }</selection>
+
+    var u = a
+    while (u != a + b) {
+        println(t)
+        t++
+    }
+
+    do {
+        println(t)
+        t++
+    } while (t != a + b)
+
+    while (t != a + b) {
+        println((t))
+        t++
+    }
+}

idea/testData/unifier/equivalence/controlStructures/while.kt.match

@@ -0,0 +1,9 @@
+while (t != (a + b)) {
+        println(t)
+        t++
+    }
+
+while (t != a + b) {
+        println((t))
+        t++
+    }