From bb4d6d1059b5d1a66fffc45fd4f85a34bd7d89e9 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Tue, 19 Dec 2017 20:03:59 +0300 Subject: [PATCH] `LightClassEqualsTest` fix by creating lightclasses with `createNoCache` --- .../asJava/classes/KtLightClassForSourceDeclaration.kt | 2 +- .../kotlin/idea/lightClasses/LightClassEqualsTest.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt index b28d2fcd2d6..d51959a0849 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt @@ -339,7 +339,7 @@ abstract class KtLightClassForSourceDeclaration(protected val classOrObject: KtC .create(createNoCache(classOrObject), OUT_OF_CODE_BLOCK_MODIFICATION_COUNT) } - private fun createNoCache(classOrObject: KtClassOrObject): KtLightClassForSourceDeclaration? { + fun createNoCache(classOrObject: KtClassOrObject): KtLightClassForSourceDeclaration? { if (classOrObject.hasExpectModifier()) { return null } diff --git a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java index 36a63793a16..98a6242578a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java @@ -27,8 +27,6 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.psi.KtClassOrObject; -import static org.jetbrains.kotlin.asJava.LightClassUtilsKt.toLightClass; - public class LightClassEqualsTest extends KotlinLightCodeInsightFixtureTestCase { @NotNull @Override @@ -59,8 +57,8 @@ public class LightClassEqualsTest extends KotlinLightCodeInsightFixtureTestCase private static void doTestEquals(@Nullable KtClassOrObject origin) { assertNotNull(origin); - PsiClass lightClass1 = toLightClass(origin); - PsiClass lightClass2 = toLightClass(origin); + PsiClass lightClass1 = KtLightClassForSourceDeclaration.Companion.createNoCache(origin); + PsiClass lightClass2 = KtLightClassForSourceDeclaration.Companion.createNoCache(origin); assertNotNull(lightClass1); assertNotNull(lightClass2);