From 0765cb9c62360e1c173db0178ed7d87690365081 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 1 Oct 2018 14:43:52 +0300 Subject: [PATCH] Minor: Fix model access --- .../src/org/jetbrains/kotlin/idea/core/moduleUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/moduleUtils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/moduleUtils.kt index 3e6fb64c761..353416fa2bd 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/moduleUtils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/moduleUtils.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo import org.jetbrains.kotlin.idea.caches.project.PlatformModuleInfo fun Module.isAndroidModule(modelsProvider: IdeModifiableModelsProvider? = null): Boolean { - if (modelsProvider != null) modelsProvider.getModifiableFacetModel(this) else FacetManager.getInstance(this) - val facets = FacetManager.getInstance(this).allFacets + val facetModel = if (modelsProvider != null) modelsProvider.getModifiableFacetModel(this) else FacetManager.getInstance(this) + val facets = facetModel.allFacets return facets.any { it.javaClass.simpleName == "AndroidFacet" } }