Skip to content

Replacing JavaClassNames with CommonClassNames (part 5) #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
May 10, 2025
Merged

Replacing JavaClassNames with CommonClassNames (part 5) #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ...a/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@
import com.intellij.java.language.psi.util.PsiFormatUtilBase;
import com.intellij.java.language.psi.util.TypeConversionUtil;
import com.intellij.java.language.util.JavaPsiConstructorUtil;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiManager;
import consulo.util.lang.ObjectUtil;
import org.jetbrains.annotations.NonNls;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import org.jetbrains.annotations.NonNls;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand All @@ -35,7 +34,7 @@ public class JavaHighlightUtil {
public static boolean isSerializable(@Nonnull PsiClass aClass) {
PsiManager manager = aClass.getManager();
PsiClass serializableClass = JavaPsiFacade.getInstance(manager.getProject())
.findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, aClass.getResolveScope());
.findClass(CommonClassNames.JAVA_IO_SERIALIZABLE, aClass.getResolveScope());
return serializableClass != null && aClass.isInheritor(serializableClass, true);
}

Expand All @@ -61,20 +60,20 @@ public static boolean isSerializationRelatedMethod(PsiMethod method, PsiClass co
if ("readResolve".equals(name)) {
return parameters.length == 0
&& returnType != null
&& returnType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)
&& (containingClass.hasModifierProperty(PsiModifier.ABSTRACT) || isSerializable(containingClass));
&& returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)
&& (containingClass.isAbstract() || isSerializable(containingClass));
}
if ("writeReplace".equals(name)) {
return parameters.length == 0
&& returnType != null
&& returnType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)
&& (containingClass.hasModifierProperty(PsiModifier.ABSTRACT) || isSerializable(containingClass));
&& returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)
&& (containingClass.isAbstract() || isSerializable(containingClass));
}
if ("writeObject".equals(name)) {
return parameters.length == 1
&& TypeConversionUtil.isVoidType(returnType)
&& parameters[0].getType().equalsToText("java.io.ObjectOutputStream")
&& method.hasModifierProperty(PsiModifier.PRIVATE)
&& method.isPrivate()
&& isSerializable(containingClass);
}
return false;
Expand Down
5 changes: 2 additions & 3 deletions ...mpl/src/main/java/com/intellij/java/analysis/impl/codeInspection/JavaSuppressionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import consulo.application.util.function.Computable;
import consulo.content.bundle.Sdk;
import consulo.java.language.module.extension.JavaModuleExtension;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.editor.DaemonCodeAnalyzerSettings;
import consulo.language.editor.inspection.SuppressionUtil;
import consulo.language.psi.PsiComment;
Expand All @@ -40,9 +39,9 @@
import consulo.module.Module;
import consulo.project.Project;
import consulo.util.lang.StringUtil;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -128,7 +127,7 @@ public static PsiElement getElementMemberSuppressedIn(@Nonnull PsiDocCommentOwne
}

public static PsiElement getAnnotationMemberSuppressedIn(@Nonnull PsiModifierListOwner owner, String inspectionToolID) {
final PsiAnnotation generatedAnnotation = AnnotationUtil.findAnnotation(owner, JavaClassNames.JAVAX_ANNOTATION_GENERATED);
final PsiAnnotation generatedAnnotation = AnnotationUtil.findAnnotation(owner, CommonClassNames.JAVAX_ANNOTATION_GENERATED);
if (generatedAnnotation != null) return generatedAnnotation;
PsiModifierList modifierList = owner.getModifierList();
Collection<String> suppressedIds = getInspectionIdsSuppressedInAnnotation(modifierList);
Expand Down
6 changes: 3 additions & 3 deletions ...ava/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/MapUpdateInliner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
import com.intellij.java.analysis.impl.codeInspection.dataFlow.SpecialField;
import com.intellij.java.analysis.impl.codeInspection.dataFlow.types.DfTypes;
import com.intellij.java.language.codeInsight.Nullability;
import com.intellij.java.language.psi.CommonClassNames;
import com.intellij.java.language.psi.PsiExpression;
import com.intellij.java.language.psi.PsiMethodCallExpression;
import com.intellij.java.language.psi.PsiType;
import com.siyeh.ig.callMatcher.CallMatcher;
import com.siyeh.ig.psiutils.ExpectedTypeUtils;
import consulo.java.language.module.util.JavaClassNames;
import jakarta.annotation.Nonnull;

import java.util.Objects;

public class MapUpdateInliner implements CallInliner {
private static final CallMatcher MAP_COMPUTE =
CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "computeIfAbsent", "computeIfPresent", "compute")
CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "computeIfAbsent", "computeIfPresent", "compute")
.parameterCount(2);
private static final CallMatcher MAP_MERGE =
CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "merge").parameterCount(3);
CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "merge").parameterCount(3);

