Skip to content

Commit 396182f

Browse files
unv-unvunv-unv
authored
Replacing JavaClassNames with CommonClassNames (part 5). (#178)
1 parent d71ded4 commit 396182f

50 files changed

Lines changed: 142 additions & 195 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/daemon/impl/analysis/JavaHighlightUtil.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@
2020
import com.intellij.java.language.psi.util.PsiFormatUtilBase;
2121
import com.intellij.java.language.psi.util.TypeConversionUtil;
2222
import com.intellij.java.language.util.JavaPsiConstructorUtil;
23-
import consulo.java.language.module.util.JavaClassNames;
2423
import consulo.language.psi.PsiManager;
2524
import consulo.util.lang.ObjectUtil;
26-
import org.jetbrains.annotations.NonNls;
27-
2825
import jakarta.annotation.Nonnull;
2926
import jakarta.annotation.Nullable;
27+
import org.jetbrains.annotations.NonNls;
28+
3029
import java.util.ArrayList;
3130
import java.util.Collections;
3231
import java.util.List;
@@ -35,7 +34,7 @@ public class JavaHighlightUtil {
3534
public static boolean isSerializable(@Nonnull PsiClass aClass) {
3635
PsiManager manager = aClass.getManager();
3736
PsiClass serializableClass = JavaPsiFacade.getInstance(manager.getProject())
38-
.findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, aClass.getResolveScope());
37+
.findClass(CommonClassNames.JAVA_IO_SERIALIZABLE, aClass.getResolveScope());
3938
return serializableClass != null && aClass.isInheritor(serializableClass, true);
4039
}
4140

@@ -61,20 +60,20 @@ public static boolean isSerializationRelatedMethod(PsiMethod method, PsiClass co
6160
if ("readResolve".equals(name)) {
6261
return parameters.length == 0
6362
&& returnType != null
64-
&& returnType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)
65-
&& (containingClass.hasModifierProperty(PsiModifier.ABSTRACT) || isSerializable(containingClass));
63+
&& returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)
64+
&& (containingClass.isAbstract() || isSerializable(containingClass));
6665
}
6766
if ("writeReplace".equals(name)) {
6867
return parameters.length == 0
6968
&& returnType != null
70-
&& returnType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)
71-
&& (containingClass.hasModifierProperty(PsiModifier.ABSTRACT) || isSerializable(containingClass));
69+
&& returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)
70+
&& (containingClass.isAbstract() || isSerializable(containingClass));
7271
}
7372
if ("writeObject".equals(name)) {
7473
return parameters.length == 1
7574
&& TypeConversionUtil.isVoidType(returnType)
7675
&& parameters[0].getType().equalsToText("java.io.ObjectOutputStream")
77-
&& method.hasModifierProperty(PsiModifier.PRIVATE)
76+
&& method.isPrivate()
7877
&& isSerializable(containingClass);
7978
}
8079
return false;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import consulo.application.util.function.Computable;
2828
import consulo.content.bundle.Sdk;
2929
import consulo.java.language.module.extension.JavaModuleExtension;
30-
import consulo.java.language.module.util.JavaClassNames;
3130
import consulo.language.editor.DaemonCodeAnalyzerSettings;
3231
import consulo.language.editor.inspection.SuppressionUtil;
3332
import consulo.language.psi.PsiComment;
@@ -40,9 +39,9 @@
4039
import consulo.module.Module;
4140
import consulo.project.Project;
4241
import consulo.util.lang.StringUtil;
43-
4442
import jakarta.annotation.Nonnull;
4543
import jakarta.annotation.Nullable;
44+
4645
import java.util.ArrayList;
4746
import java.util.Collection;
4847
import java.util.Collections;
@@ -128,7 +127,7 @@ public static PsiElement getElementMemberSuppressedIn(@Nonnull PsiDocCommentOwne
128127
}
129128

