Skip to content

Commit cc870af

Browse files
unv-unvunv-unv
authored
Replacing JavaClassNames with CommonClassNames (part 9). (#182)
1 parent 6be2607 commit cc870af

31 files changed

Lines changed: 116 additions & 152 deletions

File tree

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/miscGenerics/SuspiciousMethodCallUtil.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.siyeh.ig.psiutils.TypeUtils;
1111
import consulo.annotation.access.RequiredReadAction;
1212
import consulo.application.util.NullableLazyValue;
13-
import consulo.java.language.module.util.JavaClassNames;
1413
import consulo.language.editor.inspection.InspectionsBundle;
1514
import consulo.language.editor.inspection.localize.InspectionLocalize;
1615
import consulo.language.psi.PsiElement;
@@ -19,23 +18,22 @@
1918
import consulo.language.psi.util.PsiTreeUtil;
2019
import consulo.util.collection.ArrayUtil;
2120
import consulo.util.lang.ObjectUtil;
21+
import jakarta.annotation.Nonnull;
2222
import jakarta.annotation.Nullable;
2323
import org.jetbrains.annotations.Contract;
2424

25-
import jakarta.annotation.Nonnull;
26-
2725
import java.util.List;
2826

2927
public class SuspiciousMethodCallUtil {
3028

3129
// List.of/Set.of are unnecessary here as they don't accept nulls
3230
private static final CallMatcher.Simple SINGLETON_COLLECTION =
33-
CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_COLLECTIONS, "singletonList", "singleton").parameterCount(1);
31+
CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_COLLECTIONS, "singletonList", "singleton").parameterCount(1);
3432

3533
@RequiredReadAction
3634
private static void setupPatternMethods(PsiManager manager, GlobalSearchScope searchScope, List<? super PatternMethod> patternMethods) {
3735
JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(manager.getProject());
38-
PsiClass collectionClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_COLLECTION, searchScope);
36+
PsiClass collectionClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_COLLECTION, searchScope);
3937
PsiClassType object = PsiType.getJavaLangObject(manager, searchScope);
4038
PsiType[] javaLangObject = {object};
4139
PsiType[] twoObjects = {
@@ -58,13 +56,13 @@ private static void setupPatternMethods(PsiManager manager, GlobalSearchScope se
5856
}
5957
}
6058

61-
PsiClass listClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_LIST, searchScope);
59+
PsiClass listClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_LIST, searchScope);
6260
if (listClass != null) {
6361
addSingleParameterMethod(patternMethods, listClass, "indexOf", object);
6462
addSingleParameterMethod(patternMethods, listClass, "lastIndexOf", object);
6563
}
6664

