Add UL-inline class overrided interface methods

This commit is contained in:
Igor Yakovlev
2019-06-07 16:42:21 +03:00
parent 7d542eda00
commit 545fdb5a37
3 changed files with 53 additions and 12 deletions
@@ -11,7 +11,10 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.impl.PsiSuperMethodImplUtil import com.intellij.psi.impl.PsiSuperMethodImplUtil
import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.asJava.elements.KtLightField
import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtNamedFunction
import org.jetbrains.kotlin.psi.KtProperty
class KtUltraLightInlineClass( class KtUltraLightInlineClass(
classOrObject: KtClassOrObject, classOrObject: KtClassOrObject,
@@ -23,29 +26,50 @@ class KtUltraLightInlineClass(
override fun getScope(): PsiElement? = parent override fun getScope(): PsiElement? = parent
private val _ownMethods: List<KtLightMethod> by lazyPub { private val membersBuilder: UltraLightMembersCreator by lazyPub {
val inlineClassParameter = classOrObject
.primaryConstructor
?.valueParameters
?.firstOrNull()
?: return@lazyPub emptyList()
UltraLightMembersCreator( UltraLightMembersCreator(
containingClass = this, containingClass = this,
containingClassIsNamedObject = false, containingClassIsNamedObject = false,
containingClassIsSealed = false, containingClassIsSealed = false,
mangleInternalFunctions = false, mangleInternalFunctions = false,
support = support support = support
).run { )
propertyAccessors( }
private val _ownMethods: List<KtLightMethod> by lazyPub {
val result = arrayListOf<KtLightMethod>()
val applicableDeclarations = this.classOrObject.declarations
.filter { it.hasModifier(KtTokens.OVERRIDE_KEYWORD) }
.filterNot { it.isHiddenByDeprecation(support) }
for (declaration in applicableDeclarations) {
when (declaration) {
is KtNamedFunction -> result.addAll(membersBuilder.createMethods(declaration, forceStatic = false))
is KtProperty -> result.addAll(
membersBuilder.propertyAccessors(declaration, declaration.isVar, forceStatic = false, onlyJvmStatic = false)
)
}
}
val inlineClassParameter = classOrObject
.primaryConstructor
?.valueParameters
?.firstOrNull()
if (inlineClassParameter !== null) {
membersBuilder.propertyAccessors(
inlineClassParameter, inlineClassParameter,
mutable = false, mutable = false,
forceStatic = false, forceStatic = false,
onlyJvmStatic = false onlyJvmStatic = false
) ).let {
result.addAll(it)
}
} }
result;
} }
override fun getOwnFields(): List<KtLightField> = emptyList() override fun getOwnFields(): List<KtLightField> = emptyList()
@@ -12,4 +12,13 @@ public final class InlinedDelegate /* InlinedDelegate*/<T> {
@null() @null()
public final T getNode(); public final T getNode();
}
public final class InlineInheritance /* InlineInheritance*/ {
public final int getV();
public int getX();
public int y();
} }
@@ -18,3 +18,11 @@ inline class InlinedDelegate<T>(var node: T) {
return node return node
} }
} }
inline class InlineInheritance(val v: Int) : I {
override fun y() = 4
override val x get() = 5
fun z() = 7
}