Skip to content

Commit d7d32e9

Browse files
unv-unvunv-unv
authored
BaseRefactoringProcessor.preprocessUsages fix (#188)
* Reformatting descendants of BaseRefactoringProcessor. * Fixing preprocessUsages in BaseRefactoringProcessor descendants.
1 parent 343d1dd commit d7d32e9

22 files changed

Lines changed: 7426 additions & 6762 deletions

‎java-language-api/src/main/java/com/intellij/java/language/util/VisibilityUtil.java‎

Lines changed: 118 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -38,137 +38,141 @@
3838

3939
import jakarta.annotation.Nonnull;
4040

41-
4241
public class VisibilityUtil {
43-
@NonNls
44-
public static final String ESCALATE_VISIBILITY = "EscalateVisible";
45-
private static final String[] visibilityModifiers = {
46-
PsiModifier.PRIVATE,
47-
PsiModifier.PACKAGE_LOCAL,
48-
PsiModifier.PROTECTED,
49-
PsiModifier.PUBLIC
50-
};
51-
52-
private VisibilityUtil() {
53-
}
54-
55-
public static int compare(@PsiModifier.ModifierConstant String v1, @PsiModifier.ModifierConstant String v2) {
56-
return ArrayUtil.find(visibilityModifiers, v2) - ArrayUtil.find(visibilityModifiers, v1);
57-
}
58-
59-
@PsiModifier.ModifierConstant
60-
public static String getHighestVisibility(@PsiModifier.ModifierConstant String v1, @PsiModifier.ModifierConstant String v2) {
61-
return compare(v1, v2) < 0 ? v1 : v2;
62-
}
63-
64-
public static void escalateVisibility(PsiMember modifierListOwner, PsiElement place) throws IncorrectOperationException {
65-
final String visibilityModifier = getVisibilityModifier(modifierListOwner.getModifierList());
66-
int index;
67-
for (index = 0; index < visibilityModifiers.length; index++) {
68-
String modifier = visibilityModifiers[index];
69-
if (modifier.equals(visibilityModifier)) {
70-
break;
71-
}
72-
}
73-
for (; index < visibilityModifiers.length && !PsiUtil.isAccessible(modifierListOwner, place, null); index++) {
74-
@PsiModifier.ModifierConstant String modifier = visibilityModifiers[index];
75-
PsiUtil.setModifierProperty(modifierListOwner, modifier, true);
76-
}
77-
}
42+
@NonNls
43+
public static final String ESCALATE_VISIBILITY = "EscalateVisible";
44+
private static final String[] visibilityModifiers = {
45+
PsiModifier.PRIVATE,
46+
PsiModifier.PACKAGE_LOCAL,
47+
PsiModifier.PROTECTED,
48+
PsiModifier.PUBLIC
49+
};
7850

79-
public static void escalateVisibility(PsiModifierList modifierList, PsiElement place) throws IncorrectOperationException {
80-
final PsiElement parent = modifierList.getParent();
81-
if (parent instanceof PsiMember) {
82-
escalateVisibility((PsiMember) parent, place);
51+
private VisibilityUtil() {
8352
}
84-
}
8553

86-
@PsiModifier.ModifierConstant
87-
public static String getPossibleVisibility(final PsiMember psiMethod, final PsiElement place) {
88-
Project project = psiMethod.getProject();
89-
if (PsiUtil.isAccessible(project, psiMethod, place, null)) {
90-
return getVisibilityModifier(psiMethod.getModifierList());
91-
}
92-
if (JavaPsiFacade.getInstance(project).arePackagesTheSame(psiMethod, place)) {
93-
return PsiModifier.PACKAGE_LOCAL;
54+
public static int compare(@PsiModifier.ModifierConstant String v1, @PsiModifier.ModifierConstant String v2) {
55+
return ArrayUtil.find(visibilityModifiers, v2) - ArrayUtil.find(visibilityModifiers, v1);
9456
}
95-
if (InheritanceUtil.isInheritorOrSelf(PsiTreeUtil.getParentOfType(place, PsiClass.class), psiMethod.getContainingClass(), true)) {
96-
return PsiModifier.PROTECTED;
97-
}
98-
return PsiModifier.PUBLIC;
99-
}
10057

101-
@PsiModifier.ModifierConstant
102-
public static String getVisibilityModifier(PsiModifierList list) {
103-
if (list == null) {
104-
return PsiModifier.PACKAGE_LOCAL;
105-
}
106-
for (@PsiModifier.ModifierConstant String modifier : visibilityModifiers) {
107-
if (list.hasModifierProperty(modifier)) {
108-
return modifier;
109-
}
58+
@PsiModifier.ModifierConstant
59+
public static String getHighestVisibility(@PsiModifier.ModifierConstant String v1, @PsiModifier.ModifierConstant String v2) {
60+
return compare(v1, v2) < 0 ? v1 : v2;
11061
}
111-
return PsiModifier.PACKAGE_LOCAL;
112-
}
113-
114-
@Nonnull
115-
@NonNls
116-
public static String getVisibilityString(@PsiModifier.ModifierConstant String visibilityModifier) {
117-
if (PsiModifier.PACKAGE_LOCAL.equals(visibilityModifier)) {
118-
return "";
62+
63+
public static void escalateVisibility(PsiMember modifierListOwner, PsiElement place) throws IncorrectOperationException {
64+
final String visibilityModifier = getVisibilityModifier(modifierListOwner.getModifierList());
65+
int index;
66+
for (index = 0; index < visibilityModifiers.length; index++) {
67+
String modifier = visibilityModifiers[index];
68+
if (modifier.equals(visibilityModifier)) {
69+
break;
70+
}
71+
}
72+
for (; index < visibilityModifiers.length && !PsiUtil.isAccessible(modifierListOwner, place, null); index++) {
73+
@PsiModifier.ModifierConstant String modifier = visibilityModifiers[index];
74+
PsiUtil.setModifierProperty(modifierListOwner, modifier, true);
75+
}
11976
}
120-
return visibilityModifier;
121-
}
122-
123-
@Nls
124-
@Nonnull
125-
public static String getVisibilityStringToDisplay(@Nonnull PsiMember member) {
126-
if (member.hasModifierProperty(PsiModifier.PUBLIC)) {
127-
return toPresentableText(PsiModifier.PUBLIC);
77+
78+
public static void escalateVisibility(PsiModifierList modifierList, PsiElement place) throws IncorrectOperationException {
79+
final PsiElement parent = modifierList.getParent();
80+
if (parent instanceof PsiMember) {
81+
escalateVisibility((PsiMember)parent, place);
82+
}
12883
}
129-
if (member.hasModifierProperty(PsiModifier.PROTECTED)) {
130-
return toPresentableText(PsiModifier.PROTECTED);
84+
85+
@PsiModifier.ModifierConstant
86+
public static String getPossibleVisibility(final PsiMember psiMethod, final PsiElement place) {
87+
Project project = psiMethod.getProject();
88+
if (PsiUtil.isAccessible(project, psiMethod, place, null)) {
89+
return getVisibilityModifier(psiMethod.getModifierList());
90+
}
91+
if (JavaPsiFacade.getInstance(project).arePackagesTheSame(psiMethod, place)) {
92+
return PsiModifier.PACKAGE_LOCAL;
93+
}
94+
if (InheritanceUtil.isInheritorOrSelf(PsiTreeUtil.getParentOfType(place, PsiClass.class), psiMethod.getContainingClass(), true)) {
95+
return PsiModifier.PROTECTED;
96+
}
97+
return PsiModifier.PUBLIC;
13198
}
132-
if (member.hasModifierProperty(PsiModifier.PRIVATE)) {
133-
return toPresentableText(PsiModifier.PRIVATE);
99+
100+
@PsiModifier.ModifierConstant
101+
public static String getVisibilityModifier(PsiModifierList list) {
102+
if (list == null) {
103+
return PsiModifier.PACKAGE_LOCAL;
104+
}
105+
for (@PsiModifier.ModifierConstant String modifier : visibilityModifiers) {
106+
if (list.hasModifierProperty(modifier)) {
107+
return modifier;
108+
}
109+
}
110+
return PsiModifier.PACKAGE_LOCAL;
134111
}
135-
return toPresentableText(PsiModifier.PACKAGE_LOCAL);
136-
}
137112

138-
@Nonnull
139-
public static String toPresentableText(@PsiModifier.ModifierConstant @Nonnull String modifier) {
140-
return PsiBundle.visibilityPresentation(modifier);
141-
}
113+
@Nonnull
114+
@NonNls
115+
public static String getVisibilityString(@PsiModifier.ModifierConstant String visibilityModifier) {
116+
if (PsiModifier.PACKAGE_LOCAL.equals(visibilityModifier)) {
117+
return "";
118+
}
119+
return visibilityModifier;
120+
}
142121

143-
public static void fixVisibility(PsiElement[] elements, PsiMember member, @PsiModifier.ModifierConstant String newVisibility) {
144-
if (newVisibility == null) {
145-
return;
122+
@Nls
123+
@Nonnull
124+
public static String getVisibilityStringToDisplay(@Nonnull PsiMember member) {
125+
if (member.hasModifierProperty(PsiModifier.PUBLIC)) {
126+
return toPresentableText(PsiModifier.PUBLIC);
127+
}
128+
if (member.hasModifierProperty(PsiModifier.PROTECTED)) {
129+
return toPresentableText(PsiModifier.PROTECTED);
130+
}
131+
if (member.hasModifierProperty(PsiModifier.PRIVATE)) {
132+
return toPresentableText(PsiModifier.PRIVATE);
133+
}
134+
return toPresentableText(PsiModifier.PACKAGE_LOCAL);
146135
}
147-
if (ESCALATE_VISIBILITY.equals(newVisibility)) {
148-
for (PsiElement element : elements) {
149-
if (element != null) {
150-
escalateVisibility(member, element);
151-
}
152-
}
153-
} else {
154-
setVisibility(member.getModifierList(), newVisibility);
136+
137+
@Nonnull
138+
public static String toPresentableText(@PsiModifier.ModifierConstant @Nonnull String modifier) {
139+
return PsiBundle.visibilityPresentation(modifier);
155140
}
156-
}
157141

158-
public static void setVisibility(PsiModifierList modifierList, @PsiModifier.ModifierConstant String newVisibility) throws IncorrectOperationException {
159-
modifierList.setModifierProperty(newVisibility, true);
160-
}
142+
public static void fixVisibility(PsiElement[] elements, PsiMember member, @PsiModifier.ModifierConstant String newVisibility) {
143+
if (newVisibility == null) {
144+
return;
145+
}
146+
if (ESCALATE_VISIBILITY.equals(newVisibility)) {
147+
for (PsiElement element : elements) {
148+
if (element != null) {
149+
escalateVisibility(member, element);
150+
}
151+
}
152+
}
153+
else {
154+
setVisibility(member.getModifierList(), newVisibility);
155+
}
156+
}
161157

162-
public static void fixVisibility(PsiExpression[] expressions, PsiMember member, String newVisibility) {
163-
if (newVisibility == null) {
164-
return;
158+
public static void setVisibility(
159+
PsiModifierList modifierList,
160+
@PsiModifier.ModifierConstant String newVisibility
161+
) throws IncorrectOperationException {
162+
modifierList.setModifierProperty(newVisibility, true);
165163
}
166-
if (ESCALATE_VISIBILITY.equals(newVisibility)) {
167-
for (PsiExpression element : expressions) {
168-
escalateVisibility(member, element);
169-
}
170-
} else {
171-
setVisibility(member.getModifierList(), newVisibility);
164+
165+
public static void fixVisibility(PsiExpression[] expressions, PsiMember member, String newVisibility) {
166+
if (newVisibility == null) {
167+
return;
168+
}
169+
if (ESCALATE_VISIBILITY.equals(newVisibility)) {
170+
for (PsiExpression element : expressions) {
171+
escalateVisibility(member, element);
172+
}
173+
}
174+
else {
175+
setVisibility(member.getModifierList(), newVisibility);
176+
}
172177
}
173-
}
174178
}

0 commit comments

Comments
 (0)