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

172: Revert "UAST: support for JvmDeclarationUElement"

Browse Source 
This reverts commit db6a2390a22d4b35246cc4c6d246a5d7752f3506.
This commit is contained in:
Nikolay Krasko
2018-01-11 20:12:40 +03:00
parent e2fb63729d
commit ef6c8c6a10
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt.172
+3 -3
View File
@@ -78,7 +78,7 @@ class KotlinUastLanguagePlugin : UastLanguagePlugin {
if (!element.isJvmElement) return null if (!element.isJvmElement) return null
return convertDeclarationOrElement(element, parent, requiredType) return convertDeclarationOrElement(element, parent, requiredType)
} }
override fun convertElementWithParent(element: PsiElement, requiredType: Class<out UElement>?): UElement? { override fun convertElementWithParent(element: PsiElement, requiredType: Class<out UElement>?): UElement? {
if (!element.isJvmElement) return null if (!element.isJvmElement) return null
if (element is PsiFile) return convertDeclaration(element, null, requiredType) 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 resolvedCall = element.getResolvedCall(element.analyze()) ?: return null
val resultingDescriptor = resolvedCall.resultingDescriptor val resultingDescriptor = resolvedCall.resultingDescriptor
if (resultingDescriptor !is FunctionDescriptor || resultingDescriptor.name.asString() != methodName) return null if (resultingDescriptor !is FunctionDescriptor || resultingDescriptor.name.asString() != methodName) return null
val parent = element.parent val parent = element.parent
val parentUElement = convertElementWithParent(parent, null) ?: return null val parentUElement = convertElementWithParent(parent, null) ?: return null
@@ -132,7 +132,7 @@ class KotlinUastLanguagePlugin : UastLanguagePlugin {
if (element !is KtCallExpression) return null if (element !is KtCallExpression) return null
val resolvedCall = element.getResolvedCall(element.analyze()) ?: return null val resolvedCall = element.getResolvedCall(element.analyze()) ?: return null
val resultingDescriptor = resolvedCall.resultingDescriptor val resultingDescriptor = resolvedCall.resultingDescriptor
if (resultingDescriptor !is ConstructorDescriptor if (resultingDescriptor !is ConstructorDescriptor
|| resultingDescriptor.returnType.constructor.declarationDescriptor?.name?.asString() != fqName) { || resultingDescriptor.returnType.constructor.declarationDescriptor?.name?.asString() != fqName) {
return null return null
} }