Skip to content

Commit ca65f4e

Browse files
unv-unvunv-unv
committed
Replacing JavaClassNames with CommonClassNames (part 6).
1 parent 629f4dd commit ca65f4e

50 files changed

Lines changed: 220 additions & 277 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/codeInspection/dataFlow/inference/ParameterNullityInferenceKt.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.intellij.java.language.impl.psi.impl.source.JavaLightTreeUtil;
44
import com.intellij.java.language.impl.psi.impl.source.tree.ElementType;
5+
import com.intellij.java.language.psi.CommonClassNames;
56
import com.intellij.java.language.psi.JavaTokenType;
6-
import consulo.java.language.module.util.JavaClassNames;
77
import consulo.language.ast.*;
88
import consulo.util.collection.ContainerUtil;
99
import jakarta.annotation.Nonnull;
@@ -183,10 +183,10 @@ else if (ElementType.JAVA_STATEMENT_BIT_SET.contains(type)) {
183183
"Exception",
184184
"RuntimeException",
185185
"NullPointerException",
186-
JavaClassNames.JAVA_LANG_THROWABLE,
187-
JavaClassNames.JAVA_LANG_EXCEPTION,
188-
JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION,
189-
JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION
186+
CommonClassNames.JAVA_LANG_THROWABLE,
187+
CommonClassNames.JAVA_LANG_EXCEPTION,
188+
CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION,
189+
CommonClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION
190190
);
191191

