From bc8095ce339b43f7e66d5db781fc4d44293c9c00 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 20 Jan 2016 20:49:53 +0300 Subject: [PATCH] KT-9424 "Exclude from import and completion" with "Project" scope #KT-9424 Fixed --- .../org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt index 25321491670..e37a749e41a 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.core import com.intellij.codeInsight.CodeInsightSettings +import com.intellij.codeInsight.JavaProjectCodeInsightSettings import com.intellij.openapi.progress.ProgressManager import com.intellij.psi.PsiFile import com.intellij.psi.PsiModifier @@ -302,9 +303,7 @@ class KotlinIndicesHelper( private fun isExcludedFromAutoImport(descriptor: DeclarationDescriptor): Boolean { val fqName = descriptor.importableFqName?.asString() ?: return false - - return CodeInsightSettings.getInstance().EXCLUDED_PACKAGES - .any { excluded -> fqName == excluded || (fqName.startsWith(excluded) && fqName[excluded.length] == '.') } + return JavaProjectCodeInsightSettings.getSettings(project).isExcluded(fqName) } private fun KtCallableDeclaration.resolveToDescriptorsWithHack(): Collection {