From 87eb06a21f1a46c594ba63f68d8503185591dbf1 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 11 Nov 2020 14:47:06 +0300 Subject: [PATCH] [IR] update testdata: improve annotations rendering in case when argument was not provided and there is default value --- ...notationsWithDefaultParameterValues.kt.txt | 2 +- .../annotations/javaAnnotation.kt.txt | 2 +- ...ullabilityInDestructuringAssignment.kt.txt | 28 +++++++++---------- .../enhancedNullabilityInForLoop.kt.txt | 22 +++++++-------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt.txt index 01f26c9f37cf2..7b8970af9b7d9 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt.txt @@ -26,7 +26,7 @@ fun test3() { fun test4() { } -@A() +@A fun test5() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt.txt index 7ab3c0d2ffc9f..051fa58cdc8b7 100644 --- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt.txt @@ -1,4 +1,4 @@ -@JavaAnn() +@JavaAnn fun test1() { } diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt index fb8cf05894b55..636b607a86b34 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt @@ -62,35 +62,35 @@ fun test1() { fun test2() { // COMPOSITE { - val tmp0_container: @FlexibleNullability Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String>? = notNullComponents() - val x: @NotNull() @EnhancedNullability String = tmp0_container /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component1() - val y: @NotNull() @EnhancedNullability String = tmp0_container /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component2() + val tmp0_container: @FlexibleNullability Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String>? = notNullComponents() + val x: @NotNull @EnhancedNullability String = tmp0_container /*!! Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String> */.component1() + val y: @NotNull @EnhancedNullability String = tmp0_container /*!! Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String> */.component2() // } - use(x = x /*!! @NotNull() String */, y = y /*!! @NotNull() String */) + use(x = x /*!! @NotNull String */, y = y /*!! @NotNull String */) } fun test2Desugared() { - val tmp: @FlexibleNullability Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String>? = notNullComponents() - val x: @NotNull() String = tmp /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component1() /*!! @NotNull() String */ - val y: @NotNull() String = tmp /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component2() /*!! @NotNull() String */ + val tmp: @FlexibleNullability Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String>? = notNullComponents() + val x: @NotNull String = tmp /*!! Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String> */.component1() /*!! @NotNull String */ + val y: @NotNull String = tmp /*!! Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String> */.component2() /*!! @NotNull String */ use(x = x, y = y) } fun test3() { // COMPOSITE { - val tmp0_container: @EnhancedNullability Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> = notNullQAndComponents() - val x: @NotNull() @EnhancedNullability String = tmp0_container /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component1() - val y: @NotNull() @EnhancedNullability String = tmp0_container /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component2() + val tmp0_container: @EnhancedNullability Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String> = notNullQAndComponents() + val x: @NotNull @EnhancedNullability String = tmp0_container /*!! Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String> */.component1() + val y: @NotNull @EnhancedNullability String = tmp0_container /*!! Q<@NotNull @EnhancedNullability String, @NotNull @EnhancedNullability String> */.component2() // } - use(x = x /*!! @NotNull() String */, y = y /*!! @NotNull() String */) + use(x = x /*!! @NotNull String */, y = y /*!! @NotNull String */) } fun test4() { // COMPOSITE { - val tmp0_container: IndexedValue<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */.withIndex<@NotNull() @EnhancedNullability P>().first>() + val tmp0_container: IndexedValue<@NotNull @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull @EnhancedNullability P> */.withIndex<@NotNull @EnhancedNullability P>().first>() val x: Int = tmp0_container.component1() - val y: @NotNull() @EnhancedNullability P = tmp0_container.component2() + val y: @NotNull @EnhancedNullability P = tmp0_container.component2() // } - use(x = x, y = y /*!! @NotNull() P */) + use(x = x, y = y /*!! @NotNull P */) } diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt index a43fd45e568d5..bf023d4f2c28e 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt @@ -3,9 +3,9 @@ fun use(s: P) { fun testForInListUnused() { { // BLOCK - val tmp0_iterator: MutableIterator<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */ /*as MutableList<*> */.iterator() + val tmp0_iterator: MutableIterator<@NotNull @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull @EnhancedNullability P> */ /*as MutableList<*> */.iterator() while (tmp0_iterator.hasNext()) { // BLOCK - val x: @NotNull() @EnhancedNullability P = tmp0_iterator.next() + val x: @NotNull @EnhancedNullability P = tmp0_iterator.next() { // BLOCK } } @@ -14,11 +14,11 @@ fun testForInListUnused() { fun testForInListDestructured() { { // BLOCK - val tmp0_iterator: MutableIterator<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */ /*as MutableList<*> */.iterator() + val tmp0_iterator: MutableIterator<@NotNull @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull @EnhancedNullability P> */ /*as MutableList<*> */.iterator() while (tmp0_iterator.hasNext()) { // BLOCK - val tmp1_loop_parameter: @NotNull() @EnhancedNullability P = tmp0_iterator.next() - val x: Int = tmp1_loop_parameter /*!! @NotNull() P */.component1() - val y: Int = tmp1_loop_parameter /*!! @NotNull() P */.component2() + val tmp1_loop_parameter: @NotNull @EnhancedNullability P = tmp0_iterator.next() + val x: Int = tmp1_loop_parameter /*!! @NotNull P */.component1() + val y: Int = tmp1_loop_parameter /*!! @NotNull P */.component2() { // BLOCK } } @@ -26,9 +26,9 @@ fun testForInListDestructured() { } fun testDesugaredForInList() { - val iterator: MutableIterator<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */ /*as MutableList<*> */.iterator() + val iterator: MutableIterator<@NotNull @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull @EnhancedNullability P> */ /*as MutableList<*> */.iterator() while (iterator.hasNext()) { // BLOCK - val x: @NotNull() P = iterator.next() /*!! @NotNull() P */ + val x: @NotNull P = iterator.next() /*!! @NotNull P */ } } @@ -45,11 +45,11 @@ fun testForInArrayUnused(j: J) { fun testForInListUse() { { // BLOCK - val tmp0_iterator: MutableIterator<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */ /*as MutableList<*> */.iterator() + val tmp0_iterator: MutableIterator<@NotNull @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull @EnhancedNullability P> */ /*as MutableList<*> */.iterator() while (tmp0_iterator.hasNext()) { // BLOCK - val x: @NotNull() @EnhancedNullability P = tmp0_iterator.next() + val x: @NotNull @EnhancedNullability P = tmp0_iterator.next() { // BLOCK - use(s = x /*!! @NotNull() P */) + use(s = x /*!! @NotNull P */) use(s = x) } }