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

UAST: Do not log PCE in DeclarationDescriptor.toSource

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-06-26 16:22:02 +03:00
parent 8ea19eda73
commit 62c0d37d45
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
+11 -9
View File
@@ -18,6 +18,7 @@ package org.jetbrains.uast.kotlin
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.progress.ProcessCanceledException
import com.intellij.openapi.util.Key import com.intellij.openapi.util.Key
import com.intellij.psi.* import com.intellij.psi.*
import com.intellij.psi.impl.cache.TypeInfo import com.intellij.psi.impl.cache.TypeInfo
@@ -58,7 +59,7 @@ import java.text.StringCharacterIterator
internal val KOTLIN_CACHED_UELEMENT_KEY = Key.create<WeakReference<UElement>>("cached-kotlin-uelement") internal val KOTLIN_CACHED_UELEMENT_KEY = Key.create<WeakReference<UElement>>("cached-kotlin-uelement")
@Suppress("NOTHING_TO_INLINE") @Suppress("NOTHING_TO_INLINE")
internal inline fun String?.orAnonymous(kind: String = ""): String = this ?: "<anonymous" + (if (kind.isNotBlank()) " $kind" else "") + ">" internal inline fun String?.orAnonymous(kind: String = ""): String = this ?: "<anonymous"+(if (kind.isNotBlank()) " $kind" else "")+">"
internal fun DeclarationDescriptor.toSource(): PsiElement? { internal fun DeclarationDescriptor.toSource(): PsiElement? {
return try { return try {
@@ -66,8 +67,9 @@ internal fun DeclarationDescriptor.toSource(): PsiElement? {
.asSequence() .asSequence()
.mapNotNull { DescriptorToSourceUtils.getSourceFromDescriptor(it) } .mapNotNull { DescriptorToSourceUtils.getSourceFromDescriptor(it) }
.firstOrNull() .firstOrNull()
} } catch (e: ProcessCanceledException) {
catch (e: Exception) { throw e
} catch (e: Exception) {
Logger.getInstance("DeclarationDescriptor.toSource").error(e) Logger.getInstance("DeclarationDescriptor.toSource").error(e)
null null
} }
@@ -116,15 +118,15 @@ private fun resolveDeserialized(context: KtElement, descriptor: DeclarationDescr
return when (proto) { return when (proto) {
is ProtoBuf.Function -> { is ProtoBuf.Function -> {
val signature = JvmProtoBufUtil.getJvmMethodSignature(proto, nameResolver, typeTable) val signature = JvmProtoBufUtil.getJvmMethodSignature(proto, nameResolver, typeTable)
?: getMethodSignatureFromDescriptor(context, descriptor) ?: getMethodSignatureFromDescriptor(context, descriptor)
?: return null ?: return null
psiClass.methods.firstOrNull { it.name == signature.name && it.matchesDesc(signature.desc) } psiClass.methods.firstOrNull { it.name == signature.name && it.matchesDesc(signature.desc) }
} }
is ProtoBuf.Constructor -> { is ProtoBuf.Constructor -> {
val signature = JvmProtoBufUtil.getJvmConstructorSignature(proto, nameResolver, typeTable) val signature = JvmProtoBufUtil.getJvmConstructorSignature(proto, nameResolver, typeTable)
?: getMethodSignatureFromDescriptor(context, descriptor) ?: getMethodSignatureFromDescriptor(context, descriptor)
?: return null ?: return null
psiClass.constructors.firstOrNull { it.matchesDesc(signature.desc) } psiClass.constructors.firstOrNull { it.matchesDesc(signature.desc) }
} }
@@ -274,7 +276,7 @@ internal fun KtExpression.unwrapBlockOrParenthesis(): KtExpression {
} }
internal fun KtElement.analyze(): BindingContext { internal fun KtElement.analyze(): BindingContext {
if(containingFile !is KtFile) return BindingContext.EMPTY // EA-114080, EA-113475 if (containingFile !is KtFile) return BindingContext.EMPTY // EA-114080, EA-113475
return ServiceManager.getService(project, KotlinUastBindingContextProviderService::class.java) return ServiceManager.getService(project, KotlinUastBindingContextProviderService::class.java)
?.getBindingContext(this) ?: BindingContext.EMPTY ?.getBindingContext(this) ?: BindingContext.EMPTY
} }
@@ -294,7 +296,7 @@ internal fun KotlinType.getFunctionalInterfaceType(source: UElement, element: Kt
internal fun KotlinULambdaExpression.getFunctionalInterfaceType(): PsiType? { internal fun KotlinULambdaExpression.getFunctionalInterfaceType(): PsiType? {
val parent = psi.parent val parent = psi.parent
return when(parent) { return when (parent) {
is KtBinaryExpressionWithTypeRHS -> parent.right?.getType()?.getFunctionalInterfaceType(this, psi) is KtBinaryExpressionWithTypeRHS -> parent.right?.getType()?.getFunctionalInterfaceType(this, psi)
else -> psi.getExpectedType()?.getFunctionalInterfaceType(this, psi) else -> psi.getExpectedType()?.getFunctionalInterfaceType(this, psi)
} }