From 7684e08000e9bbee9505603cd7686b145277e3b8 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 17 Dec 2014 20:57:00 +0300 Subject: [PATCH] Update TypeInstantiationItems To maintain old behaviour --- .../jet/plugin/completion/smart/TypeInstantiationItems.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt index 731f1b737db..aa5f6c3ac28 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -61,6 +61,7 @@ import org.jetbrains.jet.lang.types.TypeProjectionImpl import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.psi.JetDeclaration import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf +import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration class TypeInstantiationItems( val resolutionFacade: ResolutionFacade, @@ -281,7 +282,7 @@ class TypeInstantiationItems( override fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit) { val parameters = ClassInheritorsSearch.SearchParameters(psiClass, inheritorSearchScope, true, true, false, nameFilter) for (inheritor in ClassInheritorsSearch.search(parameters)) { - val descriptor = if (inheritor is KotlinLightClass) { + val descriptor = if (inheritor is KotlinLightClass && inheritor !is KotlinLightClassForDecompiledDeclaration) { val origin = inheritor.origin ?: continue val declaration = toFromOriginalFileMapper.toSyntheticFile(origin) ?: continue resolutionFacade.resolveToDescriptor(declaration)