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

CLion/AppCode: Fix facet configuring

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-10-16 18:03:17 +03:00
committed by Dmitriy Dolovov
parent 6dccafb469
commit 39b151e37b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
+1 -1
View File
@@ -96,7 +96,7 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
.findAll(BuildScriptClasspathData.KEY) .findAll(BuildScriptClasspathData.KEY)
.firstOrNull() .firstOrNull()
?.data ?.data
?.let { findKotlinPluginVersion(it) } ?: return null ?.let { findKotlinPluginVersion(it) }// ?: return null TODO: Fix in CLion or our plugin KT-27623
val platformKind = IdePlatformKindTooling.getTooling(kotlinSourceSet.platform).kind val platformKind = IdePlatformKindTooling.getTooling(kotlinSourceSet.platform).kind
val platform = when (platformKind) { val platform = when (platformKind) {
idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+1 -1
View File
@@ -143,7 +143,7 @@ fun Module.getOrCreateFacet(
} }
fun KotlinFacet.configureFacet( fun KotlinFacet.configureFacet(
compilerVersion: String, compilerVersion: String?,
coroutineSupport: LanguageFeature.State, coroutineSupport: LanguageFeature.State,
platform: IdePlatform<*, *>?, // if null, detect by module dependencies platform: IdePlatform<*, *>?, // if null, detect by module dependencies
modelsProvider: IdeModifiableModelsProvider modelsProvider: IdeModifiableModelsProvider