Make TYPE_USE default qualifiers overriding all other applicabilities

If there is default qualifier with TYPE_USE closer than one with METHOD
then its nullability should be considered even when enhancing return type

 #KT-20016 Fixed
This commit is contained in:
Denis Zharkov
2017-09-28 15:29:26 +03:00
parent 62f293280c
commit 13bf35f48e
8 changed files with 143 additions and 6 deletions
@@ -79,6 +79,12 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated extends
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt");
doTest(fileName);
}
@TestMetadata("typeUseVsMethodConflict.kt")
public void testTypeUseVsMethodConflict() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement")
@@ -79,6 +79,12 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingT
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt");
doTest(fileName);
}
@TestMetadata("typeUseVsMethodConflict.kt")
public void testTypeUseVsMethodConflict() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement")
@@ -79,6 +79,12 @@ public class ForeignJava8AnnotationsTestGenerated extends AbstractForeignJava8An
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt");
doTest(fileName);
}
@TestMetadata("typeUseVsMethodConflict.kt")
public void testTypeUseVsMethodConflict() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement")
@@ -79,6 +79,12 @@ public class JavacForeignJava8AnnotationsTestGenerated extends AbstractJavacFore
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt");
doTest(fileName);
}
@TestMetadata("typeUseVsMethodConflict.kt")
public void testTypeUseVsMethodConflict() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement")