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

[light classes] replace light class dependency from analysis.decompiled.light-classes-for-decompiled to light-classes-base

Browse Source 
^KT-53097
This commit is contained in:
Dmitry Gridin
2022-07-11 18:20:29 +02:00
committed by Space
parent 35258da509
commit 2ff1c21c8c
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/light-classes-for-decompiled/build.gradle.kts
+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
dependencies {
api(project(":compiler:psi"))
api(project(":analysis:decompiled:decompiler-to-psi"))
api(project(":compiler:light-classes"))
api(project(":compiler:light-classes-base"))
implementation(intellijCore())
}
analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightMethodForDecompiledDeclaration.kt
+2 -2
View File
@@ -12,11 +12,11 @@ import com.intellij.psi.util.MethodSignature
import com.intellij.psi.util.MethodSignatureBackedByPsiMethod
import org.jetbrains.kotlin.analysis.decompiled.light.classes.origin.LightMemberOriginForCompiledMethod
import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.demangleInternalName
import org.jetbrains.kotlin.asJava.elements.KtLightElementBase
import org.jetbrains.kotlin.asJava.elements.KtLightMember
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.asJava.propertyNameByAccessor
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
import org.jetbrains.kotlin.psi.KtDeclaration
class KtLightMethodForDecompiledDeclaration(
@@ -104,7 +104,7 @@ class KtLightMethodForDecompiledDeclaration(
}
private fun KtLightMethod.checkIsMangled(): Boolean {
val demangledName = KotlinTypeMapper.InternalNameMapper.demangleInternalName(name) ?: return false
val demangledName = demangleInternalName(name) ?: return false
val originalName = propertyNameByAccessor(demangledName, this) ?: demangledName
return originalName == kotlinOrigin?.name
}