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

Add @UnderMigration annotation and options for report level

Browse Source
This commit is contained in:
Leonid Stashevsky
2017-09-28 17:15:08 +03:00
parent a524bde9b7
commit 95d32d8d1e
75 changed files with 1436 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
+3 -5
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.analyzer.LanguageSettingsProvider
import org.jetbrains.kotlin.analyzer.ModuleInfo
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.idea.caches.resolve.LibraryInfo
import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
@@ -43,11 +44,8 @@ object IDELanguageSettingsProvider : LanguageSettingsProvider {
val settings = KotlinFacetSettingsProvider.getInstance(project).getSettings(module) ?: continue
val compilerArguments = settings.mergedCompilerArguments as? K2JVMCompilerArguments ?: continue
val jsr305state = Jsr305State.findByDescription(compilerArguments.jsr305)
if (jsr305state != null && jsr305state != Jsr305State.DEFAULT) {
map.put(AnalysisFlag.jsr305, jsr305state)
break
}
val jsr305State = compilerArguments.parseJsr305(MessageCollector.NONE)
map.put(AnalysisFlag.jsr305, jsr305State)
}
return map
}
idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt
+3 -1
View File
@@ -28,6 +28,8 @@ import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.test.MockLibraryUtil
import org.jetbrains.kotlin.utils.Jsr305State
import org.jetbrains.kotlin.utils.ReportLevel
import org.jetbrains.kotlin.utils.ReportLevel.Companion.findByDescription
class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor {
@@ -48,7 +50,7 @@ class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() {
facetSettings.apply {
val jsrStateByTestName =
Jsr305State.findByDescription(getTestName(true)) ?: return@apply
ReportLevel.findByDescription(getTestName(true)) ?: return@apply
compilerSettings!!.additionalArguments += " -Xjsr305=${jsrStateByTestName.description}"
updateMergedArguments()