192192
private static boolean canCatchNpe(LighterAST tree, @Nullable LighterASTNode type) {

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/nullable/NullableStuffInspectionBase.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import consulo.annotation.access.RequiredReadAction;
2020
import consulo.application.util.registry.Registry;
2121
import consulo.java.analysis.impl.localize.JavaInspectionsLocalize;
22-
import consulo.java.language.module.util.JavaClassNames;
2322
import consulo.language.editor.inspection.*;
2423
import consulo.language.editor.inspection.localize.InspectionLocalize;
2524
import consulo.language.psi.PsiElement;
@@ -38,10 +37,9 @@
3837
import consulo.util.lang.ObjectUtil;
3938
import consulo.util.lang.StringUtil;
4039
import consulo.virtualFileSystem.VirtualFile;
41-
import org.jetbrains.annotations.Contract;
42-
4340
import jakarta.annotation.Nonnull;
4441
import jakarta.annotation.Nullable;
42+
import org.jetbrains.annotations.Contract;
4543

4644
import java.util.*;
4745

@@ -175,7 +173,7 @@ private boolean hasStringConstructor(PsiClass aClass) {
175173
for (PsiMethod method : aClass.getConstructors()) {
176174
PsiParameterList list = method.getParameterList();
177175
if (list.getParametersCount() == 1 &&
178-
list.getParameters()[0].getType().equalsToText(JavaClassNames.JAVA_LANG_STRING)) {
176+
list.getParameters()[0].getType().equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
179177
return true;
180178
}
181179
}
@@ -329,8 +327,8 @@ private boolean isNullableNotNullCollectionConflict(
329327
}
330328

331329
for (int i = 0; i <= 1; i++) {
332-
PsiType expectedArg = PsiUtil.substituteTypeParameter(expectedType, JavaClassNames.JAVA_UTIL_MAP, i, false);
333-
PsiType assignedArg = PsiUtil.substituteTypeParameter(assignedType, JavaClassNames.JAVA_UTIL_MAP, i, false);
330+
PsiType expectedArg = PsiUtil.substituteTypeParameter(expectedType, CommonClassNames.JAVA_UTIL_MAP, i, false);
331+
PsiType assignedArg = PsiUtil.substituteTypeParameter(assignedType, CommonClassNames.JAVA_UTIL_MAP, i, false);
334332
if (isNullityConflict(expectedArg, assignedArg)
335333
|| expectedArg != null && assignedArg != null
336334
&& isNullableNotNullCollectionConflict(expectedArg, assignedArg, visited)) {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
import com.intellij.java.language.psi.util.MethodSignatureUtil;
2222
import com.intellij.java.language.psi.util.PsiUtil;
2323
import com.siyeh.HardcodedMethodConstants;
24-
import consulo.java.language.module.util.JavaClassNames;
2524
import consulo.language.psi.PsiElement;
2625
import consulo.language.psi.scope.GlobalSearchScope;
2726
import consulo.language.psi.util.PsiTreeUtil;
2827
import consulo.util.collection.ArrayUtil;
29-
import org.jetbrains.annotations.NonNls;
30-
3128
import jakarta.annotation.Nonnull;
3229
import jakarta.annotation.Nullable;
30+
import org.jetbrains.annotations.NonNls;
31+
3332
import java.util.HashSet;
3433
import java.util.Set;
3534
import java.util.regex.Matcher;
@@ -209,7 +208,7 @@ public static boolean isCallToRegexMethod(PsiMethodCallExpression expression) {
209208
return false;
210209
}
211210
final String className = containingClass.getQualifiedName();
212-
return JavaClassNames.JAVA_LANG_STRING.equals(className) || "java.util.regex.Pattern".equals(className);
211+
return CommonClassNames.JAVA_LANG_STRING.equals(className) || "java.util.regex.Pattern".equals(className);
213212
}
214213

215214
public static boolean isCallDuringObjectConstruction(PsiMethodCallExpression expression) {
@@ -389,7 +388,7 @@ public static boolean callWithNonConstantString(@Nonnull PsiMethodCallExpression
389388
return false;
390389
}
391390
final PsiType type = argument.getType();
392-
if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) {
391+
if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
393392
return false;
394393
}
395394
if (considerStaticFinalConstant && argument instanceof PsiReferenceExpression) {

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@
2525
import com.intellij.java.language.psi.util.PsiUtil;
2626
import com.siyeh.HardcodedMethodConstants;
2727
import consulo.application.util.query.Query;
28-
import consulo.java.language.module.util.JavaClassNames;
2928
import consulo.language.psi.PsiElement;
3029
import consulo.language.util.IncorrectOperationException;
3130
import consulo.project.Project;
31+
import jakarta.annotation.Nonnull;
32+
import jakarta.annotation.Nullable;
3233
import one.util.streamex.StreamEx;
3334
import org.jetbrains.annotations.Contract;
3435
import org.jetbrains.annotations.NonNls;
3536

36-
import jakarta.annotation.Nonnull;
37-
import jakarta.annotation.Nullable;
3837
import java.util.List;
3938
import java.util.regex.Matcher;
4039
import java.util.regex.Pattern;
@@ -46,13 +45,13 @@ private MethodUtils() {
4645

4746
@Contract("null -> false")
4847
public static boolean isComparatorCompare(@Nullable PsiMethod method) {
49-
return method != null && methodMatches(method, JavaClassNames.JAVA_UTIL_COMPARATOR, PsiType.INT, "compare", null, null);
48+
return method != null && methodMatches(method, CommonClassNames.JAVA_UTIL_COMPARATOR, PsiType.INT, "compare", null, null);
5049
}
5150

5251
@Contract("null -> false")
5352
public static boolean isCompareTo(@Nullable PsiMethod method) {
5453
return method != null && methodMatches(method, null, PsiType.INT, HardcodedMethodConstants.COMPARE_TO, PsiType.NULL) && InheritanceUtil.isInheritor(method.getContainingClass(),
55-
JavaClassNames.JAVA_LANG_COMPARABLE);
54+
CommonClassNames.JAVA_LANG_COMPARABLE);
5655
}
5756

5857
@Contract("null -> false")
@@ -61,7 +60,7 @@ public static boolean isCompareToIgnoreCase(@Nullable PsiMethod method) {
6160
return false;
6261
}
6362
final PsiClassType stringType = TypeUtils.getStringType(method);
64-
return methodMatches(method, JavaClassNames.JAVA_LANG_STRING, PsiType.INT, "compareToIgnoreCase", stringType);
63+
return methodMatches(method, CommonClassNames.JAVA_LANG_STRING, PsiType.INT, "compareToIgnoreCase", stringType);
6564
}
6665

6766
@Contract("null -> false")
@@ -98,7 +97,7 @@ public static boolean isEqualsIgnoreCase(@Nullable PsiMethod method) {
9897
return false;
9998
}
10099
final PsiClassType stringType = TypeUtils.getStringType(method);
101-
return methodMatches(method, JavaClassNames.JAVA_LANG_STRING, PsiType.BOOLEAN, HardcodedMethodConstants.EQUALS_IGNORE_CASE, stringType);
100+
return methodMatches(method, CommonClassNames.JAVA_LANG_STRING, PsiType.BOOLEAN, HardcodedMethodConstants.EQUALS_IGNORE_CASE, stringType);
102101
}
103102

104103
/**
@@ -424,6 +423,6 @@ public static boolean isStringLength(@Nullable PsiMethod method) {
424423
return false;
425424
}
426425
PsiClass aClass = method.getContainingClass();
427-
return aClass != null && JavaClassNames.JAVA_LANG_STRING.equals(aClass.getQualifiedName());
426+
return aClass != null && CommonClassNames.JAVA_LANG_STRING.equals(aClass.getQualifiedName());
428427
}
429428
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
package com.siyeh.ig.psiutils;
1717

1818
import com.intellij.java.language.psi.*;
19-
import consulo.java.language.module.util.JavaClassNames;
2019
import consulo.language.ast.IElementType;
2120
import consulo.language.psi.PsiElement;
2221
import consulo.language.psi.util.PsiTreeUtil;
22+
import jakarta.annotation.Nonnull;
2323
import jakarta.annotation.Nullable;
2424
import org.jetbrains.annotations.Contract;
2525

26-
import jakarta.annotation.Nonnull;
27-
2826
import java.util.HashMap;
2927
import java.util.Map;
3028

@@ -488,7 +486,7 @@ public static boolean areParenthesesNeeded(PsiExpression expression, PsiExpressi
488486
if (!parentType.equals(childType)) {
489487
return true;
490488
}
491-
if (childType.equalsToText(JavaClassNames.JAVA_LANG_STRING) && !PsiTreeUtil.isAncestor(parentPolyadicExpression.getOperands()[0], childPolyadicExpression, true)) {
489+
if (childType.equalsToText(CommonClassNames.JAVA_LANG_STRING) && !PsiTreeUtil.isAncestor(parentPolyadicExpression.getOperands()[0], childPolyadicExpression, true)) {
492490
final PsiExpression[] operands = childPolyadicExpression.getOperands();
493491
for (PsiExpression operand : operands) {
494492
if (!childType.equals(operand.getType())) {

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.intellij.java.debugger.impl.ui.tree.render.*;
3434
import com.intellij.java.debugger.localize.JavaDebuggerLocalize;
3535
import com.intellij.java.language.impl.JavaFileType;
36+
import com.intellij.java.language.psi.CommonClassNames;
3637
import consulo.annotation.component.ComponentScope;
3738
import consulo.annotation.component.ServiceAPI;
3839
import consulo.annotation.component.ServiceImpl;
@@ -42,7 +43,6 @@
4243
import consulo.disposer.Disposable;
4344
import consulo.ide.ServiceManager;
4445
import consulo.internal.com.sun.jdi.Value;
45-
import consulo.java.language.module.util.JavaClassNames;
4646
import consulo.language.psi.PsiElement;
4747
import consulo.language.util.IncorrectOperationException;
4848
import consulo.localize.LocalizeValue;
@@ -86,7 +86,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
8686
private final NodeRenderer[] myAlternateCollectionRenderers = new NodeRenderer[]{
8787
createCompoundReferenceRenderer(
8888
"Map",
89-
JavaClassNames.JAVA_UTIL_MAP,
89+
CommonClassNames.JAVA_UTIL_MAP,
9090
createLabelRenderer(" size = ", "size()", null),
9191
createExpressionChildrenRenderer(
9292
"entrySet().toArray()",
@@ -111,7 +111,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
111111
new ListObjectRenderer(this),
112112
createCompoundReferenceRenderer(
113113
"Collection",
114-
JavaClassNames.JAVA_UTIL_COLLECTION,
114+
CommonClassNames.JAVA_UTIL_COLLECTION,
115115
createLabelRenderer(" size = ", "size()", null),
116116
createExpressionChildrenRenderer("toArray()", "!isEmpty()")
117117
)
@@ -347,10 +347,10 @@ else if (rendererId.equals(ToStringRenderer.UNIQUE_ID)) {
347347
return myToStringRenderer;
348348
}
349349
else if (rendererId.equals(CompoundNodeRenderer.UNIQUE_ID) || rendererId.equals(REFERENCE_RENDERER)) {
350-
return createCompoundReferenceRenderer("unnamed", JavaClassNames.JAVA_LANG_OBJECT, null, null);
350+
return createCompoundReferenceRenderer("unnamed", CommonClassNames.JAVA_LANG_OBJECT, null, null);
351351
}
352352
else if (rendererId.equals(CompoundTypeRenderer.UNIQUE_ID)) {
353-
return createCompoundTypeRenderer("unnamed", JavaClassNames.JAVA_LANG_OBJECT, null, null);
353+
return createCompoundTypeRenderer("unnamed", CommonClassNames.JAVA_LANG_OBJECT, null, null);
354354
}
355355
return null;
356356
}
@@ -559,7 +559,7 @@ public ListObjectRenderer(NodeRendererSettings rendererSettings) {
559559
createLabelRenderer(" size = ", "size()", null),
560560
createExpressionChildrenRenderer("toArray()", "!isEmpty()")
561561
);
562-
setClassName(JavaClassNames.JAVA_UTIL_LIST);
562+
setClassName(CommonClassNames.JAVA_UTIL_LIST);
563563
}
564564

565565
@Override

‎java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyFactoryImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import com.intellij.java.execution.runners.ProcessProxyFactory;
2121
import com.intellij.java.language.impl.projectRoots.ex.JavaSdkUtil;
2222
import com.intellij.java.language.projectRoots.JavaSdkVersion;
23+
import com.intellij.java.language.psi.CommonClassNames;
2324
import consulo.annotation.component.ServiceImpl;
2425
import consulo.container.plugin.PluginManager;
2526
import consulo.java.execution.configurations.OwnJavaParameters;
26-
import consulo.java.language.module.util.JavaClassNames;
2727
import consulo.java.rt.JavaRtClassNames;
2828
import consulo.java.rt.execution.application.AppMainV2Constants;
2929
import consulo.logging.Logger;
@@ -54,7 +54,7 @@ public ProcessProxy createCommandLineProxy(JavaCommandLine javaCmdLine) throws E
5454
try {
5555
ProcessProxyImpl proxy = new ProcessProxyImpl(StringUtil.getShortName(mainClass));
5656
String port = String.valueOf(proxy.getPortNumber());
57-
String binPath = new File(PluginManager.getPluginPath(JavaClassNames.class), "breakgen").getPath();
57+
String binPath = new File(PluginManager.getPluginPath(CommonClassNames.class), "breakgen").getPath();
5858

5959
if (runtimeJarFile && JavaSdkUtil.isJdkAtLeast(javaParameters.getJdk(), JavaSdkVersion.JDK_1_5)) {
6060
javaParameters.getVMParametersList().add("-javaagent:" + rtJarPath + '=' + port + ':' + binPath);

‎java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
package com.intellij.java.execution.impl.runners;
33

44
import com.intellij.java.execution.runners.ProcessProxy;
5+
import com.intellij.java.language.psi.CommonClassNames;
56
import consulo.container.plugin.PluginManager;
6-
import consulo.java.language.module.util.JavaClassNames;
77
import consulo.logging.Logger;
88
import consulo.platform.Platform;
99
import consulo.process.ProcessHandler;
@@ -90,7 +90,7 @@ public boolean canSendBreak() {
9090
return false;
9191
}
9292
}
93-
return new File(PluginManager.getPluginPath(JavaClassNames.class), "breakgen/breakgen.dll").exists();
93+
return new File(PluginManager.getPluginPath(CommonClassNames.class), "breakgen/breakgen.dll").exists();
9494
}
9595

9696
synchronized (myLock) {

‎java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java‎

Lines changed: 2 additions & 3 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.PsiFormatUtil;
2020
import consulo.java.impl.intelliLang.JavaLanguageInjectionSupport;
21-
import consulo.java.language.module.util.JavaClassNames;
2221
import consulo.language.inject.advanced.BaseInjection;
2322
import consulo.language.inject.advanced.InjectionPlace;
2423
import consulo.language.inject.advanced.pattern.PatternCompiler;
@@ -220,10 +219,10 @@ public static boolean isInjectable(@Nullable final PsiType type, final Project p
220219
if (project.isDefault()) {
221220
@NonNls final String text = type.getPresentableText();
222221
if (text == null) return false;
223-
return text.equals(JavaClassNames.JAVA_LANG_STRING) || text.equals("java.lang.String...") || text.equals("java.lang.String[]");
222+
return text.equals(CommonClassNames.JAVA_LANG_STRING) || text.equals("java.lang.String...") || text.equals("java.lang.String[]");
224223
}
225224
else {
226-
return type.equalsToText(JavaClassNames.JAVA_LANG_STRING) || type.equalsToText("java.lang.String...") || type.equalsToText("java.lang.String[]");
225+
return type.equalsToText(CommonClassNames.JAVA_LANG_STRING) || type.equalsToText("java.lang.String...") || type.equalsToText("java.lang.String[]");
227226
}
228227
}
229228

‎java-language-api/src/main/java/com/intellij/java/language/psi/PsiClassType.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.intellij.java.language.jvm.types.JvmType;
2323
import com.intellij.java.language.jvm.types.JvmTypeResolveResult;
2424
import com.intellij.java.language.psi.util.PsiUtil;
25-
import consulo.java.language.module.util.JavaClassNames;
2625
import consulo.language.psi.PsiElement;
2726
import consulo.language.psi.scope.GlobalSearchScope;
2827
import consulo.util.collection.ArrayFactory;
@@ -95,8 +94,8 @@ public boolean equals(Object obj) {
9594
if (this == obj) return true;
9695
if (!(obj instanceof PsiClassType)) {
9796
return obj instanceof PsiCapturedWildcardType &&
98-
((PsiCapturedWildcardType)obj).getLowerBound().equalsToText(JavaClassNames.JAVA_LANG_OBJECT) &&
99-
equalsToText(JavaClassNames.JAVA_LANG_OBJECT);
97+
((PsiCapturedWildcardType)obj).getLowerBound().equalsToText(CommonClassNames.JAVA_LANG_OBJECT) &&
98+
equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
10099
}
101100
PsiClassType otherClassType = (PsiClassType)obj;
102101

0 commit comments

Comments
 (0)