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

Minor: Do not specify platform for project-level language settings

Browse Source
This commit is contained in:
Alexey Sedunov
2017-09-15 19:17:20 +03:00
parent 79308287be
commit bd3d79d318
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+2 -2
View File
@@ -85,7 +85,7 @@ fun Project.getLanguageVersionSettings(contextModule: Module? = null,
val apiVersion = ApiVersion.createByLanguageVersion(LanguageVersion.fromVersionString(arguments.apiVersion) ?: languageVersion) val apiVersion = ApiVersion.createByLanguageVersion(LanguageVersion.fromVersionString(arguments.apiVersion) ?: languageVersion)
val compilerSettings = KotlinCompilerSettings.getInstance(this).settings val compilerSettings = KotlinCompilerSettings.getInstance(this).settings
val extraLanguageFeatures = getExtraLanguageFeatures( val extraLanguageFeatures = getExtraLanguageFeatures(
TargetPlatformKind.Common, null,
CoroutineSupport.byCompilerArguments(KotlinCommonCompilerArgumentsHolder.getInstance(this).settings), CoroutineSupport.byCompilerArguments(KotlinCommonCompilerArgumentsHolder.getInstance(this).settings),
compilerSettings, compilerSettings,
null null
@@ -134,7 +134,7 @@ private val Module.implementsCommonModule: Boolean
&& ModuleRootManager.getInstance(this).dependencies.any { it.targetPlatform == TargetPlatformKind.Common } && ModuleRootManager.getInstance(this).dependencies.any { it.targetPlatform == TargetPlatformKind.Common }
private fun getExtraLanguageFeatures( private fun getExtraLanguageFeatures(
targetPlatformKind: TargetPlatformKind<*>, targetPlatformKind: TargetPlatformKind<*>?,
coroutineSupport: LanguageFeature.State, coroutineSupport: LanguageFeature.State,
compilerSettings: CompilerSettings?, compilerSettings: CompilerSettings?,
module: Module? module: Module?