From 441dded6434bdaa1c472eee37b96563560e73dcf Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 11 Nov 2024 23:19:12 +0100 Subject: [PATCH] Java: fix can be simpler (IJ-CR-149100) (cherry picked from commit ee348aabdcfea05468f214d3da513da75fe6a4fd) IJ-CR-149100 GitOrigin-RevId: 969055ee74f435babd80bfaa7cfc342f149ffe12 --- .../src/com/intellij/codeInsight/ChangeContextUtil.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java index 99aff0e62c10..4a9a09f9f8a8 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java @@ -207,10 +207,9 @@ public final class ChangeContextUtil { PsiClass containingClass = refMember.getContainingClass(); if (containingClass != null && containingClass.isValid() && refMember.hasModifierProperty(PsiModifier.STATIC)) { PsiElement refElement = refExpr.resolve(); - if (!manager.areElementsEquivalent(refMember, refElement) || containingClass.isInterface()) { + if (!manager.areElementsEquivalent(refMember, refElement)) { final PsiClass currentClass = PsiTreeUtil.getParentOfType(refExpr, PsiClass.class); - if (!InheritanceUtil.isInheritorOrSelf(currentClass, containingClass, true) || - containingClass.isInterface() && containingClass != currentClass) { + if (!InheritanceUtil.isInheritorOrSelf(currentClass, containingClass, true) || containingClass.isInterface()) { refExpr.setQualifierExpression(factory.createReferenceExpression(containingClass)); } }