From ef6c8c6a1028b03fe06c01ac531af038ab230f75 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Jan 2018 20:12:40 +0300 Subject: [PATCH] 172: Revert "UAST: support for `JvmDeclarationUElement`" This reverts commit db6a2390a22d4b35246cc4c6d246a5d7752f3506. --- .../jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt.172 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt.172 b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt.172 index 40b684464ea..55217620a1e 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt.172 +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt.172 @@ -78,7 +78,7 @@ class KotlinUastLanguagePlugin : UastLanguagePlugin { if (!element.isJvmElement) return null return convertDeclarationOrElement(element, parent, requiredType) } - + override fun convertElementWithParent(element: PsiElement, requiredType: Class?): UElement? { if (!element.isJvmElement) return null if (element is PsiFile) return convertDeclaration(element, null, requiredType) @@ -115,7 +115,7 @@ class KotlinUastLanguagePlugin : UastLanguagePlugin { val resolvedCall = element.getResolvedCall(element.analyze()) ?: return null val resultingDescriptor = resolvedCall.resultingDescriptor if (resultingDescriptor !is FunctionDescriptor || resultingDescriptor.name.asString() != methodName) return null - + val parent = element.parent val parentUElement = convertElementWithParent(parent, null) ?: return null @@ -132,7 +132,7 @@ class KotlinUastLanguagePlugin : UastLanguagePlugin { if (element !is KtCallExpression) return null val resolvedCall = element.getResolvedCall(element.analyze()) ?: return null val resultingDescriptor = resolvedCall.resultingDescriptor - if (resultingDescriptor !is ConstructorDescriptor + if (resultingDescriptor !is ConstructorDescriptor || resultingDescriptor.returnType.constructor.declarationDescriptor?.name?.asString() != fqName) { return null }