From 687a23be4749d9ff7fd32a72c19a571d80b11be5 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 14 Dec 2023 20:07:37 +0100 Subject: [PATCH] [psi] remove KtEnumEntry#isEquivalentTo This check is used in equivalence check which is symmetric, and java refers to kotlin through light classes. LC implementation already contains support for matching wrapped and origin kotlin members, both K1 and K2 LC implementations. Thus, this check is redundant. Removing it, we cleanup kotlin psi from java psi --- .../org/jetbrains/kotlin/psi/KtEnumEntry.java | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtEnumEntry.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtEnumEntry.java index e9aa64f0248..19a829ab587 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtEnumEntry.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtEnumEntry.java @@ -17,9 +17,6 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiEnumConstant; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.name.ClassId; @@ -67,22 +64,4 @@ public class KtEnumEntry extends KtClass { public R accept(@NotNull KtVisitor visitor, D data) { return visitor.visitEnumEntry(this, data); } - - @Override - public boolean isEquivalentTo(@Nullable PsiElement another) { - if (another instanceof PsiEnumConstant) { - PsiEnumConstant enumConstant = (PsiEnumConstant) another; - PsiClass containingClass = enumConstant.getContainingClass(); - if (containingClass != null) { - String containingClassQName = containingClass.getQualifiedName(); - if (containingClassQName != null && enumConstant.getName() != null) { - String theirFQName = containingClassQName + "." + enumConstant.getName(); - if (theirFQName.equals(getQualifiedName())) { - return true; - } - } - } - } - return super.isEquivalentTo(another); - } }