From 7e2e2b9f1952b22b97d8c1cdfe611b9955c8ffa4 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 23 Sep 2016 00:04:13 +0300
Subject: [PATCH] Use effectively excluded imports from file's module
 descriptor.

---
 .../org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
index b67059c7bd8..4e87a110990 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.util
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.core.targetDescriptors
@@ -57,8 +58,8 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
         get() = ImportPathComparator
 
     override fun isImportedWithDefault(importPath: ImportPath, contextFile: KtFile): Boolean {
-        val moduleParameters = contextFile.platform.defaultModuleParameters
-        return importPath.isImported(moduleParameters.defaultImports, moduleParameters.excludedImports)
+        val moduleDescriptor = contextFile.findModuleDescriptor()
+        return importPath.isImported(moduleDescriptor.defaultImports, moduleDescriptor.effectivelyExcludedImports)
     }
 
     override fun mayImportOnShortenReferences(descriptor: DeclarationDescriptor): Boolean {