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