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

Remove unnecessary uses of getContainingKtFile() (EA-83360 - CCE: KtElementImplStub.getContainingKtFile)

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-11-28 13:17:51 +03:00
parent b5ad1e1be5
commit d5e90b4123
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+4 -7
View File
@@ -32,8 +32,8 @@ import org.jetbrains.kotlin.asJava.builder.ClsWrapperStubPsiFactory
import org.jetbrains.kotlin.asJava.builder.LightClassConstructionContext import org.jetbrains.kotlin.asJava.builder.LightClassConstructionContext
import org.jetbrains.kotlin.asJava.classes.FakeLightClassForFileOfPackage import org.jetbrains.kotlin.asJava.classes.FakeLightClassForFileOfPackage
import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -152,7 +152,7 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
return SourceNavigationHelper.getOriginalClass(classOrObject) as? KtLightClass return SourceNavigationHelper.getOriginalClass(classOrObject) as? KtLightClass
} }
} }
if (classOrObject.getContainingKtFile().analysisContext != null) { if ((classOrObject.containingFile as? KtFile)?.analysisContext != null) {
// explicit request to create light class from dummy.kt // explicit request to create light class from dummy.kt
return KtLightClassForSourceDeclaration.create(classOrObject) return KtLightClassForSourceDeclaration.create(classOrObject)
} }
@@ -299,11 +299,8 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
if (decompiledClassOrObject is KtEnumEntry) { if (decompiledClassOrObject is KtEnumEntry) {
return null return null
} }
val containingJetFile = decompiledClassOrObject.getContainingKtFile() val containingKtFile = decompiledClassOrObject.containingFile as? KtClsFile ?: return null
if (containingJetFile !is KtClsFile) { val rootLightClassForDecompiledFile = createLightClassForDecompiledKotlinFile(containingKtFile) ?: return null
return null
}
val rootLightClassForDecompiledFile = createLightClassForDecompiledKotlinFile(containingJetFile) ?: return null
return findCorrespondingLightClass(decompiledClassOrObject, rootLightClassForDecompiledFile) return findCorrespondingLightClass(decompiledClassOrObject, rootLightClassForDecompiledFile)
} }