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

172: Revert "Uast: AbstractKotlinUClass compilation fix"

Browse Source 
This reverts commit 86ee036ae7d89f8acc885d54157d9b9ce5f2cb17.
This commit is contained in:
Nikolay Krasko
2018-01-11 20:12:00 +03:00
parent bf27a16144
commit 72b4b2b9bf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt.172
+1 -1
View File
@@ -35,7 +35,7 @@ abstract class AbstractKotlinUClass(private val givenParent: UElement?) : Abstra
override val uastParent: UElement? by lz { givenParent ?: convertParent() } override val uastParent: UElement? by lz { givenParent ?: convertParent() }
//TODO: should be merged with KotlinAbstractUElement.convertParent() after detaching from AbstractJavaUClass //TODO: should be merged with KotlinAbstractUElement.convertParent() after detaching from AbstractJavaUClass
override fun convertParent(): UElement? = open fun convertParent(): UElement? =
(this.psi as? KtLightClassForLocalDeclaration)?.kotlinOrigin?.parent?.let { (this.psi as? KtLightClassForLocalDeclaration)?.kotlinOrigin?.parent?.let {
when (it) { when (it) {
is KtClassBody -> it.parent.toUElement() // TODO: it seems that `class_body`-s are never created in kotlin uast in top-down walk, probably they should be completely skipped and always unwrapped is KtClassBody -> it.parent.toUElement() // TODO: it seems that `class_body`-s are never created in kotlin uast in top-down walk, probably they should be completely skipped and always unwrapped