MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: fix accessibility check when inlining superclass (IDEA-335158)

Browse Source 
GitOrigin-RevId: ca48bfdfea8085fccedef9489b2c32ab82fcfcfb
This commit is contained in:
Bas Leijdekkers
2025-01-22 20:06:35 +01:00
committed by intellij-monorepo-bot
parent f27ac8953d
commit c482950f2e
9 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/java-impl-refactorings/src/com/intellij/refactoring/util/RefactoringConflictsUtilImpl.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.refactoring.util;
import com.intellij.java.refactoring.JavaRefactoringBundle;
@@ -115,14 +115,14 @@ public final class RefactoringConflictsUtilImpl implements RefactoringConflictsU
}
public static void checkAccessibilityConflictsAfterMove(@NotNull PsiReference reference,
@NotNull PsiMember member,
@Nullable PsiModifierList modifierListCopy,
@Nullable PsiClass targetClass,
@NotNull Set<? extends PsiMember> membersToMove,
@NotNull MultiMap<PsiElement, @DialogMessage String> conflicts) {
JavaPsiFacade manager = JavaPsiFacade.getInstance(member.getProject());
@NotNull PsiMember member,
@Nullable PsiModifierList modifierListCopy,
@Nullable PsiClass targetClass,
@NotNull Set<? extends PsiMember> membersToMove,
@NotNull MultiMap<PsiElement, @DialogMessage String> conflicts) {
PsiElement ref = reference.getElement();
if (!RefactoringHierarchyUtil.willBeInTargetClass(ref, membersToMove, targetClass, false)) {
if (!RefactoringHierarchyUtil.willBeInTargetClass(ref, membersToMove, targetClass, true)) {
JavaPsiFacade manager = JavaPsiFacade.getInstance(member.getProject());
// check for target class accessibility
if (targetClass != null && !manager.getResolveHelper().isAccessible(targetClass, targetClass.getModifierList(), ref, null, null)) {
String message = JavaRefactoringBundle.message("0.is.1.and.will.not.be.accessible.from.2.in.the.target.class",