Skip to content

Commit f8a8f0c

Browse files
unv-unvunv-unv
committed
Replacing JavaClassNames with CommonClassNames (part 2).
1 parent 223cabb commit f8a8f0c

60 files changed

Lines changed: 317 additions & 423 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/ClassUtil.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
package com.intellij.java.analysis.impl.codeInsight;
2121

2222
import com.intellij.java.language.psi.*;
23-
import consulo.java.language.module.util.JavaClassNames;
24-
2523
import jakarta.annotation.Nonnull;
2624
import jakarta.annotation.Nullable;
25+
2726
import java.util.HashSet;
2827
import java.util.List;
2928
import java.util.Set;
@@ -84,7 +83,7 @@ private static PsiMethod checkPackageLocalInSuperClass(@Nonnull PsiClass aClass)
8483
// super class can have package local abstract methods not accessible for overriding
8584
PsiClass superClass = aClass.getSuperClass();
8685
if (superClass == null) return null;
87-
if (JavaClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null;
86+
if (CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null;
8887
if (JavaPsiFacade.getInstance(aClass.getProject()).arePackagesTheSame(aClass, superClass)) return null;
8988

9089
for (HierarchicalMethodSignature methodSignature : superClass.getVisibleSignatures()) {

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import consulo.annotation.access.RequiredReadAction;
2222
import consulo.codeEditor.Editor;
2323
import consulo.java.analysis.impl.localize.JavaQuickFixLocalize;
24-
import consulo.java.language.module.util.JavaClassNames;
2524
import consulo.language.editor.FileModificationService;
2625
import consulo.language.editor.intention.SyntheticIntentionAction;
2726
import consulo.language.editor.rawHighlight.HighlightInfo;
@@ -187,6 +186,6 @@ private static boolean charToString(PsiType firstType, PsiType secondType) {
187186
}
188187

189188
private static boolean isString(PsiType type) {
190-
return type != null && JavaClassNames.JAVA_LANG_STRING.equals(type.getCanonicalText());
189+
return type != null && CommonClassNames.JAVA_LANG_STRING.equals(type.getCanonicalText());
191190
}
192191
}

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.intellij.java.language.psi.util.PsiUtil;
2121
import consulo.codeEditor.Editor;
2222
import consulo.java.analysis.impl.JavaQuickFixBundle;
23-
import consulo.java.language.module.util.JavaClassNames;
2423
import consulo.language.ast.IElementType;
2524
import consulo.language.editor.FileModificationService;
2625
import consulo.language.editor.intention.SyntheticIntentionAction;
@@ -29,9 +28,8 @@
2928
import consulo.language.util.IncorrectOperationException;
3029
import consulo.project.Project;
3130
import jakarta.annotation.Nonnull;
32-
import org.jetbrains.annotations.NonNls;
33-
3431
import jakarta.annotation.Nullable;
32+
import org.jetbrains.annotations.NonNls;
3533

3634
/**
3735
* @author Bas Leijdekkers
@@ -62,8 +60,8 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
6260
return JavaTokenType.PLUSEQ == myTokenType &&
6361
myAssignmentExpression.isValid() &&
6462
PsiManager.getInstance(project).isInProject(myAssignmentExpression) &&
65-
(myLhsType.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUILDER) ||
66-
myLhsType.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUFFER) ||
63+
(myLhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUILDER) ||
64+
myLhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUFFER) ||
6765
myLhsType.equalsToText("java.lang.Appendable"));
6866
}
6967

@@ -100,7 +98,7 @@ private static StringBuilder buildAppendExpression(@Nullable PsiExpression conca
10098
if (type == null) {
10199
return null;
102100
}
103-
if (concatenation instanceof PsiPolyadicExpression && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) {
101+
if (concatenation instanceof PsiPolyadicExpression && type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
104102
PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)concatenation;
105103
final PsiExpression[] operands = polyadicExpression.getOperands();
106104
boolean isConstant = true;
@@ -112,7 +110,7 @@ private static StringBuilder buildAppendExpression(@Nullable PsiExpression conca
112110
builder.append('+');
113111
}
114112
final PsiType operandType = operand.getType();
115-
if (operandType != null && operandType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) {
113+
if (operandType != null && operandType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
116114
isString = true;
117115
}
118116
builder.append(operand.getText());
@@ -138,7 +136,7 @@ else if (concatenation instanceof PsiParenthesizedExpression) {
138136
}
139137
}
140138
else {
141-
append(concatenation.getText(), useStringValueOf && !type.equalsToText(JavaClassNames.JAVA_LANG_STRING), out);
139+
append(concatenation.getText(), useStringValueOf && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING), out);
142140
}
143141
return out;
144142
}

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
import com.intellij.java.language.psi.impl.source.resolve.DefaultParameterTypeInferencePolicy;
2828
import com.intellij.java.language.psi.util.TypeConversionUtil;
2929
import consulo.codeEditor.Editor;
30-
import consulo.java.language.module.util.JavaClassNames;
3130
import consulo.language.editor.FileModificationService;
3231
import consulo.language.editor.intention.HighPriorityAction;
33-
import consulo.language.editor.intention.QuickFixAction;
3432
import consulo.language.editor.intention.SyntheticIntentionAction;
3533
import consulo.language.editor.rawHighlight.HighlightInfo;
3634
import consulo.language.psi.PsiElement;
@@ -41,7 +39,6 @@
4139
import consulo.ui.annotation.RequiredUIAccess;
4240
import consulo.util.lang.StringUtil;
4341
import jakarta.annotation.Nonnull;
44-
4542
import jakarta.annotation.Nullable;
4643

4744
public class ChangeTypeArgumentsFix implements SyntheticIntentionAction, HighPriorityAction {
@@ -71,7 +68,7 @@ public String getText() {
7168
myPsiClass.getTypeParameters(),
7269
typeParameter -> {
7370
PsiType substituted = substitutor.substitute(typeParameter);
74-
return substituted != null ? substituted.getPresentableText() : JavaClassNames.JAVA_LANG_OBJECT;
71+
return substituted != null ? substituted.getPresentableText() : CommonClassNames.JAVA_LANG_OBJECT;
7572
},
7673
", "
7774
) + ">";

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.intellij.java.language.psi.util.TypeConversionUtil;
2424
import com.siyeh.ig.callMatcher.CallMatcher;
2525
import com.siyeh.ig.psiutils.*;
26-
import consulo.java.language.module.util.JavaClassNames;
2726
import consulo.language.ast.IElementType;
2827
import consulo.language.editor.ImplicitUsageProvider;
2928
import consulo.language.psi.PsiElement;
@@ -1260,7 +1259,7 @@ public void visitArrayAccessExpression(PsiArrayAccessExpression expression) {
12601259
toPush = myFactory.getObjectType(expression.getType(), Nullability.UNKNOWN);
12611260
}
12621261
DfaControlTransferValue transfer = shouldHandleException()
1263-
? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION), myTrapStack)
1262+
? myFactory.controlTransfer(myExceptionCache.get(CommonClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION), myTrapStack)
12641263
: null;
12651264
addInstruction(new ArrayAccessInstruction(toPush, expression, transfer));
12661265
addNullCheck(expression);
@@ -2025,7 +2024,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression castExpression) {
20252024
final PsiTypeElement typeElement = castExpression.getCastType();
20262025
if (typeElement != null && operand != null && operand.getType() != null && !(typeElement.getType() instanceof PsiPrimitiveType)) {
20272026
DfaControlTransferValue transfer = shouldHandleException()
2028-
? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION), myTrapStack)
2027+
? myFactory.controlTransfer(myExceptionCache.get(CommonClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION), myTrapStack)
20292028
: null;
20302029
addInstruction(new TypeCastInstruction(castExpression, operand, typeElement.getType(), transfer));
20312030
}

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/ComparatorModel.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import com.intellij.java.language.psi.util.PsiUtil;
2222
import com.siyeh.ig.callMatcher.CallMatcher;
2323
import consulo.annotation.access.RequiredReadAction;
24-
import consulo.java.language.module.util.JavaClassNames;
2524
import consulo.util.lang.ObjectUtil;
26-
2725
import jakarta.annotation.Nonnull;
2826
import jakarta.annotation.Nullable;
2927

@@ -147,7 +145,7 @@ static ComparatorModel from(@Nullable PsiExpression expression) {
147145
if (expression instanceof PsiReferenceExpression ref && "CASE_INSENSITIVE_ORDER".equals(ref.getReferenceName())) {
148146
PsiField field = ObjectUtil.tryCast(ref.resolve(), PsiField.class);
149147
if (field != null && field.getContainingClass() != null
150-
&& JavaClassNames.JAVA_LANG_STRING.equals(field.getContainingClass().getQualifiedName())) {
148+
&& CommonClassNames.JAVA_LANG_STRING.equals(field.getContainingClass().getQualifiedName())) {
151149
return new NullHostile();
152150
}
153151
}

‎java-analysis-impl/src/main/java/com/siyeh/ig/callMatcher/CallMatcher.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
import com.intellij.java.language.psi.util.PsiUtil;
88
import com.siyeh.ig.psiutils.MethodCallUtils;
99
import consulo.annotation.access.RequiredReadAction;
10-
import consulo.java.language.module.util.JavaClassNames;
1110
import consulo.language.psi.PsiElement;
1211
import consulo.util.collection.ArrayUtil;
1312
import consulo.util.lang.ObjectUtil;
14-
import one.util.streamex.StreamEx;
15-
import org.jetbrains.annotations.Contract;
16-
1713
import jakarta.annotation.Nonnull;
1814
import jakarta.annotation.Nullable;
15+
import one.util.streamex.StreamEx;
16+
import org.jetbrains.annotations.Contract;
1917

2018
import java.util.Collections;
2119
import java.util.Set;
@@ -222,7 +220,7 @@ class Simple implements CallMatcher {
222220
static final Simple ENUM_VALUES =
223221
new Simple("", Collections.singleton("values"), ArrayUtil.EMPTY_STRING_ARRAY, CallType.ENUM_STATIC);
224222
static final Simple ENUM_VALUE_OF =
225-
new Simple("", Collections.singleton("valueOf"), new String[]{JavaClassNames.JAVA_LANG_STRING}, CallType.ENUM_STATIC);
223+
new Simple("", Collections.singleton("valueOf"), new String[]{CommonClassNames.JAVA_LANG_STRING}, CallType.ENUM_STATIC);
226224
@Nonnull
227225
private final String myClassName;
228226
@Nonnull

‎java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@
1919
import com.intellij.java.language.psi.*;
2020
import com.intellij.java.language.psi.util.PsiUtil;
2121
import com.intellij.java.language.psi.util.TypeConversionUtil;
22-
import consulo.java.language.module.util.JavaClassNames;
2322
import consulo.language.psi.PsiElement;
2423
import consulo.language.psi.PsiFile;
2524
import consulo.language.psi.util.PsiTreeUtil;
2625
import jakarta.annotation.Nonnull;
26+
import jakarta.annotation.Nullable;
2727
import org.jetbrains.annotations.Contract;
2828

29-
import jakarta.annotation.Nullable;
3029
import java.util.HashSet;
3130
import java.util.Set;
3231

@@ -62,23 +61,23 @@ public class ClassUtils {
6261
primitiveNumericTypes.add(PsiType.FLOAT);
6362
primitiveNumericTypes.add(PsiType.DOUBLE);
6463

65-
immutableTypes.add(JavaClassNames.JAVA_LANG_BOOLEAN);
66-
immutableTypes.add(JavaClassNames.JAVA_LANG_CHARACTER);
67-
immutableTypes.add(JavaClassNames.JAVA_LANG_SHORT);
68-
immutableTypes.add(JavaClassNames.JAVA_LANG_INTEGER);
69-
immutableTypes.add(JavaClassNames.JAVA_LANG_LONG);
70-
immutableTypes.add(JavaClassNames.JAVA_LANG_FLOAT);
71-
immutableTypes.add(JavaClassNames.JAVA_LANG_DOUBLE);
72-
immutableTypes.add(JavaClassNames.JAVA_LANG_BYTE);
73-
immutableTypes.add(JavaClassNames.JAVA_LANG_STRING);
64+
immutableTypes.add(CommonClassNames.JAVA_LANG_BOOLEAN);
65+
immutableTypes.add(CommonClassNames.JAVA_LANG_CHARACTER);
66+
immutableTypes.add(CommonClassNames.JAVA_LANG_SHORT);
67+
immutableTypes.add(CommonClassNames.JAVA_LANG_INTEGER);
68+
immutableTypes.add(CommonClassNames.JAVA_LANG_LONG);
69+
immutableTypes.add(CommonClassNames.JAVA_LANG_FLOAT);
70+
immutableTypes.add(CommonClassNames.JAVA_LANG_DOUBLE);
71+
immutableTypes.add(CommonClassNames.JAVA_LANG_BYTE);
72+
immutableTypes.add(CommonClassNames.JAVA_LANG_STRING);
7473
immutableTypes.add("java.awt.Font");
7574
immutableTypes.add("java.awt.Color");
7675
immutableTypes.add("java.math.BigDecimal");
7776
immutableTypes.add("java.math.BigInteger");
7877
immutableTypes.add("java.math.MathContext");
7978
immutableTypes.add("java.nio.channels.FileLock");
8079
immutableTypes.add("java.nio.charset.Charset");
81-
immutableTypes.add(JavaClassNames.JAVA_IO_FILE);
80+
immutableTypes.add(CommonClassNames.JAVA_IO_FILE);
8281
immutableTypes.add("java.net.URI");
8382
immutableTypes.add("java.util.regex.Pattern");
8483
}
@@ -93,7 +92,7 @@ public static PsiClass findClass(String fqClassName, PsiElement context) {
9392

9493
@Nullable
9594
public static PsiClass findObjectClass(PsiElement context) {
96-
return findClass(JavaClassNames.JAVA_LANG_OBJECT, context);
95+
return findClass(CommonClassNames.JAVA_LANG_OBJECT, context);
9796
}
9897

9998
public static boolean isPrimitive(PsiType type) {

‎java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CloneUtils.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,18 @@
1515
*/
1616
package com.siyeh.ig.psiutils;
1717

18-
import jakarta.annotation.Nonnull;
19-
2018
import com.intellij.java.language.psi.*;
2119
import com.intellij.java.language.psi.util.InheritanceUtil;
2220
import com.intellij.java.language.psi.util.PsiUtil;
2321
import com.siyeh.HardcodedMethodConstants;
24-
import consulo.java.language.module.util.JavaClassNames;
22+
import jakarta.annotation.Nonnull;
2523

2624
public class CloneUtils {
2725

2826
private CloneUtils() {}
2927

3028
public static boolean isCloneable(@Nonnull PsiClass aClass) {
31-
return InheritanceUtil.isInheritor(aClass,
32-
JavaClassNames.JAVA_LANG_CLONEABLE);
29+
return InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_CLONEABLE);
3330
}
3431

3532
public static boolean isDirectlyCloneable(@Nonnull PsiClass aClass) {
@@ -39,7 +36,7 @@ public static boolean isDirectlyCloneable(@Nonnull PsiClass aClass) {
3936
continue;
4037
}
4138
final String qualifiedName = anInterface.getQualifiedName();
42-
if (JavaClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName)) {
39+
if (CommonClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName)) {
4340
return true;
4441
}
4542
}

0 commit comments

Comments
 (0)