From 033efbda41c8de2ffc95aafa54fd1c927289370e Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 15 Jun 2016 20:25:47 +0300 Subject: [PATCH] Refactoring: move KtLightField interface to file with light elements --- .../src/org/jetbrains/kotlin/asJava/KtLightElements.kt | 6 +++++- .../kotlin/asJava/{KtLightField.kt => KtLightFieldImpl.kt} | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KtLightField.kt => KtLightFieldImpl.kt} (98%) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElements.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElements.kt index a24d1042062..a2442ffd050 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElements.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElements.kt @@ -17,7 +17,9 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiElement +import com.intellij.psi.PsiField import com.intellij.psi.PsiNamedElement +import com.intellij.psi.impl.PsiVariableEx import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement @@ -27,4 +29,6 @@ interface KtLightElement : PsiNamedElemen val clsDelegate: D } -interface KtLightDeclaration: KtLightElement \ No newline at end of file +interface KtLightDeclaration: KtLightElement + +interface KtLightField : PsiField, KtLightDeclaration, PsiVariableEx \ No newline at end of file diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightField.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightFieldImpl.kt similarity index 98% rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightField.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightFieldImpl.kt index c75426fa96e..0a3413420ac 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightField.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightFieldImpl.kt @@ -28,8 +28,6 @@ import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtEnumEntry import org.jetbrains.kotlin.psi.KtNamedDeclaration -interface KtLightField : PsiField, KtLightDeclaration, PsiVariableEx - // Copied from com.intellij.psi.impl.light.LightField sealed class KtLightFieldImpl( private val lightMemberOrigin: LightMemberOrigin?,