130129
public static PsiElement getAnnotationMemberSuppressedIn(@Nonnull PsiModifierListOwner owner, String inspectionToolID) {
131-
final PsiAnnotation generatedAnnotation = AnnotationUtil.findAnnotation(owner, JavaClassNames.JAVAX_ANNOTATION_GENERATED);
130+
final PsiAnnotation generatedAnnotation = AnnotationUtil.findAnnotation(owner, CommonClassNames.JAVAX_ANNOTATION_GENERATED);
132131
if (generatedAnnotation != null) return generatedAnnotation;
133132
PsiModifierList modifierList = owner.getModifierList();
134133
Collection<String> suppressedIds = getInspectionIdsSuppressedInAnnotation(modifierList);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
import com.intellij.java.analysis.impl.codeInspection.dataFlow.SpecialField;
88
import com.intellij.java.analysis.impl.codeInspection.dataFlow.types.DfTypes;
99
import com.intellij.java.language.codeInsight.Nullability;
10+
import com.intellij.java.language.psi.CommonClassNames;
1011
import com.intellij.java.language.psi.PsiExpression;
1112
import com.intellij.java.language.psi.PsiMethodCallExpression;
1213
import com.intellij.java.language.psi.PsiType;
1314
import com.siyeh.ig.callMatcher.CallMatcher;
1415
import com.siyeh.ig.psiutils.ExpectedTypeUtils;
15-
import consulo.java.language.module.util.JavaClassNames;
1616
import jakarta.annotation.Nonnull;
1717

1818
import java.util.Objects;
1919

2020
public class MapUpdateInliner implements CallInliner {
2121
private static final CallMatcher MAP_COMPUTE =
22-
CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "computeIfAbsent", "computeIfPresent", "compute")
22+
CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "computeIfAbsent", "computeIfPresent", "compute")
2323
.parameterCount(2);
2424
private static final CallMatcher MAP_MERGE =
25-
CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "merge").parameterCount(3);
25+
CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "merge").parameterCount(3);
2626

