diff --git a/java/jdkAnnotations/java/util/annotations.xml b/java/jdkAnnotations/java/util/annotations.xml index 654b1f05c956..2fc7381ab725 100644 --- a/java/jdkAnnotations/java/util/annotations.xml +++ b/java/jdkAnnotations/java/util/annotations.xml @@ -1907,6 +1907,9 @@ + + + @@ -1950,6 +1953,9 @@ + + + @@ -1980,16 +1986,19 @@ + + + @@ -3352,6 +3361,9 @@ + + + @@ -3367,11 +3379,17 @@ + + + + + + diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt index 4beaf31af97b..ec7482f5921a 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt @@ -4,7 +4,7 @@ abstract class A : List { } // MEMBER_K2: "forEach(action: Consumer?): Unit" -// MEMBER_K2: " toArray(generator: IntFunction?>?): Array?" +// MEMBER_K2: " toArray(generator: IntFunction?>): Array?" // MEMBER_K2: "spliterator(): Spliterator" // MEMBER_K1: "forEach(action: Consumer!): Unit" diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after index f560a99c5373..0a6f95743ab8 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after @@ -8,7 +8,7 @@ abstract class A : List { } // MEMBER_K2: "forEach(action: Consumer?): Unit" -// MEMBER_K2: " toArray(generator: IntFunction?>?): Array?" +// MEMBER_K2: " toArray(generator: IntFunction?>): Array?" // MEMBER_K2: "spliterator(): Spliterator" // MEMBER_K1: "forEach(action: Consumer!): Unit"