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

Restore -Xjsr305-annotations flag as a deprecated

Browse Source
This commit is contained in:
Denis Zharkov
2017-09-14 11:55:38 +03:00
parent 97fed6336b
commit 4d95c30360
11 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+3 -2
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.roots.ProjectFileIndex
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.cli.common.arguments.Argument
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder
@@ -90,7 +91,7 @@ fun Project.getLanguageVersionSettings(contextModule: Module? = null,
null
)
return LanguageVersionSettingsImpl(languageVersion, apiVersion,
arguments.configureAnalysisFlags() + extraAnalysisFlags,
arguments.configureAnalysisFlags(MessageCollector.NONE) + extraAnalysisFlags,
extraLanguageFeatures)
}
@@ -113,7 +114,7 @@ val Module.languageVersionSettings: LanguageVersionSettings
return LanguageVersionSettingsImpl(
languageVersion,
ApiVersion.createByLanguageVersion(apiVersion),
facetSettings.mergedCompilerArguments?.configureAnalysisFlags().orEmpty(),
facetSettings.mergedCompilerArguments?.configureAnalysisFlags(MessageCollector.NONE).orEmpty(),
extraLanguageFeatures
)
}