[FE] Drop isReleaseCoroutines flag from LanguageSettingsProvider
This commit is contained in:
committed by
TeamCityServer
parent
a8b65bc673
commit
7f4a925b85
@@ -200,8 +200,7 @@ interface PackageOracleFactory {
|
||||
interface LanguageSettingsProvider {
|
||||
fun getLanguageVersionSettings(
|
||||
moduleInfo: ModuleInfo,
|
||||
project: Project,
|
||||
isReleaseCoroutines: Boolean? = null
|
||||
project: Project
|
||||
): LanguageVersionSettings
|
||||
|
||||
fun getTargetPlatform(moduleInfo: ModuleInfo, project: Project): TargetPlatformVersion
|
||||
@@ -209,8 +208,7 @@ interface LanguageSettingsProvider {
|
||||
object Default : LanguageSettingsProvider {
|
||||
override fun getLanguageVersionSettings(
|
||||
moduleInfo: ModuleInfo,
|
||||
project: Project,
|
||||
isReleaseCoroutines: Boolean?
|
||||
project: Project
|
||||
) = LanguageVersionSettingsImpl.DEFAULT
|
||||
|
||||
override fun getTargetPlatform(moduleInfo: ModuleInfo, project: Project): TargetPlatformVersion = TargetPlatformVersion.NoVersion
|
||||
|
||||
+2
-2
@@ -74,7 +74,7 @@ class IdeaResolverForProject(
|
||||
val moduleContent = ModuleContent(moduleInfo, syntheticFilesByModule[moduleInfo] ?: listOf(), moduleInfo.contentScope())
|
||||
|
||||
val languageVersionSettings =
|
||||
IDELanguageSettingsProvider.getLanguageVersionSettings(moduleInfo, projectContext.project, isReleaseCoroutines)
|
||||
IDELanguageSettingsProvider.getLanguageVersionSettings(moduleInfo, projectContext.project)
|
||||
|
||||
val resolverForModuleFactory = getResolverForModuleFactory(moduleInfo)
|
||||
|
||||
@@ -180,4 +180,4 @@ class IdeaResolverForProject(
|
||||
|
||||
interface BuiltInsCacheKey {
|
||||
object DefaultBuiltInsKey : BuiltInsCacheKey
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -45,13 +45,12 @@ import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
|
||||
object IDELanguageSettingsProvider : LanguageSettingsProvider {
|
||||
override fun getLanguageVersionSettings(
|
||||
moduleInfo: ModuleInfo,
|
||||
project: Project,
|
||||
isReleaseCoroutines: Boolean?
|
||||
project: Project
|
||||
): LanguageVersionSettings =
|
||||
when (moduleInfo) {
|
||||
is ModuleSourceInfo -> moduleInfo.module.languageVersionSettings
|
||||
is LibraryInfo -> project.getLanguageVersionSettings(
|
||||
javaTypeEnhancementState = computeJavaTypeEnhancementState(project), isReleaseCoroutines = isReleaseCoroutines
|
||||
javaTypeEnhancementState = computeJavaTypeEnhancementState(project)
|
||||
)
|
||||
is ScriptModuleInfo -> {
|
||||
getLanguageSettingsForScripts(
|
||||
|
||||
@@ -116,8 +116,7 @@ fun Module.getStableName(): Name {
|
||||
@JvmOverloads
|
||||
fun Project.getLanguageVersionSettings(
|
||||
contextModule: Module? = null,
|
||||
javaTypeEnhancementState: JavaTypeEnhancementState? = null,
|
||||
isReleaseCoroutines: Boolean? = null
|
||||
javaTypeEnhancementState: JavaTypeEnhancementState? = null
|
||||
): LanguageVersionSettings {
|
||||
val kotlinFacetSettings = contextModule?.let {
|
||||
KotlinFacetSettingsProvider.getInstance(this)?.getInitializedSettings(it)
|
||||
|
||||
@@ -118,8 +118,7 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
|
||||
|
||||
val languageVersionSettings = IDELanguageSettingsProvider.getLanguageVersionSettings(
|
||||
stdlibInfo,
|
||||
project,
|
||||
isReleaseCoroutines = false
|
||||
project
|
||||
)
|
||||
|
||||
val stdlibPackageFragmentProvider = createKlibPackageFragmentProvider(
|
||||
|
||||
Reference in New Issue
Block a user