From bd3d79d318c6914636b2b48fc91d509bb3cc1718 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 15 Sep 2017 19:17:20 +0300 Subject: [PATCH] Minor: Do not specify platform for project-level language settings --- .../src/org/jetbrains/kotlin/idea/project/Platform.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6201ec2b0af..fdb7d4a34e3 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 @@ -85,7 +85,7 @@ fun Project.getLanguageVersionSettings(contextModule: Module? = null, val apiVersion = ApiVersion.createByLanguageVersion(LanguageVersion.fromVersionString(arguments.apiVersion) ?: languageVersion) val compilerSettings = KotlinCompilerSettings.getInstance(this).settings val extraLanguageFeatures = getExtraLanguageFeatures( - TargetPlatformKind.Common, + null, CoroutineSupport.byCompilerArguments(KotlinCommonCompilerArgumentsHolder.getInstance(this).settings), compilerSettings, null @@ -134,7 +134,7 @@ private val Module.implementsCommonModule: Boolean && ModuleRootManager.getInstance(this).dependencies.any { it.targetPlatform == TargetPlatformKind.Common } private fun getExtraLanguageFeatures( - targetPlatformKind: TargetPlatformKind<*>, + targetPlatformKind: TargetPlatformKind<*>?, coroutineSupport: LanguageFeature.State, compilerSettings: CompilerSettings?, module: Module?