@Override
public boolean tryInlineCall(@Nonnull CFGBuilder builder, @Nonnull PsiMethodCallExpression call) {
Expand Down
18 changes: 8 additions & 10 deletions ...ava/analysis/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import consulo.application.util.RecursionGuard;
import consulo.application.util.RecursionManager;
import consulo.component.util.Iconable;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.editor.completion.lookup.*;
import consulo.language.icon.IconDescriptorUpdaters;
import consulo.language.psi.PsiElement;
Expand All @@ -29,10 +28,9 @@
import consulo.util.collection.ContainerUtil;
import consulo.util.lang.ObjectUtil;
import consulo.util.lang.Pair;
import org.jetbrains.annotations.Contract;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import org.jetbrains.annotations.Contract;

import java.util.*;
import java.util.function.Function;
Expand Down Expand Up @@ -202,14 +200,14 @@ private static ReflectiveType getClassInstanceType(@Nullable PsiExpression expre
PsiMethod method = methodCall.resolveMethod();
if (method != null) {
PsiExpression[] arguments = methodCall.getArgumentList().getExpressions();
if (arguments.length == 0 && isClassWithName(method.getContainingClass(), JavaClassNames.JAVA_LANG_CLASS)) {
if (arguments.length == 0 && isClassWithName(method.getContainingClass(), CommonClassNames.JAVA_LANG_CLASS)) {
PsiExpression qualifier = methodCall.getMethodExpression().getQualifierExpression();
if (qualifier != null) {
return ourGuard.doPreventingRecursion(qualifier, false, () -> getReflectiveType(qualifier));
}
}
else if (arguments.length > 1
&& isClassWithName(method.getContainingClass(), JavaClassNames.JAVA_LANG_REFLECT_ARRAY)) {
&& isClassWithName(method.getContainingClass(), CommonClassNames.JAVA_LANG_REFLECT_ARRAY)) {
PsiExpression typeExpression = arguments[0];
if (typeExpression != null) {
ReflectiveType itemType =
Expand Down Expand Up @@ -324,12 +322,12 @@ private static PsiClass findClass(@Nonnull String qualifiedName, @Nonnull PsiEle

@Contract("null -> false")
public static boolean isJavaLangClass(@Nullable PsiClass aClass) {
return isClassWithName(aClass, JavaClassNames.JAVA_LANG_CLASS);
return isClassWithName(aClass, CommonClassNames.JAVA_LANG_CLASS);
}

@Contract("null -> false")
public static boolean isJavaLangObject(@Nullable PsiClass aClass) {
return isClassWithName(aClass, JavaClassNames.JAVA_LANG_OBJECT);
return isClassWithName(aClass, CommonClassNames.JAVA_LANG_OBJECT);
}

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

List<String> typeNames = new ArrayList<>();
typeNames.add(JavaClassNames.JAVA_LANG_OBJECT); // return type
typeNames.add(CommonClassNames.JAVA_LANG_OBJECT); // return type

for (int i = 0; i < objectArgCount; i++) {
typeNames.add(JavaClassNames.JAVA_LANG_OBJECT);
typeNames.add(CommonClassNames.JAVA_LANG_OBJECT);
}
if (finalArray) {
typeNames.add(JavaClassNames.JAVA_LANG_OBJECT + "[]");
typeNames.add(CommonClassNames.JAVA_LANG_OBJECT + "[]");
}
return ReflectiveSignature.create(typeNames);
}
Expand Down
2 changes: 1 addition & 1 deletion java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/JavaDeprecationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public final class JavaDeprecationUtils {
@Nonnull
@RequiredReadAction
private static ThreeState isDeprecatedByAnnotation(@Nonnull PsiModifierListOwner owner, @Nullable PsiElement context) {
PsiAnnotation annotation = AnnotationUtil.findAnnotation(owner, JavaClassNames.JAVA_LANG_DEPRECATED);
PsiAnnotation annotation = AnnotationUtil.findAnnotation(owner, CommonClassNames.JAVA_LANG_DEPRECATED);
if (annotation == null) {
return ThreeState.UNSURE;
}
Expand Down
9 changes: 4 additions & 5 deletions ...ler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import consulo.application.ApplicationManager;
import consulo.application.util.function.Computable;
import consulo.compiler.CacheCorruptedException;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiManager;
import consulo.language.psi.scope.GlobalSearchScope;
import consulo.language.util.IncorrectOperationException;
Expand Down Expand Up @@ -104,7 +103,7 @@ public JavaDependencyProcessor(Project project, JavaDependencyCache javaDependen
newClassesCache.getGenericSignature(qName));

boolean superclassesDiffer = cache.getSuperQualifiedName(qName) != newClassesCache.getSuperQualifiedName(qName);
boolean wasDerivedFromObject = JavaClassNames.JAVA_LANG_OBJECT.equals(javaDependencyCache.resolve(cache.getSuperQualifiedName(qName)));
boolean wasDerivedFromObject = CommonClassNames.JAVA_LANG_OBJECT.equals(javaDependencyCache.resolve(cache.getSuperQualifiedName(qName)));
mySuperClassChanged = !wasDerivedFromObject && superclassesDiffer;
mySuperClassAdded = wasDerivedFromObject && superclassesDiffer;
}
Expand Down Expand Up @@ -482,8 +481,8 @@ private boolean hasAnnotationSemanticsChanged(final Cache oldCache, final Cache
final IntObjectMap<AnnotationConstantValue> oldAnnotations = fetchAllAnnotations(oldCache);
final IntObjectMap<AnnotationConstantValue> newAnnotations = fetchAllAnnotations(newCache);
// filter certain known annotation which are processed separately
final int retentionAnnotation = myJavaDependencyCache.getSymbolTable().getId(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION);
final int targetAnnotation = myJavaDependencyCache.getSymbolTable().getId(JavaClassNames.JAVA_LANG_ANNOTATION_TARGET);
final int retentionAnnotation = myJavaDependencyCache.getSymbolTable().getId(CommonClassNames.JAVA_LANG_ANNOTATION_RETENTION);
final int targetAnnotation = myJavaDependencyCache.getSymbolTable().getId(CommonClassNames.JAVA_LANG_ANNOTATION_TARGET);
oldAnnotations.remove(retentionAnnotation);
oldAnnotations.remove(targetAnnotation);
newAnnotations.remove(retentionAnnotation);
Expand Down Expand Up @@ -968,7 +967,7 @@ private boolean hasUnimplementedAbstractMethods(int superQName, final Set method
hasBaseAbstractMethodsInHierarchy(superQName, methodsToCheck);
} else {
final String qName = myJavaDependencyCache.resolve(superQName);
if (!JavaClassNames.JAVA_LANG_OBJECT.equals(qName)) {
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) {
if (hasBaseAbstractMethods2(qName, methodsToCheck)) {
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

import com.intellij.java.compiler.impl.classParsing.*;
import com.intellij.java.compiler.impl.util.cls.ClsUtil;
import com.intellij.java.language.psi.CommonClassNames;
import consulo.application.util.function.Computable;
import consulo.compiler.CacheCorruptedException;
import consulo.compiler.ModuleCompilerPathsManager;
import consulo.compiler.util.MakeUtil;
import consulo.internal.org.objectweb.asm.Opcodes;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.content.ProductionContentFolderTypeProvider;
import consulo.logging.Logger;
import consulo.module.Module;
Expand Down Expand Up @@ -178,7 +178,7 @@ public static int getAnnotationTargets(final Cache cache,
final int annotationQName,
final SymbolTable symbolTable) throws CacheCorruptedException {
final AnnotationConstantValue
targetAnnotation = findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_TARGET, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable);
targetAnnotation = findAnnotation(CommonClassNames.JAVA_LANG_ANNOTATION_TARGET, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable);
if (targetAnnotation == null) {
return AnnotationTargets.ALL; // all program elements are annotation targets by default
}
Expand Down Expand Up @@ -224,7 +224,7 @@ public static int getAnnotationRetentionPolicy(
final SymbolTable symbolTable
) throws CacheCorruptedException {
final AnnotationConstantValue retentionPolicyAnnotation =
findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable);
findAnnotation(CommonClassNames.JAVA_LANG_ANNOTATION_RETENTION, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable);
if (retentionPolicyAnnotation == null) {
return RetentionPolicies.CLASS; // default retention policy
}
Expand Down
6 changes: 3 additions & 3 deletions java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.intellij.java.debugger.impl.ui.tree.ValueDescriptor;
import com.intellij.java.debugger.impl.ui.tree.render.*;
import com.intellij.java.debugger.ui.tree.NodeDescriptor;
import com.intellij.java.language.psi.CommonClassNames;
import com.intellij.java.language.psi.util.TypeConversionUtil;
import consulo.application.Application;
import consulo.application.ApplicationManager;
Expand All @@ -50,7 +51,6 @@
import consulo.internal.com.sun.jdi.ArrayReference;
import consulo.internal.com.sun.jdi.ArrayType;
import consulo.internal.com.sun.jdi.Value;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiElement;
import consulo.logging.Logger;
import consulo.project.Project;
Expand Down Expand Up @@ -302,9 +302,9 @@ public void renderValue(@Nonnull XValuePresentation.XValueTextRenderer renderer,
final ArrayType type = (ArrayType) container.getDescriptor().getType();
if (type != null) {
final String typeName = type.componentTypeName();
if (TypeConversionUtil.isPrimitive(typeName) || JavaClassNames.JAVA_LANG_STRING.equals(typeName)) {
if (TypeConversionUtil.isPrimitive(typeName) || CommonClassNames.JAVA_LANG_STRING.equals(typeName)) {
int size = value.length();
int max = Math.min(size, JavaClassNames.JAVA_LANG_STRING.equals(typeName) ? 5 : 10);
int max = Math.min(size, CommonClassNames.JAVA_LANG_STRING.equals(typeName) ? 5 : 10);
//TODO [eu]: this is a quick fix for IDEA-136606, need to move this away from EDT!!!
final List<Value> values = value.getValues(0, max);
int i = 0;
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.intellij.java.debugger.impl.HelpID;
import com.intellij.java.debugger.impl.breakpoints.properties.JavaExceptionBreakpointProperties;
import com.intellij.java.debugger.impl.engine.JVMNameUtil;
import com.intellij.java.language.psi.CommonClassNames;
import com.intellij.java.language.psi.JavaPsiFacade;
import com.intellij.java.language.psi.PsiClass;
import com.intellij.java.language.psi.PsiClassOwner;
Expand All @@ -30,7 +31,6 @@
import consulo.execution.debug.breakpoint.XBreakpoint;
import consulo.execution.debug.breakpoint.ui.XBreakpointCustomPropertiesPanel;
import consulo.execution.debug.icon.ExecutionDebugIconGroup;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.scope.GlobalSearchScope;
import consulo.project.Project;
import consulo.ui.image.Image;
Expand Down Expand Up @@ -111,7 +111,7 @@ public XBreakpoint<JavaExceptionBreakpointProperties> createDefaultBreakpoint(@N
@Override
public XBreakpoint<JavaExceptionBreakpointProperties> addBreakpoint(final Project project, JComponent parentComponent) {
final PsiClass throwableClass =
JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_THROWABLE, GlobalSearchScope.allScope(project));
JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_THROWABLE, GlobalSearchScope.allScope(project));
TreeClassChooser chooser =
TreeClassChooserFactory.getInstance(project).createInheritanceClassChooser(
DebuggerBundle.message("add.exception.breakpoint.classchooser.title"),
Expand Down
4 changes: 2 additions & 2 deletions ...mpl/src/main/java/com/intellij/java/indexing/impl/search/JavaClassInheritorsSearcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.intellij.java.indexing.search.searches.ClassInheritorsSearch;
import com.intellij.java.indexing.search.searches.ClassInheritorsSearchExecutor;
import com.intellij.java.indexing.search.searches.DirectClassInheritorsSearch;
import com.intellij.java.language.psi.CommonClassNames;
import com.intellij.java.language.psi.PsiAnonymousClass;
import com.intellij.java.language.psi.PsiClass;
import consulo.annotation.access.RequiredReadAction;
Expand All @@ -29,7 +30,6 @@
import consulo.application.progress.ProgressManager;
import consulo.application.util.ReadActionProcessor;
import consulo.content.scope.SearchScope;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.impl.psi.PsiAnchor;
import consulo.language.psi.PsiBundle;
import consulo.language.psi.PsiUtilCore;
Expand Down Expand Up @@ -164,7 +164,7 @@ public boolean processInReadAction(PsiClass candidate) {

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

Expand Down
5 changes: 2 additions & 3 deletions ...pl/src/main/java/com/intellij/java/indexing/impl/search/JavaDirectInheritorsSearcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import consulo.application.Application;
import consulo.application.progress.ProgressManager;
import consulo.content.scope.SearchScope;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiElement;
import consulo.language.psi.PsiUtilCore;
import consulo.language.psi.scope.EverythingGlobalScope;
Expand Down Expand Up @@ -59,7 +58,7 @@ public boolean execute(
String qualifiedName = app.runReadAction((Supplier<String>)aClass::getQualifiedName);

Project project = PsiUtilCore.getProjectInReadAction(aClass);
if (JavaClassNames.JAVA_LANG_OBJECT.equals(qualifiedName)) {
if (CommonClassNames.JAVA_LANG_OBJECT.equals(qualifiedName)) {
//[pasynkov]: WTF?
//SearchScope scope = useScope.intersectWith(GlobalSearchScope.notScope(GlobalSearchScope.getScopeRestrictedByFileTypes(
// GlobalSearchScope.allScope(psiManager.getProject()), StdFileTypes.JSP, StdFileTypes.JSPX)));
Expand All @@ -71,7 +70,7 @@ public boolean execute(
}
PsiClass superClass = psiClass.getSuperClass();
return !(superClass != null
&& JavaClassNames.JAVA_LANG_OBJECT.equals(app.runReadAction((Supplier<String>)superClass::getQualifiedName)))
&& CommonClassNames.JAVA_LANG_OBJECT.equals(app.runReadAction((Supplier<String>)superClass::getQualifiedName)))
|| consumer.test(psiClass);
});
}
Expand Down
Loading
Loading