diff --git a/compiler/testData/codegen/box/classes/kt5347.kt b/compiler/testData/codegen/box/classes/kt5347.kt index d97668acadd..cca6a97b08e 100644 --- a/compiler/testData/codegen/box/classes/kt5347.kt +++ b/compiler/testData/codegen/box/classes/kt5347.kt @@ -1,5 +1,5 @@ fun test1(str: String): String { - @data class A(val x: Int) { + data class A(val x: Int) { fun foo() = str } return A(0).copy().foo() @@ -7,7 +7,7 @@ fun test1(str: String): String { class TestClass(val x: String) { fun foo(): String { - @data class A(val x: Int) { + data class A(val x: Int) { fun foo() = this@TestClass.x } return A(0).copy().foo() @@ -18,7 +18,7 @@ fun test2(str: String): String = TestClass(str).foo() fun test3(str: String): String { var xx = "" - @data class A(val x: Int) { + data class A(val x: Int) { fun foo(): String { xx = str; return xx } } return A(0).copy().foo() @@ -27,7 +27,7 @@ fun test3(str: String): String { fun test4(str: String): String { var xx = "" fun bar(s: String): String { xx = s; return xx } - @data class A(val x: Int) { + data class A(val x: Int) { fun foo(): String = bar(str) } return A(0).copy().foo() diff --git a/compiler/testData/codegen/box/localClasses/kt3389.kt b/compiler/testData/codegen/box/localClasses/kt3389.kt index f5740b70ea1..abb515b1688 100644 --- a/compiler/testData/codegen/box/localClasses/kt3389.kt +++ b/compiler/testData/codegen/box/localClasses/kt3389.kt @@ -3,7 +3,7 @@ package t class Reproduce { fun test(): String { - @data class Foo(val bar: String, val baz: Int) + data class Foo(val bar: String, val baz: Int) val foo = Foo("OK", 5) return foo.bar } diff --git a/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt b/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt index c9fceb2653c..a65f1abc6a2 100644 --- a/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt +++ b/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt @@ -4,7 +4,7 @@ enum class MyEnum { K; //TODO: KT-4693 - @inline fun doSmth(a: T) : String { + inline fun doSmth(a: T) : String { return a.toString() + K.name() } } diff --git a/compiler/testData/codegen/script/inline.kts b/compiler/testData/codegen/script/inline.kts index 6de32d8f42d..b341b9d8339 100644 --- a/compiler/testData/codegen/script/inline.kts +++ b/compiler/testData/codegen/script/inline.kts @@ -1,5 +1,5 @@ // expected: rv: 2 -@inline fun foo(l: (Int) -> Int ): Int { +inline fun foo(l: (Int) -> Int ): Int { return l(1) } diff --git a/idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.after.kt b/idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.after.kt index f62c0a567ee..65cdfa8653a 100644 --- a/idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.after.kt +++ b/idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.after.kt @@ -9,7 +9,7 @@ class A @Ann(1)private constructor(x: Int) { inner class B() // do not insert here inner class C protected constructor() { fun foo() { - @data class Local private constructor() + data class Local private constructor() } } } diff --git a/idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.before.Main.kt b/idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.before.Main.kt index bbc90199f08..318e99d9b81 100644 --- a/idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.before.Main.kt +++ b/idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.before.Main.kt @@ -9,7 +9,7 @@ class A @Ann(1)private (x: Int) { inner class B() // do not insert here inner class C protected () { fun foo() { - @data class Local private() + data class Local private() } } } diff --git a/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.after.kt b/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.after.kt index 691951117b5..327d2eb2bf5 100644 --- a/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.after.kt +++ b/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.after.kt @@ -1,7 +1,7 @@ // "Update obsolete label syntax in whole project" "true" // ERROR: Unresolved reference: @abc +// ERROR: Unresolved reference: @ann // ERROR: Unresolved reference: @cde -// ERROR: Unresolved reference: @data // ERROR: Unresolved reference: @labeled // ERROR: Unresolved reference: @loop // ERROR: Unresolved reference: @loop2 @@ -22,8 +22,8 @@ // ERROR: Unresolved reference: notLabelAnnotation // ERROR: Unresolved reference: notLoop // ERROR: The label '@abc' does not denote a loop +// ERROR: The label '@ann' does not denote a loop // ERROR: The label '@cde' does not denote a loop -// ERROR: The label '@data' does not denote a loop // ERROR: The label '@loop' does not denote a loop // ERROR: The label '@loop2' does not denote a loop // ERROR: The label '@loop3' does not denote a loop @@ -32,6 +32,8 @@ fun run(block: () -> Unit) = block() +annotation class ann + notLabelAnnotation class A { fun foo() { loop@ @@ -64,8 +66,8 @@ notLabelAnnotation class A { return@labeled } - @data for (i in 1..100) { - continue@data + @ann for (i in 1..100) { + continue@ann } @ for (i in 1..100) { diff --git a/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt b/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt index 36d074e292a..3147a9ffc96 100644 --- a/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt +++ b/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt @@ -1,7 +1,7 @@ // "Update obsolete label syntax in whole project" "true" // ERROR: Unresolved reference: @abc +// ERROR: Unresolved reference: @ann // ERROR: Unresolved reference: @cde -// ERROR: Unresolved reference: @data // ERROR: Unresolved reference: @labeled // ERROR: Unresolved reference: @loop // ERROR: Unresolved reference: @loop2 @@ -22,8 +22,8 @@ // ERROR: Unresolved reference: notLabelAnnotation // ERROR: Unresolved reference: notLoop // ERROR: The label '@abc' does not denote a loop +// ERROR: The label '@ann' does not denote a loop // ERROR: The label '@cde' does not denote a loop -// ERROR: The label '@data' does not denote a loop // ERROR: The label '@loop' does not denote a loop // ERROR: The label '@loop2' does not denote a loop // ERROR: The label '@loop3' does not denote a loop @@ -32,6 +32,8 @@ fun run(block: () -> Unit) = block() +annotation class ann + notLabelAnnotation class A { fun foo() { @loop @@ -64,8 +66,8 @@ notLabelAnnotation class A { return@labeled } - @data for (i in 1..100) { - continue@data + @ann for (i in 1..100) { + continue@ann } @ for (i in 1..100) { diff --git a/js/js.translator/testData/inline/cases/anonymousObjectInlineMethod.kt b/js/js.translator/testData/inline/cases/anonymousObjectInlineMethod.kt index 9ff87842187..9ac11b5216b 100644 --- a/js/js.translator/testData/inline/cases/anonymousObjectInlineMethod.kt +++ b/js/js.translator/testData/inline/cases/anonymousObjectInlineMethod.kt @@ -2,7 +2,7 @@ package foo fun add(a: Int, b: Int): Int { val o = object { - @inline fun add(a: Int, b: Int): Int = a + b + inline fun add(a: Int, b: Int): Int = a + b } return o.add(a, b) diff --git a/js/js.translator/testData/inline/cases/callableReferenceOfLocalInline.kt b/js/js.translator/testData/inline/cases/callableReferenceOfLocalInline.kt index c9872a2c4a9..4cbde44d9f9 100644 --- a/js/js.translator/testData/inline/cases/callableReferenceOfLocalInline.kt +++ b/js/js.translator/testData/inline/cases/callableReferenceOfLocalInline.kt @@ -1,7 +1,7 @@ package foo fun multiplyBy(x: Int): () -> ((Int) -> Int) { - @inline fun applyMultiplication(y: Int): Int = x * y + inline fun applyMultiplication(y: Int): Int = x * y return { ::applyMultiplication } } diff --git a/js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt b/js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt index 83992789024..1cb475e867b 100644 --- a/js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt +++ b/js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt @@ -12,7 +12,7 @@ internal inline fun repeatAction(times: Int, action: () -> Unit) { } internal fun capturedInLambda(state: State, a: Int, b: Int): Int { - @inline fun State.inc() { + inline fun State.inc() { count++ } @@ -26,7 +26,7 @@ internal fun capturedInLambda(state: State, a: Int, b: Int): Int { internal fun declaredInLambda(state: State, a: Int, b: Int): Int { repeatAction(a) { - @inline fun State.inc() { + inline fun State.inc() { count++ } diff --git a/js/js.translator/testData/inline/cases/localInlineFunction.kt b/js/js.translator/testData/inline/cases/localInlineFunction.kt index 14acb661708..93b160369bd 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunction.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunction.kt @@ -12,7 +12,7 @@ internal inline fun repeatAction(times: Int, action: () -> Unit) { internal fun localWithoutCapture(a: Int, b: Int): Int { var sum = 0 - @inline fun inc(x: Int): Int { + inline fun inc(x: Int): Int { return x + 1 } @@ -26,7 +26,7 @@ internal fun localWithoutCapture(a: Int, b: Int): Int { internal fun localWithCapture(a: Int, b: Int): Int { var sum = 0 - @inline fun inc() { + inline fun inc() { sum++ } diff --git a/js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt b/js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt index 5fdc6abe233..9fc44e9a407 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt @@ -11,21 +11,21 @@ internal inline fun repeatAction(times: Int, action: () -> Unit) { } internal fun add(state: State, a: Int, b: Int): Int { - @inline fun inc(a: Int): Int { + inline fun inc(a: Int): Int { return a + 1 } - @inline fun inc1(a: Int): Int { + inline fun inc1(a: Int): Int { return inc(a) } repeatAction(a) { - @inline fun inc2(a: Int): Int { + inline fun inc2(a: Int): Int { return inc1(a) } repeatAction(b) { - @inline fun State.inc() { + inline fun State.inc() { count = inc2(count) } diff --git a/js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt b/js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt index 26f0b93936c..4accbf37829 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt @@ -13,7 +13,7 @@ internal fun localWithoutCapture(a: Int, b: Int): Int { var mult = 0 repeatAction(a) { - @inline fun inc(x: Int): Int { + inline fun inc(x: Int): Int { return x + 1 } @@ -29,7 +29,7 @@ internal fun localWithCapture(a: Int, b: Int): Int { var mult = 0 repeatAction(a) { - @inline fun inc() { + inline fun inc() { mult++ } diff --git a/js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt b/js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt index 5217f706a71..a6755eb1c23 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt @@ -9,7 +9,7 @@ internal inline fun run(action: () -> Int): Int { internal fun add(a: Int, b: Int): Int { var sum = a + b - @inline fun getSum(): Int { + inline fun getSum(): Int { return sum } diff --git a/js/js.translator/testData/inline/cases/localInlineFunctionReference.kt b/js/js.translator/testData/inline/cases/localInlineFunctionReference.kt index 8375b522c82..43d55785a4f 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunctionReference.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunctionReference.kt @@ -1,7 +1,7 @@ package foo fun multiplyBy(a: Int): (Int) -> Int { - @inline fun multiply(b: Int): Int = a * b + inline fun multiply(b: Int): Int = a * b return ::multiply } diff --git a/js/js.translator/testData/inline/cases/simpleEnum.kt b/js/js.translator/testData/inline/cases/simpleEnum.kt index ea409e09a67..15c7b50eb49 100644 --- a/js/js.translator/testData/inline/cases/simpleEnum.kt +++ b/js/js.translator/testData/inline/cases/simpleEnum.kt @@ -9,7 +9,7 @@ enum class MyEnum { K; //TODO: KT-4693 - @inline fun doSmth(a: T) : String { + inline fun doSmth(a: T) : String { return a.toString() + K.name() } } diff --git a/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt b/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt index aa7590ef535..c5a53354956 100644 --- a/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt +++ b/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt @@ -9,9 +9,9 @@ class State() { } internal fun test(state: State) { - @inline fun test3() { - @inline fun test2() { - @inline fun test1() { + inline fun test3() { + inline fun test2() { + inline fun test1() { loop@ for (i in 1..10) { state.value++ if (i == 2) break@loop