From b6d1e56caee4845db66e3a614665d31da97e331e Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Fri, 12 Jan 2018 13:03:36 +0300 Subject: [PATCH] Uast-groovy: less brittle class members getting (IDEA-CR-28371) --- .../plugins/groovy/lang/psi/uast/GrUClass.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt index 2d0e5abb4432..af521e1d9702 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/uast/GrUClass.kt @@ -1,6 +1,3 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - */ /* * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ @@ -36,13 +33,16 @@ class GrUClass(val grElement: GrClassDefinition, parentProvider: () -> UElement? override fun getSuperClass(): UClass? = super.getSuperClass() - override fun getFields(): Array = super.getFields() + override fun getFields(): Array = emptyArray() //not implemented - override fun getInitializers(): Array = super.getInitializers() + override fun getInitializers(): Array = emptyArray() //not implemented override fun getMethods(): Array = grElement.codeMethods.map { GrUMethod(it, { this }) }.toTypedArray() - override fun getInnerClasses(): Array = super.getInnerClasses() + override fun getInnerClasses(): Array = grElement.codeInnerClasses.mapNotNull { + (it as? GrClassDefinition)?.let { GrUClass(it, { this }) } + }.toTypedArray() + override fun getOriginalElement(): PsiElement = grElement.originalElement }