2727
@Override
2828
public boolean tryInlineCall(@Nonnull CFGBuilder builder, @Nonnull PsiMethodCallExpression call) {

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceUtil.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import consulo.application.util.RecursionGuard;
1515
import consulo.application.util.RecursionManager;
1616
import consulo.component.util.Iconable;
17-
import consulo.java.language.module.util.JavaClassNames;
1817
import consulo.language.editor.completion.lookup.*;
1918
import consulo.language.icon.IconDescriptorUpdaters;
2019
import consulo.language.psi.PsiElement;
@@ -29,10 +28,9 @@
2928
import consulo.util.collection.ContainerUtil;
3029
import consulo.util.lang.ObjectUtil;
3130
import consulo.util.lang.Pair;
32-
import org.jetbrains.annotations.Contract;
33-
3431
import jakarta.annotation.Nonnull;
3532
import jakarta.annotation.Nullable;
33+
import org.jetbrains.annotations.Contract;
3634

3735
import java.util.*;
3836
import java.util.function.Function;
@@ -202,14 +200,14 @@ private static ReflectiveType getClassInstanceType(@Nullable PsiExpression expre
202200
PsiMethod method = methodCall.resolveMethod();
203201
if (method != null) {
204202
PsiExpression[] arguments = methodCall.getArgumentList().getExpressions();
205-
if (arguments.length == 0 && isClassWithName(method.getContainingClass(), JavaClassNames.JAVA_LANG_CLASS)) {
203+
if (arguments.length == 0 && isClassWithName(method.getContainingClass(), CommonClassNames.JAVA_LANG_CLASS)) {
206204
PsiExpression qualifier = methodCall.getMethodExpression().getQualifierExpression();
207205
if (qualifier != null) {
208206
return ourGuard.doPreventingRecursion(qualifier, false, () -> getReflectiveType(qualifier));
209207
}
210208
}
211209
else if (arguments.length > 1
212-
&& isClassWithName(method.getContainingClass(), JavaClassNames.JAVA_LANG_REFLECT_ARRAY)) {
210+
&& isClassWithName(method.getContainingClass(), CommonClassNames.JAVA_LANG_REFLECT_ARRAY)) {
213211
PsiExpression typeExpression = arguments[0];
214212
if (typeExpression != null) {
215213
ReflectiveType itemType =
@@ -324,12 +322,12 @@ private static PsiClass findClass(@Nonnull String qualifiedName, @Nonnull PsiEle
324322

325323
@Contract("null -> false")
326324
public static boolean isJavaLangClass(@Nullable PsiClass aClass) {
327-
return isClassWithName(aClass, JavaClassNames.JAVA_LANG_CLASS);
325+
return isClassWithName(aClass, CommonClassNames.JAVA_LANG_CLASS);
328326
}
329327

330328
@Contract("null -> false")
331329
public static boolean isJavaLangObject(@Nullable PsiClass aClass) {
332-
return isClassWithName(aClass, JavaClassNames.JAVA_LANG_OBJECT);
330+
return isClassWithName(aClass, CommonClassNames.JAVA_LANG_OBJECT);
333331
}
334332

335333
@Contract("null, _ -> false")
@@ -575,13 +573,13 @@ private static ReflectiveSignature composeGenericMethodSignature(@Nonnull PsiExp
575573
boolean finalArray = signature.getSecond();
576574

577575
List<String> typeNames = new ArrayList<>();
578-
typeNames.add(JavaClassNames.JAVA_LANG_OBJECT); // return type
576+
typeNames.add(CommonClassNames.JAVA_LANG_OBJECT); // return type
579577

580578
for (int i = 0; i < objectArgCount; i++) {
581-
typeNames.add(JavaClassNames.JAVA_LANG_OBJECT);
579+
typeNames.add(CommonClassNames.JAVA_LANG_OBJECT);
582580
}
583581
if (finalArray) {
584-
typeNames.add(JavaClassNames.JAVA_LANG_OBJECT + "[]");
582+
typeNames.add(CommonClassNames.JAVA_LANG_OBJECT + "[]");
585583
}
586584
return ReflectiveSignature.create(typeNames);
587585
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public final class JavaDeprecationUtils {
2020
@Nonnull
2121
@RequiredReadAction
2222
private static ThreeState isDeprecatedByAnnotation(@Nonnull PsiModifierListOwner owner, @Nullable PsiElement context) {
23-
PsiAnnotation annotation = AnnotationUtil.findAnnotation(owner, JavaClassNames.JAVA_LANG_DEPRECATED);
23+
PsiAnnotation annotation = AnnotationUtil.findAnnotation(owner, CommonClassNames.JAVA_LANG_DEPRECATED);
2424
if (annotation == null) {
2525
return ThreeState.UNSURE;
2626
}

‎java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import consulo.application.ApplicationManager;
2929
import consulo.application.util.function.Computable;
3030
import consulo.compiler.CacheCorruptedException;
31-
import consulo.java.language.module.util.JavaClassNames;
3231
import consulo.language.psi.PsiManager;
3332
import consulo.language.psi.scope.GlobalSearchScope;
3433
import consulo.language.util.IncorrectOperationException;
@@ -104,7 +103,7 @@ public JavaDependencyProcessor(Project project, JavaDependencyCache javaDependen
104103
newClassesCache.getGenericSignature(qName));
105104

106105
boolean superclassesDiffer = cache.getSuperQualifiedName(qName) != newClassesCache.getSuperQualifiedName(qName);
107-
boolean wasDerivedFromObject = JavaClassNames.JAVA_LANG_OBJECT.equals(javaDependencyCache.resolve(cache.getSuperQualifiedName(qName)));
106+
boolean wasDerivedFromObject = CommonClassNames.JAVA_LANG_OBJECT.equals(javaDependencyCache.resolve(cache.getSuperQualifiedName(qName)));
108107
mySuperClassChanged = !wasDerivedFromObject && superclassesDiffer;
109108
mySuperClassAdded = wasDerivedFromObject && superclassesDiffer;
110109
}
@@ -482,8 +481,8 @@ private boolean hasAnnotationSemanticsChanged(final Cache oldCache, final Cache
482481
final IntObjectMap<AnnotationConstantValue> oldAnnotations = fetchAllAnnotations(oldCache);
483482
final IntObjectMap<AnnotationConstantValue> newAnnotations = fetchAllAnnotations(newCache);
484483
// filter certain known annotation which are processed separately
485-
final int retentionAnnotation = myJavaDependencyCache.getSymbolTable().getId(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION);
486-
final int targetAnnotation = myJavaDependencyCache.getSymbolTable().getId(JavaClassNames.JAVA_LANG_ANNOTATION_TARGET);
484+
final int retentionAnnotation = myJavaDependencyCache.getSymbolTable().getId(CommonClassNames.JAVA_LANG_ANNOTATION_RETENTION);
485+
final int targetAnnotation = myJavaDependencyCache.getSymbolTable().getId(CommonClassNames.JAVA_LANG_ANNOTATION_TARGET);
487486
oldAnnotations.remove(retentionAnnotation);
488487
oldAnnotations.remove(targetAnnotation);
489488
newAnnotations.remove(retentionAnnotation);
@@ -968,7 +967,7 @@ private boolean hasUnimplementedAbstractMethods(int superQName, final Set method
968967
hasBaseAbstractMethodsInHierarchy(superQName, methodsToCheck);
969968
} else {
970969
final String qName = myJavaDependencyCache.resolve(superQName);
971-
if (!JavaClassNames.JAVA_LANG_OBJECT.equals(qName)) {
970+
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) {
972971
if (hasBaseAbstractMethods2(qName, methodsToCheck)) {
973972
return true;
974973
}

‎java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323

2424
import com.intellij.java.compiler.impl.classParsing.*;
2525
import com.intellij.java.compiler.impl.util.cls.ClsUtil;
26+
import com.intellij.java.language.psi.CommonClassNames;
2627
import consulo.application.util.function.Computable;
2728
import consulo.compiler.CacheCorruptedException;
2829
import consulo.compiler.ModuleCompilerPathsManager;
2930
import consulo.compiler.util.MakeUtil;
3031
import consulo.internal.org.objectweb.asm.Opcodes;
31-
import consulo.java.language.module.util.JavaClassNames;
3232
import consulo.language.content.ProductionContentFolderTypeProvider;
3333
import consulo.logging.Logger;
3434
import consulo.module.Module;
@@ -178,7 +178,7 @@ public static int getAnnotationTargets(final Cache cache,
178178
final int annotationQName,
179179
final SymbolTable symbolTable) throws CacheCorruptedException {
180180
final AnnotationConstantValue
181-
targetAnnotation = findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_TARGET, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable);
181+
targetAnnotation = findAnnotation(CommonClassNames.JAVA_LANG_ANNOTATION_TARGET, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable);
182182
if (targetAnnotation == null) {
183183
return AnnotationTargets.ALL; // all program elements are annotation targets by default
184184
}
@@ -224,7 +224,7 @@ public static int getAnnotationRetentionPolicy(
224224
final SymbolTable symbolTable
225225
) throws CacheCorruptedException {
226226
final AnnotationConstantValue retentionPolicyAnnotation =
227-
findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable);
227+
findAnnotation(CommonClassNames.JAVA_LANG_ANNOTATION_RETENTION, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable);
228228
if (retentionPolicyAnnotation == null) {
229229
return RetentionPolicies.CLASS; // default retention policy
230230
}

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValue.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.intellij.java.debugger.impl.ui.tree.ValueDescriptor;
3636
import com.intellij.java.debugger.impl.ui.tree.render.*;
3737
import com.intellij.java.debugger.ui.tree.NodeDescriptor;
38+
import com.intellij.java.language.psi.CommonClassNames;
3839
import com.intellij.java.language.psi.util.TypeConversionUtil;
3940
import consulo.application.Application;
4041
import consulo.application.ApplicationManager;
@@ -50,7 +51,6 @@
5051
import consulo.internal.com.sun.jdi.ArrayReference;
5152
import consulo.internal.com.sun.jdi.ArrayType;
5253
import consulo.internal.com.sun.jdi.Value;
53-
import consulo.java.language.module.util.JavaClassNames;
5454
import consulo.language.psi.PsiElement;
5555
import consulo.logging.Logger;
5656
import consulo.project.Project;
@@ -302,9 +302,9 @@ public void renderValue(@Nonnull XValuePresentation.XValueTextRenderer renderer,
302302
final ArrayType type = (ArrayType) container.getDescriptor().getType();
303303
if (type != null) {
304304
final String typeName = type.componentTypeName();
305-
if (TypeConversionUtil.isPrimitive(typeName) || JavaClassNames.JAVA_LANG_STRING.equals(typeName)) {
305+
if (TypeConversionUtil.isPrimitive(typeName) || CommonClassNames.JAVA_LANG_STRING.equals(typeName)) {
306306
int size = value.length();
307-
int max = Math.min(size, JavaClassNames.JAVA_LANG_STRING.equals(typeName) ? 5 : 10);
307+
int max = Math.min(size, CommonClassNames.JAVA_LANG_STRING.equals(typeName) ? 5 : 10);
308308
//TODO [eu]: this is a quick fix for IDEA-136606, need to move this away from EDT!!!
309309
final List<Value> values = value.getValues(0, max);
310310
int i = 0;

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.intellij.java.debugger.impl.HelpID;
2020
import com.intellij.java.debugger.impl.breakpoints.properties.JavaExceptionBreakpointProperties;
2121
import com.intellij.java.debugger.impl.engine.JVMNameUtil;
22+
import com.intellij.java.language.psi.CommonClassNames;
2223
import com.intellij.java.language.psi.JavaPsiFacade;
2324
import com.intellij.java.language.psi.PsiClass;
2425
import com.intellij.java.language.psi.PsiClassOwner;
@@ -30,7 +31,6 @@
3031
import consulo.execution.debug.breakpoint.XBreakpoint;
3132
import consulo.execution.debug.breakpoint.ui.XBreakpointCustomPropertiesPanel;
3233
import consulo.execution.debug.icon.ExecutionDebugIconGroup;
33-
import consulo.java.language.module.util.JavaClassNames;
3434
import consulo.language.psi.scope.GlobalSearchScope;
3535
import consulo.project.Project;
3636
import consulo.ui.image.Image;
@@ -111,7 +111,7 @@ public XBreakpoint<JavaExceptionBreakpointProperties> createDefaultBreakpoint(@N
111111
@Override
112112
public XBreakpoint<JavaExceptionBreakpointProperties> addBreakpoint(final Project project, JComponent parentComponent) {
113113
final PsiClass throwableClass =
114-
JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_THROWABLE, GlobalSearchScope.allScope(project));
114+
JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_THROWABLE, GlobalSearchScope.allScope(project));
115115
TreeClassChooser chooser =
116116
TreeClassChooserFactory.getInstance(project).createInheritanceClassChooser(
117117
DebuggerBundle.message("add.exception.breakpoint.classchooser.title"),

‎java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaClassInheritorsSearcher.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.intellij.java.indexing.search.searches.ClassInheritorsSearch;
2020
import com.intellij.java.indexing.search.searches.ClassInheritorsSearchExecutor;
2121
import com.intellij.java.indexing.search.searches.DirectClassInheritorsSearch;
22+
import com.intellij.java.language.psi.CommonClassNames;
2223
import com.intellij.java.language.psi.PsiAnonymousClass;
2324
import com.intellij.java.language.psi.PsiClass;
2425
import consulo.annotation.access.RequiredReadAction;
@@ -29,7 +30,6 @@
2930
import consulo.application.progress.ProgressManager;
3031
import consulo.application.util.ReadActionProcessor;
3132
import consulo.content.scope.SearchScope;
32-
import consulo.java.language.module.util.JavaClassNames;
3333
import consulo.language.impl.psi.PsiAnchor;
3434
import consulo.language.psi.PsiBundle;
3535
import consulo.language.psi.PsiUtilCore;
@@ -164,7 +164,7 @@ public boolean processInReadAction(PsiClass candidate) {
164164

165165
private static boolean isJavaLangObject(Application application, @Nonnull PsiClass baseClass) {
166166
return application.runReadAction(
167-
(Supplier<Boolean>)() -> baseClass.isValid() && JavaClassNames.JAVA_LANG_OBJECT.equals(baseClass.getQualifiedName())
167+
(Supplier<Boolean>)() -> baseClass.isValid() && CommonClassNames.JAVA_LANG_OBJECT.equals(baseClass.getQualifiedName())
168168
);
169169
}
170170

0 commit comments

Comments
 (0)