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

Kotlin Facet: Fix facet existence check during Gradle import

Browse Source 
EA-101476 Fixed
This commit is contained in:
Alexey Sedunov
2017-06-09 18:15:24 +03:00
parent a371bcb624
commit 79493985be
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
+5 -1
View File
@@ -110,7 +110,11 @@ private fun configureFacetByGradleModule(
modelsProvider: IdeModifiableModelsProvider modelsProvider: IdeModifiableModelsProvider
): KotlinFacet? { ): KotlinFacet? {
if (!moduleNode.hasKotlinPlugin) { if (!moduleNode.hasKotlinPlugin) {
KotlinFacet.get(ideModule)?.let { modelsProvider.getModifiableFacetModel(ideModule).removeFacet(it) } val facetModel = modelsProvider.getModifiableFacetModel(ideModule)
val facet = facetModel.getFacetByType(KotlinFacetType.TYPE_ID)
if (facet != null) {
facetModel.removeFacet(facet)
}
return null return null
} }