diff --git a/compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.fir.kt similarity index 98% rename from compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.fir.kt rename to compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.fir.kt index 77448fc7d1f..9535f08cc56 100644 --- a/compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.fir.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.fir.kt @@ -1,5 +1,3 @@ -// WITH_STDLIB - fun foo(ll: java.util.LinkedList, al: ArrayList, ad: ArrayDeque, jad: java.util.ArrayDeque) { ll.addFirst("") ll.addLast("") diff --git a/compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt b/compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt similarity index 99% rename from compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt rename to compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt index 0eeb0376861..bb5a6c01767 100644 --- a/compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt @@ -1,5 +1,3 @@ -// WITH_STDLIB - fun foo(ll: java.util.LinkedList, al: ArrayList, ad: ArrayDeque, jad: java.util.ArrayDeque) { ll.addFirst("") ll.addLast("") diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.diag.txt b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.diag.txt similarity index 83% rename from compiler/testData/diagnostics/testsWithJdk21/newListMethods.diag.txt rename to compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.diag.txt index 979104a128c..27d6dcf5ce2 100644 --- a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.diag.txt +++ b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.diag.txt @@ -1,48 +1,49 @@ -/newListMethods.kt:14:18: warning: this declaration overrides deprecated member but not marked as deprecated itself. Please add @Deprecated annotation or suppress. See https://youtrack.jetbrains.com/issue/KT-47902 for details +/newListMethods.kt:13:18: warning: this declaration overrides deprecated member but not marked as deprecated itself. Please add @Deprecated annotation or suppress. See https://youtrack.jetbrains.com/issue/KT-47902 for details override fun getFirst(): T = super.getFirst() ^ -/newListMethods.kt:14:40: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead +/newListMethods.kt:13:40: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead override fun getFirst(): T = super.getFirst() ^ -/newListMethods.kt:15:18: warning: this declaration overrides deprecated member but not marked as deprecated itself. Please add @Deprecated annotation or suppress. See https://youtrack.jetbrains.com/issue/KT-47902 for details +/newListMethods.kt:14:18: warning: this declaration overrides deprecated member but not marked as deprecated itself. Please add @Deprecated annotation or suppress. See https://youtrack.jetbrains.com/issue/KT-47902 for details override fun getLast(): T = super.getLast() ^ -/newListMethods.kt:15:39: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead +/newListMethods.kt:14:39: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead override fun getLast(): T = super.getLast() ^ -/newListMethods.kt:26:7: warning: 'getFirst(): E!' is deprecated. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead +/newListMethods.kt:25:7: warning: 'getFirst(): E!' is deprecated. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead x.getFirst() ^ -/newListMethods.kt:27:7: warning: 'getter for first: E!' is deprecated. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead +/newListMethods.kt:26:7: warning: 'getter for first: E!' is deprecated. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead x.first // synthetic property for getFirst() ^ -/newListMethods.kt:29:7: warning: 'getLast(): E!' is deprecated. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead +/newListMethods.kt:28:7: warning: 'getLast(): E!' is deprecated. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead x.getLast() ^ -/newListMethods.kt:30:7: warning: 'getter for last: E!' is deprecated. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead +/newListMethods.kt:29:7: warning: 'getter for last: E!' is deprecated. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead x.last ^ -/newListMethods.kt:38:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead +/newListMethods.kt:37:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead y.getFirst() ^ -/newListMethods.kt:39:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead +/newListMethods.kt:38:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead y.first ^ -/newListMethods.kt:41:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead +/newListMethods.kt:40:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead y.getLast() ^ -/newListMethods.kt:42:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead +/newListMethods.kt:41:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead y.last ^ -/newListMethods.kt:50:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead +/newListMethods.kt:49:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead z.getFirst() ^ -/newListMethods.kt:51:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead +/newListMethods.kt:50:7: warning: 'getFirst(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getFirst()' member of List is redundant in Kotlin and might be removed soon. Please use 'first()' stdlib extension instead z.first ^ -/newListMethods.kt:53:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead +/newListMethods.kt:52:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead z.getLast() ^ -/newListMethods.kt:54:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead +/newListMethods.kt:53:7: warning: 'getLast(): E!' is deprecated. Overrides deprecated member in 'java.util.AbstractList'. 'getLast()' member of List is redundant in Kotlin and might be removed soon. Please use 'last()' stdlib extension instead z.last ^ + diff --git a/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.diag.txt b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.diag.txt new file mode 100644 index 00000000000..ab89cdbee72 --- /dev/null +++ b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.diag.txt @@ -0,0 +1,23 @@ +/newListMethods.fir.kt:(596,604): error: Unresolved reference 'getFirst'. + +/newListMethods.fir.kt:(613,618): error: Function invocation 'first()' expected. + +/newListMethods.fir.kt:(704,711): error: Unresolved reference 'getLast'. + +/newListMethods.fir.kt:(720,724): error: Function invocation 'last()' expected. + +/newListMethods.fir.kt:(838,846): error: Unresolved reference 'getFirst'. + +/newListMethods.fir.kt:(855,860): error: Function invocation 'first()' expected. + +/newListMethods.fir.kt:(881,888): error: Unresolved reference 'getLast'. + +/newListMethods.fir.kt:(897,901): error: Function invocation 'last()' expected. + +/newListMethods.fir.kt:(1015,1023): error: Unresolved reference 'getFirst'. + +/newListMethods.fir.kt:(1032,1037): error: Function invocation 'first()' expected. + +/newListMethods.fir.kt:(1058,1065): error: Unresolved reference 'getLast'. + +/newListMethods.fir.kt:(1074,1078): error: Function invocation 'last()' expected. diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.kt similarity index 99% rename from compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt rename to compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.kt index 58b5287e7be..fbce321a2af 100644 --- a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.kt @@ -1,5 +1,4 @@ // ISSUE: KT-58371 -// WITH_STDLIB // RENDER_DIAGNOSTICS_FULL_TEXT class A : ArrayList() { diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt similarity index 99% rename from compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt rename to compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt index 2bc052119b7..ddacc375494 100644 --- a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt @@ -1,5 +1,4 @@ // ISSUE: KT-58371 -// WITH_STDLIB // RENDER_DIAGNOSTICS_FULL_TEXT class A : ArrayList() { diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.fir.kt similarity index 82% rename from compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt rename to compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.fir.kt index ed2b12bd64d..ccdfe5be644 100644 --- a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.fir.kt @@ -1,5 +1,4 @@ // ISSUE: KT-64640 -// WITH_STDLIB fun bar(x: List) { x.addFirst("") @@ -15,8 +14,8 @@ fun baz(x: ArrayDeque, y: LinkedHashSet) { x.removeFirst() x.removeLast() - x.addFirst("") - x.addLast("") - x.removeFirst() - x.removeLast() + y.addFirst("") + y.addLast("") + y.removeFirst() + y.removeLast() } diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt similarity index 83% rename from compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt rename to compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt index 32fe22494f8..14209d70c4c 100644 --- a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt @@ -1,5 +1,4 @@ // ISSUE: KT-64640 -// WITH_STDLIB fun bar(x: List) { x.addFirst("") @@ -15,8 +14,8 @@ fun baz(x: ArrayDeque, y: LinkedHashSet) { x.removeFirst() x.removeLast() - x.addFirst("") - x.addLast("") - x.removeFirst() - x.removeLast() + y.addFirst("") + y.addLast("") + y.removeFirst() + y.removeLast() } diff --git a/compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt b/compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt similarity index 100% rename from compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt rename to compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.diag.txt b/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.diag.txt deleted file mode 100644 index 77463f5362b..00000000000 --- a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.diag.txt +++ /dev/null @@ -1,23 +0,0 @@ -/newListMethods.fir.kt:(611,619): error: Unresolved reference 'getFirst'. - -/newListMethods.fir.kt:(628,633): error: Function invocation 'first()' expected. - -/newListMethods.fir.kt:(719,726): error: Unresolved reference 'getLast'. - -/newListMethods.fir.kt:(735,739): error: Function invocation 'last()' expected. - -/newListMethods.fir.kt:(853,861): error: Unresolved reference 'getFirst'. - -/newListMethods.fir.kt:(870,875): error: Function invocation 'first()' expected. - -/newListMethods.fir.kt:(896,903): error: Unresolved reference 'getLast'. - -/newListMethods.fir.kt:(912,916): error: Function invocation 'last()' expected. - -/newListMethods.fir.kt:(1030,1038): error: Unresolved reference 'getFirst'. - -/newListMethods.fir.kt:(1047,1052): error: Function invocation 'first()' expected. - -/newListMethods.fir.kt:(1073,1080): error: Unresolved reference 'getLast'. - -/newListMethods.fir.kt:(1089,1093): error: Function invocation 'last()' expected.