Skip to content

Replacing JavaClassNames with CommonClassNames (part 2) #175

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 9, 2025
Merged

Replacing JavaClassNames with CommonClassNames (part 2) #175

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
5 changes: 2 additions & 3 deletions java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/ClassUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
package com.intellij.java.analysis.impl.codeInsight;

import com.intellij.java.language.psi.*;
import consulo.java.language.module.util.JavaClassNames;

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

import java.util.HashSet;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -84,7 +83,7 @@ private static PsiMethod checkPackageLocalInSuperClass(@Nonnull PsiClass aClass)
// super class can have package local abstract methods not accessible for overriding
PsiClass superClass = aClass.getSuperClass();
if (superClass == null) return null;
if (JavaClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null;
if (CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null;
if (JavaPsiFacade.getInstance(aClass.getProject()).arePackagesTheSame(aClass, superClass)) return null;

for (HierarchicalMethodSignature methodSignature : superClass.getVisibleSignatures()) {
Expand Down
3 changes: 1 addition & 2 deletions ...lysis/impl/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import consulo.annotation.access.RequiredReadAction;
import consulo.codeEditor.Editor;
import consulo.java.analysis.impl.localize.JavaQuickFixLocalize;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.editor.FileModificationService;
import consulo.language.editor.intention.SyntheticIntentionAction;
import consulo.language.editor.rawHighlight.HighlightInfo;
Expand Down Expand Up @@ -187,6 +186,6 @@ private static boolean charToString(PsiType firstType, PsiType secondType) {
}

private static boolean isString(PsiType type) {
return type != null && JavaClassNames.JAVA_LANG_STRING.equals(type.getCanonicalText());
return type != null && CommonClassNames.JAVA_LANG_STRING.equals(type.getCanonicalText());
}
}
14 changes: 6 additions & 8 deletions ...a/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.intellij.java.language.psi.util.PsiUtil;
import consulo.codeEditor.Editor;
import consulo.java.analysis.impl.JavaQuickFixBundle;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.ast.IElementType;
import consulo.language.editor.FileModificationService;
import consulo.language.editor.intention.SyntheticIntentionAction;
Expand All @@ -29,9 +28,8 @@
import consulo.language.util.IncorrectOperationException;
import consulo.project.Project;
import jakarta.annotation.Nonnull;
import org.jetbrains.annotations.NonNls;

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

/**
* @author Bas Leijdekkers
Expand Down Expand Up @@ -62,8 +60,8 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
return JavaTokenType.PLUSEQ == myTokenType &&
myAssignmentExpression.isValid() &&
PsiManager.getInstance(project).isInProject(myAssignmentExpression) &&
(myLhsType.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUILDER) ||
myLhsType.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUFFER) ||
(myLhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUILDER) ||
myLhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUFFER) ||
myLhsType.equalsToText("java.lang.Appendable"));
}

Expand Down Expand Up @@ -100,7 +98,7 @@ private static StringBuilder buildAppendExpression(@Nullable PsiExpression conca
if (type == null) {
return null;
}
if (concatenation instanceof PsiPolyadicExpression && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) {
if (concatenation instanceof PsiPolyadicExpression && type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)concatenation;
final PsiExpression[] operands = polyadicExpression.getOperands();
boolean isConstant = true;
Expand All @@ -112,7 +110,7 @@ private static StringBuilder buildAppendExpression(@Nullable PsiExpression conca
builder.append('+');
}
final PsiType operandType = operand.getType();
if (operandType != null && operandType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) {
if (operandType != null && operandType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
isString = true;
}
builder.append(operand.getText());
Expand All @@ -138,7 +136,7 @@ else if (concatenation instanceof PsiParenthesizedExpression) {
}
}
else {
append(concatenation.getText(), useStringValueOf && !type.equalsToText(JavaClassNames.JAVA_LANG_STRING), out);
append(concatenation.getText(), useStringValueOf && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING), out);
}
return out;
}
Expand Down
5 changes: 1 addition & 4 deletions .../intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@
import com.intellij.java.language.psi.impl.source.resolve.DefaultParameterTypeInferencePolicy;
import com.intellij.java.language.psi.util.TypeConversionUtil;
import consulo.codeEditor.Editor;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.editor.FileModificationService;
import consulo.language.editor.intention.HighPriorityAction;
import consulo.language.editor.intention.QuickFixAction;
import consulo.language.editor.intention.SyntheticIntentionAction;
import consulo.language.editor.rawHighlight.HighlightInfo;
import consulo.language.psi.PsiElement;
Expand All @@ -41,7 +39,6 @@
import consulo.ui.annotation.RequiredUIAccess;
import consulo.util.lang.StringUtil;
import jakarta.annotation.Nonnull;

import jakarta.annotation.Nullable;

public class ChangeTypeArgumentsFix implements SyntheticIntentionAction, HighPriorityAction {
Expand Down Expand Up @@ -71,7 +68,7 @@ public String getText() {
myPsiClass.getTypeParameters(),
typeParameter -> {
PsiType substituted = substitutor.substitute(typeParameter);
return substituted != null ? substituted.getPresentableText() : JavaClassNames.JAVA_LANG_OBJECT;
return substituted != null ? substituted.getPresentableText() : CommonClassNames.JAVA_LANG_OBJECT;
},
", "
) + ">";
Expand Down
5 changes: 2 additions & 3 deletions ...ain/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.intellij.java.language.psi.util.TypeConversionUtil;
import com.siyeh.ig.callMatcher.CallMatcher;
import com.siyeh.ig.psiutils.*;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.ast.IElementType;
import consulo.language.editor.ImplicitUsageProvider;
import consulo.language.psi.PsiElement;
Expand Down Expand Up @@ -1260,7 +1259,7 @@ public void visitArrayAccessExpression(PsiArrayAccessExpression expression) {
toPush = myFactory.getObjectType(expression.getType(), Nullability.UNKNOWN);
}
DfaControlTransferValue transfer = shouldHandleException()
? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION), myTrapStack)
? myFactory.controlTransfer(myExceptionCache.get(CommonClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION), myTrapStack)
: null;
addInstruction(new ArrayAccessInstruction(toPush, expression, transfer));
addNullCheck(expression);
Expand Down Expand Up @@ -2025,7 +2024,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression castExpression) {
final PsiTypeElement typeElement = castExpression.getCastType();
if (typeElement != null && operand != null && operand.getType() != null && !(typeElement.getType() instanceof PsiPrimitiveType)) {
DfaControlTransferValue transfer = shouldHandleException()
? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION), myTrapStack)
? myFactory.controlTransfer(myExceptionCache.get(CommonClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION), myTrapStack)
: null;
addInstruction(new TypeCastInstruction(castExpression, operand, typeElement.getType(), transfer));
}
Expand Down
4 changes: 1 addition & 3 deletions ...java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/ComparatorModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
import com.intellij.java.language.psi.util.PsiUtil;
import com.siyeh.ig.callMatcher.CallMatcher;
import consulo.annotation.access.RequiredReadAction;
import consulo.java.language.module.util.JavaClassNames;
import consulo.util.lang.ObjectUtil;

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

Expand Down Expand Up @@ -147,7 +145,7 @@ static ComparatorModel from(@Nullable PsiExpression expression) {
if (expression instanceof PsiReferenceExpression ref && "CASE_INSENSITIVE_ORDER".equals(ref.getReferenceName())) {
PsiField field = ObjectUtil.tryCast(ref.resolve(), PsiField.class);
if (field != null && field.getContainingClass() != null
&& JavaClassNames.JAVA_LANG_STRING.equals(field.getContainingClass().getQualifiedName())) {
&& CommonClassNames.JAVA_LANG_STRING.equals(field.getContainingClass().getQualifiedName())) {
return new NullHostile();
}
}
Expand Down
8 changes: 3 additions & 5 deletions java-analysis-impl/src/main/java/com/siyeh/ig/callMatcher/CallMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
import com.intellij.java.language.psi.util.PsiUtil;
import com.siyeh.ig.psiutils.MethodCallUtils;
import consulo.annotation.access.RequiredReadAction;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiElement;
import consulo.util.collection.ArrayUtil;
import consulo.util.lang.ObjectUtil;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.Contract;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.Contract;

import java.util.Collections;
import java.util.Set;
Expand Down Expand Up @@ -222,7 +220,7 @@ class Simple implements CallMatcher {
static final Simple ENUM_VALUES =
new Simple("", Collections.singleton("values"), ArrayUtil.EMPTY_STRING_ARRAY, CallType.ENUM_STATIC);
static final Simple ENUM_VALUE_OF =
new Simple("", Collections.singleton("valueOf"), new String[]{JavaClassNames.JAVA_LANG_STRING}, CallType.ENUM_STATIC);
new Simple("", Collections.singleton("valueOf"), new String[]{CommonClassNames.JAVA_LANG_STRING}, CallType.ENUM_STATIC);
@Nonnull
private final String myClassName;
@Nonnull
Expand Down
25 changes: 12 additions & 13 deletions java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
import com.intellij.java.language.psi.*;
import com.intellij.java.language.psi.util.PsiUtil;
import com.intellij.java.language.psi.util.TypeConversionUtil;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiElement;
import consulo.language.psi.PsiFile;
import consulo.language.psi.util.PsiTreeUtil;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import org.jetbrains.annotations.Contract;

import jakarta.annotation.Nullable;
import java.util.HashSet;
import java.util.Set;

Expand Down Expand Up @@ -62,23 +61,23 @@ public class ClassUtils {
primitiveNumericTypes.add(PsiType.FLOAT);
primitiveNumericTypes.add(PsiType.DOUBLE);

immutableTypes.add(JavaClassNames.JAVA_LANG_BOOLEAN);
immutableTypes.add(JavaClassNames.JAVA_LANG_CHARACTER);
immutableTypes.add(JavaClassNames.JAVA_LANG_SHORT);
immutableTypes.add(JavaClassNames.JAVA_LANG_INTEGER);
immutableTypes.add(JavaClassNames.JAVA_LANG_LONG);
immutableTypes.add(JavaClassNames.JAVA_LANG_FLOAT);
immutableTypes.add(JavaClassNames.JAVA_LANG_DOUBLE);
immutableTypes.add(JavaClassNames.JAVA_LANG_BYTE);
immutableTypes.add(JavaClassNames.JAVA_LANG_STRING);
immutableTypes.add(CommonClassNames.JAVA_LANG_BOOLEAN);
immutableTypes.add(CommonClassNames.JAVA_LANG_CHARACTER);
immutableTypes.add(CommonClassNames.JAVA_LANG_SHORT);
immutableTypes.add(CommonClassNames.JAVA_LANG_INTEGER);
immutableTypes.add(CommonClassNames.JAVA_LANG_LONG);
immutableTypes.add(CommonClassNames.JAVA_LANG_FLOAT);
immutableTypes.add(CommonClassNames.JAVA_LANG_DOUBLE);
immutableTypes.add(CommonClassNames.JAVA_LANG_BYTE);
immutableTypes.add(CommonClassNames.JAVA_LANG_STRING);
immutableTypes.add("java.awt.Font");
immutableTypes.add("java.awt.Color");
immutableTypes.add("java.math.BigDecimal");
immutableTypes.add("java.math.BigInteger");
immutableTypes.add("java.math.MathContext");
immutableTypes.add("java.nio.channels.FileLock");
immutableTypes.add("java.nio.charset.Charset");
immutableTypes.add(JavaClassNames.JAVA_IO_FILE);
immutableTypes.add(CommonClassNames.JAVA_IO_FILE);
immutableTypes.add("java.net.URI");
immutableTypes.add("java.util.regex.Pattern");
}
Expand All @@ -93,7 +92,7 @@ public static PsiClass findClass(String fqClassName, PsiElement context) {

@Nullable
public static PsiClass findObjectClass(PsiElement context) {
return findClass(JavaClassNames.JAVA_LANG_OBJECT, context);
return findClass(CommonClassNames.JAVA_LANG_OBJECT, context);
}

public static boolean isPrimitive(PsiType type) {
Expand Down
9 changes: 3 additions & 6 deletions java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CloneUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,18 @@
*/
package com.siyeh.ig.psiutils;

import jakarta.annotation.Nonnull;

import com.intellij.java.language.psi.*;
import com.intellij.java.language.psi.util.InheritanceUtil;
import com.intellij.java.language.psi.util.PsiUtil;
import com.siyeh.HardcodedMethodConstants;
import consulo.java.language.module.util.JavaClassNames;
import jakarta.annotation.Nonnull;

public class CloneUtils {

private CloneUtils() {}

public static boolean isCloneable(@Nonnull PsiClass aClass) {
return InheritanceUtil.isInheritor(aClass,
JavaClassNames.JAVA_LANG_CLONEABLE);
return InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_CLONEABLE);
}

public static boolean isDirectlyCloneable(@Nonnull PsiClass aClass) {
Expand All @@ -39,7 +36,7 @@ public static boolean isDirectlyCloneable(@Nonnull PsiClass aClass) {
continue;
}
final String qualifiedName = anInterface.getQualifiedName();
if (JavaClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName)) {
if (CommonClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName)) {
return true;
}
}
Expand Down
Loading
Loading