azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update annotation rendering in diagnostics

Browse Source 
Disable annotation rendering in default type and descriptor renderers.
Preserve annotations in Android and Serialization plugins.
Update error texts in ide tests.
Nullability annotations in Java descriptors are rendered with context-dependent renderer.

#KT-20258 Fixed
This commit is contained in:
Pavel Kirpichenkov
2019-09-20 17:01:09 +03:00
parent 2a99687a95
commit b7e5d9faae
54 changed files with 1047 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
Generated
+73
View File
@@ -828,6 +828,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
runTest("compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.kt");
}
@TestMetadata("annotationRenderingInTypes.kt")
public void testAnnotationRenderingInTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt");
}
@TestMetadata("AnnotationsForClasses.kt")
public void testAnnotationsForClasses() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.kt");
@@ -1425,6 +1430,74 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
}
}
@TestMetadata("compiler/testData/diagnostics/tests/annotations/rendering")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Rendering extends AbstractDiagnosticsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInRendering() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/rendering"), Pattern.compile("^(.*)\\.kts?$"), TargetBackend.ANY, true);
}
@TestMetadata("cannotOverrideInvisibleMember.kt")
public void testCannotOverrideInvisibleMember() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.kt");
}
@TestMetadata("conflictingOverloads.kt")
public void testConflictingOverloads() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/conflictingOverloads.kt");
}
@TestMetadata("differentNamesForParameter.kt")
public void testDifferentNamesForParameter() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.kt");
}
@TestMetadata("memberProjectedOut.kt")
public void testMemberProjectedOut() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt");
}
@TestMetadata("multipleInheritedDefaults.kt")
public void testMultipleInheritedDefaults() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/multipleInheritedDefaults.kt");
}
@TestMetadata("notImplementedMembers.kt")
public void testNotImplementedMembers() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.kt");
}
@TestMetadata("tooManyArguments.kt")
public void testTooManyArguments() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/tooManyArguments.kt");
}
@TestMetadata("typeMismatchDueToTypeProjections.kt")
public void testTypeMismatchDueToTypeProjections() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt");
}
@TestMetadata("typeMismatchOnOverride.kt")
public void testTypeMismatchOnOverride() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.kt");
}
@TestMetadata("typeMismatchOnOverrideJavaNullable.kt")
public void testTypeMismatchOnOverrideJavaNullable() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.kt");
}
@TestMetadata("unusedValue.kt")
public void testUnusedValue() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/unusedValue.kt");
}
}
@TestMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
Generated
+73
View File
@@ -828,6 +828,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.kt");
}
@TestMetadata("annotationRenderingInTypes.kt")
public void testAnnotationRenderingInTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt");
}
@TestMetadata("AnnotationsForClasses.kt")
public void testAnnotationsForClasses() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.kt");
@@ -1420,6 +1425,74 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
}
}
@TestMetadata("compiler/testData/diagnostics/tests/annotations/rendering")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Rendering extends AbstractDiagnosticsUsingJavacTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInRendering() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/rendering"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("cannotOverrideInvisibleMember.kt")
public void testCannotOverrideInvisibleMember() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.kt");
}
@TestMetadata("conflictingOverloads.kt")
public void testConflictingOverloads() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/conflictingOverloads.kt");
}
@TestMetadata("differentNamesForParameter.kt")
public void testDifferentNamesForParameter() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.kt");
}
@TestMetadata("memberProjectedOut.kt")
public void testMemberProjectedOut() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt");
}
@TestMetadata("multipleInheritedDefaults.kt")
public void testMultipleInheritedDefaults() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/multipleInheritedDefaults.kt");
}
@TestMetadata("notImplementedMembers.kt")
public void testNotImplementedMembers() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.kt");
}
@TestMetadata("tooManyArguments.kt")
public void testTooManyArguments() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/tooManyArguments.kt");
}
@TestMetadata("typeMismatchDueToTypeProjections.kt")
public void testTypeMismatchDueToTypeProjections() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt");
}
@TestMetadata("typeMismatchOnOverride.kt")
public void testTypeMismatchOnOverride() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.kt");
}
@TestMetadata("typeMismatchOnOverrideJavaNullable.kt")
public void testTypeMismatchOnOverrideJavaNullable() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.kt");
}
@TestMetadata("unusedValue.kt")
public void testUnusedValue() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/rendering/unusedValue.kt");
}
}
@TestMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)