67-
PsiClass mapClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_MAP, searchScope);
65+
PsiClass mapClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, searchScope);
6866
if (mapClass != null) {
6967
PsiMethod remove = MethodSignatureUtil.findMethodBySignature(mapClass, removeSignature, false);
7068
addMethod(remove, 0, patternMethods, 0);
@@ -104,7 +102,7 @@ private static void setupPatternMethods(PsiManager manager, GlobalSearchScope se
104102
addMethod(containsValue, 1, patternMethods, 0);
105103
}
106104

107-
PsiClass concurrentMapClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP, searchScope);
105+
PsiClass concurrentMapClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP, searchScope);
108106
if (concurrentMapClass != null) {
109107
MethodSignature containsSignature =
110108
MethodSignatureUtil.createMethodSignature("contains", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
@@ -276,7 +274,7 @@ public static String getSuspiciousMethodCallMessage(
276274

277275
if (arg instanceof PsiConditionalExpression
278276
&& argType != null
279-
&& argType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)
277+
&& argType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)
280278
&& PsiPolyExpressionUtil.isPolyExpression(arg)) {
281279
return null;
282280
}
@@ -361,7 +359,7 @@ public static String getSuspiciousMethodCallMessage(
361359
PsiParameter[] parameters = method.getParameterList().getParameters();
362360
if (parameters.length == 1 && ("removeAll".equals(method.getName()) || "retainAll".equals(method.getName()))) {
363361
PsiType paramType = parameters[0].getType();
364-
if (InheritanceUtil.isInheritor(paramType, JavaClassNames.JAVA_UTIL_COLLECTION)) {
362+
if (InheritanceUtil.isInheritor(paramType, CommonClassNames.JAVA_UTIL_COLLECTION)) {
365363
PsiType qualifierType = qualifier.getType();
366364
if (qualifierType != null) {
367365
PsiType itemType = JavaGenericsUtil.getCollectionItemType(argType, calleeMethod.getResolveScope());
@@ -422,7 +420,7 @@ public static String getSuspiciousMethodCallMessage(
422420
}
423421

424422
private static String getPreciseObjectTitle(PsiClass patternClass, int index) {
425-
if (InheritanceUtil.isInheritor(patternClass, JavaClassNames.JAVA_UTIL_MAP)) {
423+
if (InheritanceUtil.isInheritor(patternClass, CommonClassNames.JAVA_UTIL_MAP)) {
426424
return index == 0 ? "keys" : "values";
427425
}
428426

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.intellij.java.language.psi.*;
1919
import com.intellij.java.language.psi.util.InheritanceUtil;
2020
import com.intellij.java.language.psi.util.PsiUtil;
21-
import consulo.java.language.module.util.JavaClassNames;
2221
import org.jetbrains.annotations.Contract;
2322

2423
/**
@@ -36,19 +35,19 @@ public static PsiType getStreamElementType(PsiType type, boolean variableType) {
3635
return null;
3736
}
3837
PsiClass aClass = ((PsiClassType) type).resolve();
39-
if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_INT_STREAM)) {
38+
if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_INT_STREAM)) {
4039
return PsiType.INT;
4140
}
42-
if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_LONG_STREAM)) {
41+
if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_LONG_STREAM)) {
4342
return PsiType.LONG;
4443
}
45-
if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_DOUBLE_STREAM)) {
44+
if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_DOUBLE_STREAM)) {
4645
return PsiType.DOUBLE;
4746
}
48-
if (!InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_STREAM)) {
47+
if (!InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_STREAM)) {
4948
return null;
5049
}
51-
PsiType streamType = PsiUtil.substituteTypeParameter(type, JavaClassNames.JAVA_UTIL_STREAM_STREAM, 0, false);
50+
PsiType streamType = PsiUtil.substituteTypeParameter(type, CommonClassNames.JAVA_UTIL_STREAM_STREAM, 0, false);
5251
if (variableType) {
5352
if (streamType instanceof PsiIntersectionType) {
5453
return null;

‎java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.siyeh.ig.imports;
22

3+
import com.intellij.java.language.psi.CommonClassNames;
34
import com.siyeh.ig.IGInspectionTestCase;
4-
import consulo.java.language.module.util.JavaClassNames;
55

66
public class StaticImportInspectionTest extends IGInspectionTestCase {
77

88
public void test() throws Exception {
99
final StaticImportInspection tool = new StaticImportInspection();
10-
tool.allowedClasses.add(JavaClassNames.JAVA_UTIL_MAP);
10+
tool.allowedClasses.add(CommonClassNames.JAVA_UTIL_MAP);
1111
doTest("com/siyeh/igtest/imports/static_import", tool);
1212
}
1313

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/memory/utils/StackFrameItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
import com.intellij.java.debugger.impl.settings.NodeRendererSettings;
2727
import com.intellij.java.debugger.impl.ui.breakpoints.StackCapturingLineBreakpoint;
2828
import com.intellij.java.debugger.impl.ui.tree.render.ClassRenderer;
29+
import com.intellij.java.language.psi.CommonClassNames;
2930
import consulo.execution.debug.XSourcePosition;
3031
import consulo.execution.debug.frame.*;
3132
import consulo.execution.debug.frame.presentation.XStringValuePresentation;
3233
import consulo.execution.debug.icon.ExecutionDebugIconGroup;
3334
import consulo.execution.debug.ui.XDebuggerUIConstants;
3435
import consulo.ide.setting.ShowSettingsUtil;
3536
import consulo.internal.com.sun.jdi.*;
36-
import consulo.java.language.module.util.JavaClassNames;
3737
import consulo.logging.Logger;
3838
import consulo.platform.base.icon.PlatformIconGroup;
3939
import consulo.ui.ex.ColoredTextContainer;
@@ -194,7 +194,7 @@ public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace p
194194
ClassRenderer classRenderer = NodeRendererSettings.getInstance().getClassRenderer();
195195
String type = classRenderer.renderTypeName(myType);
196196
Image icon = myVarType == VariableItem.VarType.PARAM ? PlatformIconGroup.nodesParameter() : ExecutionDebugIconGroup.nodeValue();
197-
if (myType != null && myType.startsWith(JavaClassNames.JAVA_LANG_STRING + "@")) {
197+
if (myType != null && myType.startsWith(CommonClassNames.JAVA_LANG_STRING + "@")) {
198198
node.setPresentation(icon, new XStringValuePresentation(myValue) {
199199
@Nullable
200200
@Override

‎java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,16 @@
1515
*/
1616
package com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.constraints;
1717

18-
import java.util.HashSet;
19-
import java.util.List;
20-
21-
import com.intellij.java.language.psi.*;
2218
import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceBound;
2319
import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceSession;
2420
import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceVariable;
21+
import com.intellij.java.language.psi.*;
2522
import com.intellij.java.language.psi.util.InheritanceUtil;
2623
import com.intellij.java.language.psi.util.PsiUtil;
2724
import com.intellij.java.language.psi.util.TypeConversionUtil;
28-
import consulo.java.language.module.util.JavaClassNames;
25+
26+
import java.util.HashSet;
27+
import java.util.List;
2928

3029
/**
3130
* User: anna
@@ -68,7 +67,7 @@ private boolean doReduce(InferenceSession session, HashSet<InferenceVariable> de
6867
{
6968
if(myT == null)
7069
{
71-
return myS == null || myS.equalsToText(JavaClassNames.JAVA_LANG_OBJECT);
70+
return myS == null || myS.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
7271
}
7372
if(myS == null)
7473
{
@@ -81,7 +80,7 @@ private boolean doReduce(InferenceSession session, HashSet<InferenceVariable> de
8180
{
8281
return false;
8382
}
84-
if(PsiType.NULL.equals(myS) || myS == null || myT.equalsToText(JavaClassNames.JAVA_LANG_OBJECT))
83+
if(PsiType.NULL.equals(myS) || myS == null || myT.equalsToText(CommonClassNames.JAVA_LANG_OBJECT))
8584
{
8685
return true;
8786
}

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import com.intellij.java.language.psi.*;
1919
import consulo.codeEditor.Editor;
20-
import consulo.java.language.module.util.JavaClassNames;
2120
import consulo.language.editor.intention.SyntheticIntentionAction;
2221
import consulo.language.psi.PsiElement;
2322
import consulo.language.psi.PsiFile;
@@ -45,7 +44,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
4544
return false;
4645
}
4746
final PsiClass resolvedType = ((PsiClassType)myExpectedType).resolve();
48-
return resolvedType != null && JavaClassNames.JAVA_LANG_STRING.equals(resolvedType.getQualifiedName()) &&
47+
return resolvedType != null && CommonClassNames.JAVA_LANG_STRING.equals(resolvedType.getQualifiedName()) &&
4948
myValue instanceof PsiLiteralExpression;
5049
}
5150

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/SurroundAutoCloseableAction.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import consulo.annotation.access.RequiredReadAction;
2424
import consulo.annotation.component.ExtensionImpl;
2525
import consulo.codeEditor.Editor;
26-
import consulo.java.language.module.util.JavaClassNames;
2726
import consulo.language.codeStyle.CodeStyleManager;
2827
import consulo.language.editor.intention.IntentionMetaData;
2928
import consulo.language.editor.intention.PsiElementBaseIntentionAction;
@@ -64,8 +63,10 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
6463
if (!(type instanceof PsiClassType)) return false;
6564
final PsiClass aClass = ((PsiClassType)type).resolve();
6665
final JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
67-
final PsiClass autoCloseable =
68-
facade.findClass(JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE, (GlobalSearchScope) ProjectScopes.getLibrariesScope(project));
66+
final PsiClass autoCloseable = facade.findClass(
67+
CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE,
68+
(GlobalSearchScope) ProjectScopes.getLibrariesScope(project)
69+
);
6970
return InheritanceUtil.isInheritorOrSelf(aClass, autoCloseable, true);
7071
}
7172

‎plugin/src/main/java/com/intellij/java/impl/codeInspection/StreamFilterNotNullFix.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public static StreamFilterNotNullFix makeFix(PsiElement reference) {
122122
return null;
123123
}
124124
PsiExpression qualifier = call.getMethodExpression().getQualifierExpression();
125-
if (qualifier == null || !InheritanceUtil.isInheritor(qualifier.getType(), JavaClassNames.JAVA_UTIL_STREAM_STREAM)) {
125+
if (qualifier == null || !InheritanceUtil.isInheritor(qualifier.getType(), CommonClassNames.JAVA_UTIL_STREAM_STREAM)) {
126126
return null;
127127
}
128128
return new StreamFilterNotNullFix();

‎plugin/src/main/java/com/intellij/java/impl/codeInspection/inheritance/SuperClassHasFrequentlyUsedInheritorsInspection.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
import com.intellij.java.impl.codeInspection.inheritance.search.InheritorsStatisticsSearchResult;
66
import com.intellij.java.language.psi.*;
77
import consulo.annotation.component.ExtensionImpl;
8-
import consulo.java.language.module.util.JavaClassNames;
98
import consulo.language.editor.inspection.LocalQuickFix;
109
import consulo.language.editor.inspection.ProblemDescriptor;
1110
import consulo.language.editor.inspection.ProblemHighlightType;
1211
import consulo.language.editor.inspection.localize.InspectionLocalize;
1312
import consulo.language.editor.inspection.scheme.InspectionManager;
14-
import org.jetbrains.annotations.Nls;
15-
1613
import jakarta.annotation.Nonnull;
1714
import jakarta.annotation.Nullable;
15+
import org.jetbrains.annotations.Nls;
16+
1817
import java.util.ArrayList;
1918
import java.util.Collection;
2019
import java.util.List;
@@ -100,9 +99,9 @@ private static PsiClass getSuperIfUnique(final @Nonnull PsiClass aClass) {
10099
final PsiJavaCodeReferenceElement[] referenceElements = extendsList.getReferenceElements();
101100
if (referenceElements.length == 1) {
102101
PsiClass returnClass = (PsiClass)referenceElements[0].resolve();
103-
if (returnClass != null &&
104-
!JavaClassNames.JAVA_LANG_OBJECT.equals(returnClass.getQualifiedName()) &&
105-
!returnClass.isInterface()) {
102+
if (returnClass != null
103+
&& !CommonClassNames.JAVA_LANG_OBJECT.equals(returnClass.getQualifiedName())
104+
&& !returnClass.isInterface()) {
106105
return returnClass;
107106
}
108107
}

‎plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SubtypesHierarchyTreeStructure.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
import com.intellij.java.indexing.search.searches.ClassInheritorsSearch;
1919
import com.intellij.java.indexing.search.searches.FunctionalExpressionSearch;
20+
import com.intellij.java.language.psi.CommonClassNames;
2021
import com.intellij.java.language.psi.PsiAnonymousClass;
2122
import com.intellij.java.language.psi.PsiClass;
2223
import consulo.content.scope.SearchScope;
2324
import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor;
2425
import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure;
2526
import consulo.ide.localize.IdeLocalize;
26-
import consulo.java.language.module.util.JavaClassNames;
2727
import consulo.project.Project;
2828
import consulo.util.collection.ArrayUtil;
2929
import jakarta.annotation.Nonnull;
@@ -51,7 +51,7 @@ protected final Object[] buildChildren(@Nonnull HierarchyNodeDescriptor descript
5151
if (!(element instanceof PsiClass psiClass)) {
5252
return ArrayUtil.EMPTY_OBJECT_ARRAY;
5353
}
54-
if (JavaClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) {
54+
if (CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) {
5555
return new Object[]{IdeLocalize.nodeHierarchyJavaLangObject().get()};
5656
}
5757
if (psiClass instanceof PsiAnonymousClass) {

0 commit comments

Comments
 (0)