From 2685c7efce8e851b6e48912ea57f6cc2de2f910b Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Thu, 8 Oct 2020 11:41:30 +0300 Subject: [PATCH] Jspecify: Rename codeanalysis annotations to jspecify ones --- .../JavaTypeEnhancementStateParser.kt | 16 +-- compiler/testData/cli/jvm/codeanalysis/A.java | 7 -- .../testData/cli/jvm/codeanalysisDefault.out | 7 -- .../testData/cli/jvm/codeanalysisIgnore.args | 6 - .../testData/cli/jvm/codeanalysisStrict.args | 6 - compiler/testData/cli/jvm/extraHelp.out | 6 +- compiler/testData/cli/jvm/jspecify/A.java | 7 ++ ...lysisDefault.args => jspecifyDefault.args} | 0 ...deanalysisWarn.out => jspecifyDefault.out} | 0 compiler/testData/cli/jvm/jspecifyIgnore.args | 6 + ...eanalysisIgnore.out => jspecifyIgnore.out} | 0 compiler/testData/cli/jvm/jspecifyStrict.args | 6 + ...eanalysisStrict.out => jspecifyStrict.out} | 0 ...{codeanalysisUsage.kt => jspecifyUsage.kt} | 0 ...odeanalysisWarn.args => jspecifyWarn.args} | 4 +- compiler/testData/cli/jvm/jspecifyWarn.out | 7 ++ .../tests/jspecify/ignoreAnnotations.kt | 2 +- .../typeArgumentsFromParameterBounds.kt | 2 +- .../jspecify/warnings/annotatedWildcards.kt | 2 +- .../tests/jspecify/warnings/defaults.kt | 2 +- .../warnings/nonPlatformTypeParameter.kt | 2 +- .../tests/jspecify/warnings/simple.kt | 2 +- .../typeArgumentsFromParameterBounds.kt | 2 +- .../jspecify/warnings/typeParameterBounds.kt | 2 +- .../warnings/unknownNullnessTypeParameter.kt | 2 +- .../jspecify/warnings/wildcardsWithDefault.kt | 2 +- .../AbstractForeignAnnotationsTest.kt | 6 +- ...sNoAnnotationInClasspathTestGenerated.java | 118 +----------------- ...spathWithPsiClassReadingTestGenerated.java | 118 +----------------- .../ForeignJava8AnnotationsTestGenerated.java | 13 ++ ...cForeignJava8AnnotationsTestGenerated.java | 13 ++ .../generators/tests/GenerateJava8Tests.kt | 4 +- .../kotlin/cli/CliTestGenerated.java | 40 +++--- .../load/java/AnnotationQualifiersFqNames.kt | 4 +- .../java/AnnotationTypeQualifierResolver.kt | 2 +- .../kotlin/utils/JavaTypeEnhancementState.kt | 4 +- 36 files changed, 107 insertions(+), 313 deletions(-) delete mode 100644 compiler/testData/cli/jvm/codeanalysis/A.java delete mode 100644 compiler/testData/cli/jvm/codeanalysisDefault.out delete mode 100644 compiler/testData/cli/jvm/codeanalysisIgnore.args delete mode 100644 compiler/testData/cli/jvm/codeanalysisStrict.args create mode 100644 compiler/testData/cli/jvm/jspecify/A.java rename compiler/testData/cli/jvm/{codeanalysisDefault.args => jspecifyDefault.args} (100%) rename compiler/testData/cli/jvm/{codeanalysisWarn.out => jspecifyDefault.out} (100%) create mode 100644 compiler/testData/cli/jvm/jspecifyIgnore.args rename compiler/testData/cli/jvm/{codeanalysisIgnore.out => jspecifyIgnore.out} (100%) create mode 100644 compiler/testData/cli/jvm/jspecifyStrict.args rename compiler/testData/cli/jvm/{codeanalysisStrict.out => jspecifyStrict.out} (100%) rename compiler/testData/cli/jvm/{codeanalysisUsage.kt => jspecifyUsage.kt} (100%) rename compiler/testData/cli/jvm/{codeanalysisWarn.args => jspecifyWarn.args} (51%) create mode 100644 compiler/testData/cli/jvm/jspecifyWarn.out diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt index f2b6ce1b292..3f02f9abdc0 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt @@ -25,7 +25,7 @@ class JavaTypeEnhancementStateParser(private val collector: MessageCollector) { fun parse( jsr305Args: Array?, supportCompatqualCheckerFrameworkAnnotations: String?, - codeAnalysisState: String? + jspecifyState: String? ): JavaTypeEnhancementState { val jsr305State = parseJsr305State(jsr305Args) @@ -42,29 +42,29 @@ class JavaTypeEnhancementStateParser(private val collector: MessageCollector) { } } - val codeAnalysisReportLevel = parseCodeAnalysisReportLevel(codeAnalysisState) + val jspecifyReportLevel = parseJspecifyReportLevel(jspecifyState) val state = JavaTypeEnhancementState( jsr305State.global ?: ReportLevel.WARN, jsr305State.migration, jsr305State.usedDefined, enableCompatqualCheckerFrameworkAnnotations = enableCompatqualCheckerFrameworkAnnotations ?: JavaTypeEnhancementState.COMPATQUAL_CHECKER_FRAMEWORK_ANNOTATIONS_SUPPORT_DEFAULT_VALUE, - jspecifyReportLevel = codeAnalysisReportLevel + jspecifyReportLevel = jspecifyReportLevel ) return if (state == JavaTypeEnhancementState.DISABLED_JSR_305) JavaTypeEnhancementState.DISABLED_JSR_305 else state } - private fun parseCodeAnalysisReportLevel(codeAnalysisState: String?): ReportLevel { - if (codeAnalysisState == null) return JavaTypeEnhancementState.DEFAULT_REPORT_LEVEL_FOR_CODE_ANALYSIS - val reportLevel = ReportLevel.findByDescription(codeAnalysisState) + private fun parseJspecifyReportLevel(jspecifyState: String?): ReportLevel { + if (jspecifyState == null) return JavaTypeEnhancementState.DEFAULT_REPORT_LEVEL_FOR_JSPECIFY + val reportLevel = ReportLevel.findByDescription(jspecifyState) if (reportLevel == null) { collector.report( CompilerMessageSeverity.ERROR, - "Unrecognized -Xcodeanalysis-annotations option: $codeAnalysisState. Possible values are 'disable'/'warn'/'strict'" + "Unrecognized -Xjspecify-annotations option: $jspecifyState. Possible values are 'disable'/'warn'/'strict'" ) - return JavaTypeEnhancementState.DEFAULT_REPORT_LEVEL_FOR_CODE_ANALYSIS + return JavaTypeEnhancementState.DEFAULT_REPORT_LEVEL_FOR_JSPECIFY } return reportLevel diff --git a/compiler/testData/cli/jvm/codeanalysis/A.java b/compiler/testData/cli/jvm/codeanalysis/A.java deleted file mode 100644 index 5ca1e304e92..00000000000 --- a/compiler/testData/cli/jvm/codeanalysis/A.java +++ /dev/null @@ -1,7 +0,0 @@ -@codeanalysis.experimental.annotations.DefaultNotNull -public class A { - public void foo(String x) {} - - @codeanalysis.experimental.annotations.Nullable - public String bar() { return null; } -} diff --git a/compiler/testData/cli/jvm/codeanalysisDefault.out b/compiler/testData/cli/jvm/codeanalysisDefault.out deleted file mode 100644 index bf21be97ece..00000000000 --- a/compiler/testData/cli/jvm/codeanalysisDefault.out +++ /dev/null @@ -1,7 +0,0 @@ -compiler/testData/cli/jvm/codeanalysisUsage.kt:2:11: warning: type mismatch: inferred type is Nothing? but String was expected - a.foo(null) - ^ -compiler/testData/cli/jvm/codeanalysisUsage.kt:3:5: warning: unsafe use of a nullable receiver of type String? - a.bar().hashCode() - ^ -OK diff --git a/compiler/testData/cli/jvm/codeanalysisIgnore.args b/compiler/testData/cli/jvm/codeanalysisIgnore.args deleted file mode 100644 index b796c76ceaf..00000000000 --- a/compiler/testData/cli/jvm/codeanalysisIgnore.args +++ /dev/null @@ -1,6 +0,0 @@ --Xcodeanalysis-annotations=ignore -$TESTDATA_DIR$/codeanalysisUsage.kt -$TESTDATA_DIR$/codeanalysis -$FOREIGN_ANNOTATIONS_DIR$ --d -$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/codeanalysisStrict.args b/compiler/testData/cli/jvm/codeanalysisStrict.args deleted file mode 100644 index 24e6c7a50ce..00000000000 --- a/compiler/testData/cli/jvm/codeanalysisStrict.args +++ /dev/null @@ -1,6 +0,0 @@ --Xcodeanalysis-annotations=strict -$TESTDATA_DIR$/codeanalysisUsage.kt -$TESTDATA_DIR$/codeanalysis -$FOREIGN_ANNOTATIONS_DIR$ --d -$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index 7e451fd000f..ef26a2189e2 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -12,9 +12,6 @@ where advanced options include: -Xassertions=legacy: calculate condition on each call, check depends on jvm assertion settings in the kotlin package; default: legacy -Xbuild-file= Path to the .xml build file to compile - -Xcodeanalysis-annotations=ignore|strict|warn - Specify behavior for Codeanalysis annotations. - Default value is 'warn' -Xcompile-java Reuse javac analysis and compile Java source files -Xnormalize-constructor-calls={disable|enable} Normalize constructor calls (disable: don't normalize; enable: normalize), @@ -32,6 +29,9 @@ where advanced options include: -Xjava-package-prefix Package prefix for Java files -Xjava-source-roots= Paths to directories with Java source files -Xjavac-arguments= Java compiler arguments + -Xjspecify-annotations=ignore|strict|warn + Specify behavior for jspecify annotations. + Default value is 'warn' -Xjsr305={ignore/strict/warn}|under-migration:{ignore/strict/warn}|@:{ignore/strict/warn} Specify behavior for JSR-305 nullability annotations: -Xjsr305={ignore/strict/warn} globally (all non-@UnderMigration annotations) diff --git a/compiler/testData/cli/jvm/jspecify/A.java b/compiler/testData/cli/jvm/jspecify/A.java new file mode 100644 index 00000000000..bcc31435060 --- /dev/null +++ b/compiler/testData/cli/jvm/jspecify/A.java @@ -0,0 +1,7 @@ +@org.jspecify.annotations.DefaultNotNull +public class A { + public void foo(String x) {} + + @org.jspecify.annotations.Nullable + public String bar() { return null; } +} diff --git a/compiler/testData/cli/jvm/codeanalysisDefault.args b/compiler/testData/cli/jvm/jspecifyDefault.args similarity index 100% rename from compiler/testData/cli/jvm/codeanalysisDefault.args rename to compiler/testData/cli/jvm/jspecifyDefault.args diff --git a/compiler/testData/cli/jvm/codeanalysisWarn.out b/compiler/testData/cli/jvm/jspecifyDefault.out similarity index 100% rename from compiler/testData/cli/jvm/codeanalysisWarn.out rename to compiler/testData/cli/jvm/jspecifyDefault.out diff --git a/compiler/testData/cli/jvm/jspecifyIgnore.args b/compiler/testData/cli/jvm/jspecifyIgnore.args new file mode 100644 index 00000000000..8f45dc80919 --- /dev/null +++ b/compiler/testData/cli/jvm/jspecifyIgnore.args @@ -0,0 +1,6 @@ +-Xjspecify-annotations=ignore +$TESTDATA_DIR$/jspecifyUsage.kt +$TESTDATA_DIR$/jspecify +$FOREIGN_ANNOTATIONS_DIR$ +-d +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/codeanalysisIgnore.out b/compiler/testData/cli/jvm/jspecifyIgnore.out similarity index 100% rename from compiler/testData/cli/jvm/codeanalysisIgnore.out rename to compiler/testData/cli/jvm/jspecifyIgnore.out diff --git a/compiler/testData/cli/jvm/jspecifyStrict.args b/compiler/testData/cli/jvm/jspecifyStrict.args new file mode 100644 index 00000000000..4ae71f84fa7 --- /dev/null +++ b/compiler/testData/cli/jvm/jspecifyStrict.args @@ -0,0 +1,6 @@ +-Xjspecify-annotations=strict +$TESTDATA_DIR$/jspecifyUsage.kt +$TESTDATA_DIR$/jspecify +$FOREIGN_ANNOTATIONS_DIR$ +-d +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/codeanalysisStrict.out b/compiler/testData/cli/jvm/jspecifyStrict.out similarity index 100% rename from compiler/testData/cli/jvm/codeanalysisStrict.out rename to compiler/testData/cli/jvm/jspecifyStrict.out diff --git a/compiler/testData/cli/jvm/codeanalysisUsage.kt b/compiler/testData/cli/jvm/jspecifyUsage.kt similarity index 100% rename from compiler/testData/cli/jvm/codeanalysisUsage.kt rename to compiler/testData/cli/jvm/jspecifyUsage.kt diff --git a/compiler/testData/cli/jvm/codeanalysisWarn.args b/compiler/testData/cli/jvm/jspecifyWarn.args similarity index 51% rename from compiler/testData/cli/jvm/codeanalysisWarn.args rename to compiler/testData/cli/jvm/jspecifyWarn.args index 23d2c264f70..4736cce9f0b 100644 --- a/compiler/testData/cli/jvm/codeanalysisWarn.args +++ b/compiler/testData/cli/jvm/jspecifyWarn.args @@ -1,6 +1,6 @@ -Xjspecify-annotations=warn -$TESTDATA_DIR$/codeanalysisUsage.kt -$TESTDATA_DIR$/codeanalysis +$TESTDATA_DIR$/jspecifyUsage.kt +$TESTDATA_DIR$/jspecify $FOREIGN_ANNOTATIONS_DIR$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jspecifyWarn.out b/compiler/testData/cli/jvm/jspecifyWarn.out new file mode 100644 index 00000000000..7c2a6d77f6e --- /dev/null +++ b/compiler/testData/cli/jvm/jspecifyWarn.out @@ -0,0 +1,7 @@ +compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: type mismatch: inferred type is Nothing? but String was expected + a.foo(null) + ^ +compiler/testData/cli/jvm/jspecifyUsage.kt:3:5: warning: unsafe use of a nullable receiver of type String? + a.bar().hashCode() + ^ +OK diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt index c6399cd9120..17e83691542 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE ignore +// JSPECIFY_STATE ignore // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt index c0d05f251c9..5eed26f0bfa 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt @@ -28,7 +28,7 @@ public class C { import org.jspecify.annotations.*; -@DefaultUnknownNullness +@DefaultNullnessUnknown public class D { public void bar(A a) {} } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt index 4794c08f07b..808ac0f9111 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE warn +// JSPECIFY_STATE warn // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt index 7656b0a2a68..409e5868839 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE warn +// JSPECIFY_STATE warn // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt index 9ffe3e92745..f1bd077c105 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE warn +// JSPECIFY_STATE warn // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt index 97cd708e06c..6f2a0e8f733 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE warn +// JSPECIFY_STATE warn // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt index 2ac02618e2e..c065a64907c 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE warn +// JSPECIFY_STATE warn // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt index a430cb95713..76cf41bb410 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE warn +// JSPECIFY_STATE warn // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt index 6938226956b..2013f6a1933 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE warn +// JSPECIFY_STATE warn // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt index 05bfb8689ae..0f017db21f6 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// CODE_ANALYSIS_STATE warn +// JSPECIFY_STATE warn // FILE: A.java import org.jspecify.annotations.*; diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt index cf719b9a0bb..bca87670eb2 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt @@ -31,7 +31,7 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() { private val JSR305_GLOBAL_DIRECTIVE = "JSR305_GLOBAL_REPORT" private val JSR305_MIGRATION_DIRECTIVE = "JSR305_MIGRATION_REPORT" private val JSR305_SPECIAL_DIRECTIVE = "JSR305_SPECIAL_REPORT" - private val CODE_ANALYSIS_STATE_SPECIAL_DIRECTIVE = "CODE_ANALYSIS_STATE" + private val JSPECIFY_STATE_SPECIAL_DIRECTIVE = "JSPECIFY_STATE" override fun getExtraClasspath(): List { val foreignAnnotations = createJarWithForeignAnnotations() @@ -77,14 +77,14 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() { name to state }.toMap() - val codeAnalysisReportLevel = module.getDirectiveValue(CODE_ANALYSIS_STATE_SPECIAL_DIRECTIVE) ?: ReportLevel.STRICT + val jspecifyReportLevel = module.getDirectiveValue(JSPECIFY_STATE_SPECIAL_DIRECTIVE) ?: ReportLevel.STRICT return mapOf( JvmAnalysisFlags.javaTypeEnhancementState to JavaTypeEnhancementState( globalState, migrationState, userAnnotationsState, - jspecifyReportLevel = codeAnalysisReportLevel + jspecifyReportLevel = jspecifyReportLevel ) ) } diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java index 04b1f39b5a4..0dee259c9ad 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java @@ -25,7 +25,7 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated extends } public void testAllFilesPresentInTests() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests"), Pattern.compile("^(.+)\\.kt$"), null, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify"); } @TestMetadata("checkerFramework.kt") @@ -43,122 +43,6 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated extends runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt"); } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Jspecify extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInJspecify() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt"); - } - - @TestMetadata("defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt"); - } - - @TestMetadata("ignoreAnnotations.kt") - public void testIgnoreAnnotations() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt"); - } - - @TestMetadata("nonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt"); - } - - @TestMetadata("selfType.kt") - public void testSelfType() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt"); - } - - @TestMetadata("typeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt"); - } - - @TestMetadata("typeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt"); - } - - @TestMetadata("unknownNullnessTypeParameter.kt") - public void testUnknownNullnessTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt"); - } - - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Warnings extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInWarnings() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt"); - } - - @TestMetadata("defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt"); - } - - @TestMetadata("nonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt"); - } - - @TestMetadata("typeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt"); - } - - @TestMetadata("typeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt"); - } - - @TestMetadata("unknownNullnessTypeParameter.kt") - public void testUnknownNullnessTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt"); - } - } - } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java index 40b484d2b85..d37c99f58f0 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java @@ -25,7 +25,7 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTe } public void testAllFilesPresentInTests() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests"), Pattern.compile("^(.+)\\.kt$"), null, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify"); } @TestMetadata("checkerFramework.kt") @@ -43,122 +43,6 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTe runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt"); } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Jspecify extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInJspecify() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt"); - } - - @TestMetadata("defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt"); - } - - @TestMetadata("ignoreAnnotations.kt") - public void testIgnoreAnnotations() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt"); - } - - @TestMetadata("nonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/nonPlatformTypeParameter.kt"); - } - - @TestMetadata("selfType.kt") - public void testSelfType() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/selfType.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt"); - } - - @TestMetadata("typeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt"); - } - - @TestMetadata("typeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeParameterBounds.kt"); - } - - @TestMetadata("unknownNullnessTypeParameter.kt") - public void testUnknownNullnessTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/unknownNullnessTypeParameter.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt"); - } - - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Warnings extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInWarnings() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("annotatedWildcards.kt") - public void testAnnotatedWildcards() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt"); - } - - @TestMetadata("defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt"); - } - - @TestMetadata("nonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/nonPlatformTypeParameter.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt"); - } - - @TestMetadata("typeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt"); - } - - @TestMetadata("typeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeParameterBounds.kt"); - } - - @TestMetadata("unknownNullnessTypeParameter.kt") - public void testUnknownNullnessTypeParameter() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/unknownNullnessTypeParameter.kt"); - } - - @TestMetadata("wildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt"); - } - } - } - @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java index db6e23b57df..122b34da2e4 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java @@ -105,6 +105,19 @@ public class ForeignJava8AnnotationsTestGenerated extends AbstractForeignJava8An runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt"); } + @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Kotlin extends AbstractForeignJava8AnnotationsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInKotlin() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + } + @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java index dde61069832..1078c0f7461 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java @@ -105,6 +105,19 @@ public class JavacForeignJava8AnnotationsTestGenerated extends AbstractJavacFore runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt"); } + @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Kotlin extends AbstractJavacForeignJava8AnnotationsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInKotlin() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + } + @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt index a4c9222fdde..b468363b0fc 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt @@ -40,11 +40,11 @@ fun main(args: Array) { } testClass { - model("foreignAnnotationsJava8/tests") + model("foreignAnnotationsJava8/tests", excludeDirs = listOf("jspecify")) } testClass { - model("foreignAnnotationsJava8/tests") + model("foreignAnnotationsJava8/tests", excludeDirs = listOf("jspecify")) } testClass { diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java index 1c8ccff3b36..9c8ee054464 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java @@ -115,26 +115,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/classpath.args"); } - @TestMetadata("codeanalysisDefault.args") - public void testCodeanalysisDefault() throws Exception { - runTest("compiler/testData/cli/jvm/codeanalysisDefault.args"); - } - - @TestMetadata("codeanalysisIgnore.args") - public void testCodeanalysisIgnore() throws Exception { - runTest("compiler/testData/cli/jvm/codeanalysisIgnore.args"); - } - - @TestMetadata("codeanalysisStrict.args") - public void testCodeanalysisStrict() throws Exception { - runTest("compiler/testData/cli/jvm/codeanalysisStrict.args"); - } - - @TestMetadata("codeanalysisWarn.args") - public void testCodeanalysisWarn() throws Exception { - runTest("compiler/testData/cli/jvm/codeanalysisWarn.args"); - } - @TestMetadata("compatqualDefault.args") public void testCompatqualDefault() throws Exception { runTest("compiler/testData/cli/jvm/compatqualDefault.args"); @@ -445,6 +425,26 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/jdkPathDoesNotExist.args"); } + @TestMetadata("jspecifyDefault.args") + public void testJspecifyDefault() throws Exception { + runTest("compiler/testData/cli/jvm/jspecifyDefault.args"); + } + + @TestMetadata("jspecifyIgnore.args") + public void testJspecifyIgnore() throws Exception { + runTest("compiler/testData/cli/jvm/jspecifyIgnore.args"); + } + + @TestMetadata("jspecifyStrict.args") + public void testJspecifyStrict() throws Exception { + runTest("compiler/testData/cli/jvm/jspecifyStrict.args"); + } + + @TestMetadata("jspecifyWarn.args") + public void testJspecifyWarn() throws Exception { + runTest("compiler/testData/cli/jvm/jspecifyWarn.args"); + } + @TestMetadata("jsr305AllIgnore.args") public void testJsr305AllIgnore() throws Exception { runTest("compiler/testData/cli/jvm/jsr305AllIgnore.args"); diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt index 5945dfb866e..af32b82ed2e 100644 --- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt +++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt @@ -31,7 +31,7 @@ val DEFAULT_JSPECIFY_APPLICABILITY = listOf( AnnotationQualifierApplicabilityType.TYPE_USE ) -val CODE_ANALYSIS_DEFAULT_ANNOTATIONS = mapOf( +val JSPECIFY_DEFAULT_ANNOTATIONS = mapOf( JSPECIFY_DEFAULT_NULLABLE to JavaDefaultQualifiers( NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NULLABLE), DEFAULT_JSPECIFY_APPLICABILITY @@ -58,6 +58,6 @@ val BUILT_IN_TYPE_QUALIFIER_DEFAULT_ANNOTATIONS = mapOf( NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL), listOf(AnnotationQualifierApplicabilityType.VALUE_PARAMETER) ) -) + CODE_ANALYSIS_DEFAULT_ANNOTATIONS +) + JSPECIFY_DEFAULT_ANNOTATIONS val BUILT_IN_TYPE_QUALIFIER_FQ_NAMES = setOf(JAVAX_NONNULL_ANNOTATION, JAVAX_CHECKFORNULL_ANNOTATION) diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt index 47d7cddedab..c7dbcd01447 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt @@ -92,7 +92,7 @@ class AnnotationTypeQualifierResolver(storageManager: StorageManager, private va } private fun resolveDefaultAnnotationState(annotationDescriptor: AnnotationDescriptor): ReportLevel { - if (annotationDescriptor.fqName in CODE_ANALYSIS_DEFAULT_ANNOTATIONS) { + if (annotationDescriptor.fqName in JSPECIFY_DEFAULT_ANNOTATIONS) { return javaTypeEnhancementState.jspecifyReportLevel } diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/JavaTypeEnhancementState.kt b/core/util.runtime/src/org/jetbrains/kotlin/utils/JavaTypeEnhancementState.kt index 1b4d7376aa1..6a3fc3d8a7c 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/utils/JavaTypeEnhancementState.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/utils/JavaTypeEnhancementState.kt @@ -35,7 +35,7 @@ class JavaTypeEnhancementState( val migrationLevelForJsr305: ReportLevel?, val userDefinedLevelForSpecificJsr305Annotation: Map, val enableCompatqualCheckerFrameworkAnnotations: Boolean = COMPATQUAL_CHECKER_FRAMEWORK_ANNOTATIONS_SUPPORT_DEFAULT_VALUE, - val jspecifyReportLevel: ReportLevel = DEFAULT_REPORT_LEVEL_FOR_CODE_ANALYSIS + val jspecifyReportLevel: ReportLevel = DEFAULT_REPORT_LEVEL_FOR_JSPECIFY ) { val description: Array by lazy { val result = mutableListOf() @@ -61,7 +61,7 @@ class JavaTypeEnhancementState( const val COMPATQUAL_CHECKER_FRAMEWORK_ANNOTATIONS_SUPPORT_DEFAULT_VALUE = true @JvmField - val DEFAULT_REPORT_LEVEL_FOR_CODE_ANALYSIS = ReportLevel.WARN + val DEFAULT_REPORT_LEVEL_FOR_JSPECIFY = ReportLevel.WARN @JvmField val DEFAULT: JavaTypeEnhancementState = JavaTypeEnhancementState(ReportLevel.WARN, null, emptyMap())