diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt b/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt index 52e269dee8c..a3d800d3e6f 100644 --- a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt +++ b/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt @@ -5,11 +5,14 @@ package org.jetbrains.kotlin.asJava.elements -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiField -import com.intellij.psi.PsiNamedElement +import com.intellij.psi.* +import com.intellij.psi.impl.PsiVariableEx +import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin +import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement +import org.jetbrains.kotlin.psi.KtParameter +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind interface KtLightElement : PsiElement { val kotlinOrigin: T? @@ -25,6 +28,26 @@ interface KtLightElement : PsiElement { interface KtLightDeclaration : KtLightElement, PsiNamedElement +interface KtLightMember : PsiMember, KtLightDeclaration, PsiNameIdentifierOwner, PsiDocCommentOwner { + val lightMemberOrigin: LightMemberOrigin? + + override fun getContainingClass(): KtLightClass +} + +interface KtLightField : PsiField, KtLightMember, PsiVariableEx + +interface KtLightParameter : PsiParameter, KtLightDeclaration { + val method: KtLightMethod +} + interface KtLightFieldForSourceDeclarationSupport : PsiField { val kotlinOrigin: KtDeclaration? } + +interface KtLightMethod : PsiAnnotationMethod, KtLightMember { + val isDelegated: Boolean + get() = lightMemberOrigin?.originKind == JvmDeclarationOriginKind.DELEGATION + || lightMemberOrigin?.originKind == JvmDeclarationOriginKind.CLASS_MEMBER_DELEGATION_TO_DEFAULT_IMPL + + val isMangled: Boolean +} diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt deleted file mode 100644 index 357a451e705..00000000000 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.asJava.elements - -import com.intellij.psi.* -import com.intellij.psi.impl.PsiVariableEx -import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin -import org.jetbrains.kotlin.asJava.classes.KtLightClass -import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.psi.KtParameter -import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind - -interface KtLightMember : PsiMember, KtLightDeclaration, PsiNameIdentifierOwner, PsiDocCommentOwner { - val lightMemberOrigin: LightMemberOrigin? - - override fun getContainingClass(): KtLightClass -} - -interface KtLightField : PsiField, KtLightMember, PsiVariableEx - -interface KtLightParameter : PsiParameter, KtLightDeclaration { - val method: KtLightMethod -} - -interface KtLightMethod : PsiAnnotationMethod, KtLightMember { - val isDelegated: Boolean - get() = lightMemberOrigin?.originKind == JvmDeclarationOriginKind.DELEGATION - || lightMemberOrigin?.originKind == JvmDeclarationOriginKind.CLASS_MEMBER_DELEGATION_TO_DEFAULT_IMPL - - val isMangled: Boolean -}