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

Rename Jsr305State -> JavaTypeEnhancementState

Browse Source 
Also, rename some of the properties
It's needed to store status for codeanalysis annotation in that class
This commit is contained in:
Denis Zharkov
2019-08-14 12:54:55 +03:00
committed by Victor Petukhov
parent 2f04a1505d
commit 6c37574fce
22 changed files with 109 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
+4 -4
View File
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.platform.TargetPlatformVersion
import org.jetbrains.kotlin.platform.jvm.JdkPlatform
import org.jetbrains.kotlin.platform.subplatformsOfType
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
import org.jetbrains.kotlin.utils.Jsr305State
import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
object IDELanguageSettingsProvider : LanguageSettingsProvider {
override fun getLanguageVersionSettings(
@@ -51,7 +51,7 @@ object IDELanguageSettingsProvider : LanguageSettingsProvider {
when (moduleInfo) {
is ModuleSourceInfo -> moduleInfo.module.languageVersionSettings
is LibraryInfo -> project.getLanguageVersionSettings(
jsr305State = computeJsr305State(project), isReleaseCoroutines = isReleaseCoroutines
javaTypeEnhancementState = computeJavaTypeEnhancementState(project), isReleaseCoroutines = isReleaseCoroutines
)
is ScriptModuleInfo -> {
getLanguageSettingsForScripts(
@@ -71,8 +71,8 @@ object IDELanguageSettingsProvider : LanguageSettingsProvider {
else -> project.getLanguageVersionSettings()
}
private fun computeJsr305State(project: Project): Jsr305State? {
var result: Jsr305State? = null
private fun computeJavaTypeEnhancementState(project: Project): JavaTypeEnhancementState? {
var result: JavaTypeEnhancementState? = null
for (module in ModuleManager.getInstance(project).modules) {
val settings = KotlinFacetSettingsProvider.getInstance(project)?.getSettings(module) ?: continue
val compilerArguments = settings.mergedCompilerArguments as? K2JVMCompilerArguments ?: continue
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+3 -3
View File
@@ -47,7 +47,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.UserDataProperty
import org.jetbrains.kotlin.utils.Jsr305State
import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
import java.io.File
val KtElement.platform: TargetPlatform
@@ -116,7 +116,7 @@ fun Module.getStableName(): Name {
@JvmOverloads
fun Project.getLanguageVersionSettings(
contextModule: Module? = null,
jsr305State: Jsr305State? = null,
javaTypeEnhancementState: JavaTypeEnhancementState? = null,
isReleaseCoroutines: Boolean? = null
): LanguageVersionSettings {
val kotlinFacetSettings = contextModule?.let {
@@ -150,7 +150,7 @@ fun Project.getLanguageVersionSettings(
}
val extraAnalysisFlags = additionalArguments.configureAnalysisFlags(MessageCollector.NONE).apply {
if (jsr305State != null) put(JvmAnalysisFlags.jsr305, jsr305State)
if (javaTypeEnhancementState != null) put(JvmAnalysisFlags.jsr305, javaTypeEnhancementState)
initIDESpecificAnalysisSettings(this@getLanguageVersionSettings)
}