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

Add warnings for jsr305 nullable annotations

Browse Source 
#KT-19115 Fixed
This commit is contained in:
e5l
2017-08-11 14:21:23 +03:00
parent 746de612ad
commit 5501cdf049
33 changed files with 506 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
+2 -2
View File
@@ -43,9 +43,9 @@ object IDELanguageSettingsProvider : LanguageSettingsProvider {
val settings = KotlinFacetSettingsProvider.getInstance(project).getSettings(module) ?: continue
val compilerArguments = settings.compilerArguments as? K2JVMCompilerArguments ?: continue
val jsr305state = Jsr305State.findByDescription(compilerArguments.jsr305GlobalReportLevel)
val jsr305state = Jsr305State.findByDescription(compilerArguments.jsr305GlobalState)
if (jsr305state != null && jsr305state != Jsr305State.IGNORE) {
map.put(AnalysisFlag.loadJsr305Annotations, jsr305state)
map.put(AnalysisFlag.jsr305GlobalState, jsr305state)
break
}
}
idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt
+1 -1
View File
@@ -46,7 +46,7 @@ class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() {
super.configureModule(module, model)
module.createFacet(TargetPlatformKind.Jvm(JvmTarget.JVM_1_8))
val facetSettings = KotlinFacetSettingsProvider.getInstance(project).getInitializedSettings(module)
(facetSettings.compilerArguments as K2JVMCompilerArguments).jsr305GlobalReportLevel = Jsr305State.ENABLE.description
(facetSettings.compilerArguments as K2JVMCompilerArguments).jsr305GlobalState = Jsr305State.ENABLE.description
}
}
}