From 7f4a925b857c63724425e394653ff7d7d40fd99b Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Wed, 2 Dec 2020 13:08:09 +0300
Subject: [PATCH] [FE] Drop `isReleaseCoroutines` flag from
 LanguageSettingsProvider

---
 .../src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt     | 6 ++----
 .../kotlin/idea/caches/resolve/IdeaResolverForProject.kt    | 4 ++--
 .../kotlin/idea/compiler/IDELanguageSettingsProvider.kt     | 5 ++---
 .../src/org/jetbrains/kotlin/idea/project/Platform.kt       | 3 +--
 .../kotlin/ide/konan/NativePlatformKindResolution.kt        | 3 +--
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
index 9c7f9e7ec19..1ade8914a3e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
@@ -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
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
index c18b9ab4272..efc49edb9ec 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
@@ -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
-}
\ No newline at end of file
+}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
index 525c74181f2..d70e3bc6994 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
@@ -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(
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
index 5919ae3daea..4f433f33130 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
@@ -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)
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
index 7152af66d0b..a289bd935c5 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
@@ -118,8 +118,7 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
 
         val languageVersionSettings = IDELanguageSettingsProvider.getLanguageVersionSettings(
             stdlibInfo,
-            project,
-            isReleaseCoroutines = false
+            project
         )
 
         val stdlibPackageFragmentProvider = createKlibPackageFragmentProvider(