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

Update TypeInstantiationItems

Browse Source 
To maintain old behaviour
This commit is contained in:
Pavel V. Talanov
2014-12-17 20:57:00 +03:00
parent e7e3ac1318
commit 7684e08000
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
+2 -1
View File
@@ -61,6 +61,7 @@ import org.jetbrains.jet.lang.types.TypeProjectionImpl
import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.Variance
import org.jetbrains.jet.lang.psi.JetDeclaration import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf
import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration
class TypeInstantiationItems( class TypeInstantiationItems(
val resolutionFacade: ResolutionFacade, val resolutionFacade: ResolutionFacade,
@@ -281,7 +282,7 @@ class TypeInstantiationItems(
override fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit) { override fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit) {
val parameters = ClassInheritorsSearch.SearchParameters(psiClass, inheritorSearchScope, true, true, false, nameFilter) val parameters = ClassInheritorsSearch.SearchParameters(psiClass, inheritorSearchScope, true, true, false, nameFilter)
for (inheritor in ClassInheritorsSearch.search(parameters)) { 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 origin = inheritor.origin ?: continue
val declaration = toFromOriginalFileMapper.toSyntheticFile(origin) ?: continue val declaration = toFromOriginalFileMapper.toSyntheticFile(origin) ?: continue
resolutionFacade.resolveToDescriptor(declaration) resolutionFacade.resolveToDescriptor(declaration)