diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapArrayToArraysAsListFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapArrayToArraysAsListFix.java index 4530e40abe..0257941302 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapArrayToArraysAsListFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapArrayToArraysAsListFix.java @@ -19,11 +19,9 @@ import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; import com.intellij.java.language.psi.util.InheritanceUtil; import consulo.java.analysis.impl.JavaQuickFixBundle; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -83,8 +81,7 @@ protected PsiExpression getModifiedArgument(final PsiExpression expression, @Nullable private static PsiClass getJavaUtilList(final PsiElement context) { - return JavaPsiFacade.getInstance(context.getProject()).findClass(JavaClassNames.JAVA_UTIL_LIST, - context.getResolveScope()); + return JavaPsiFacade.getInstance(context.getProject()).findClass(CommonClassNames.JAVA_UTIL_LIST, context.getResolveScope()); } @Override diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapObjectWithOptionalOfNullableFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapObjectWithOptionalOfNullableFix.java index c64f8e313a..b151daf81a 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapObjectWithOptionalOfNullableFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapObjectWithOptionalOfNullableFix.java @@ -23,7 +23,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.inspection.LocalQuickFixAndIntentionActionOnPsiElement; import consulo.language.editor.intention.BaseIntentionAction; import consulo.language.editor.intention.HighPriorityAction; @@ -149,7 +148,7 @@ private static boolean areConvertible(@Nullable PsiType exprType, @Nullable PsiT } PsiClassType.ClassResolveResult resolve = ((PsiClassType)parameterType).resolveGenerics(); PsiClass resolvedClass = resolve.getElement(); - if (resolvedClass == null || !JavaClassNames.JAVA_UTIL_OPTIONAL.equals(resolvedClass.getQualifiedName())) { + if (resolvedClass == null || !CommonClassNames.JAVA_UTIL_OPTIONAL.equals(resolvedClass.getQualifiedName())) { return false; } @@ -170,7 +169,7 @@ private static PsiExpression getModifiedExpression(PsiExpression expression) { Project project = expression.getProject(); Nullability nullability = NullabilityUtil.getExpressionNullability(expression, true); String methodName = nullability == Nullability.NOT_NULL ? "of" : "ofNullable"; - String newExpressionText = JavaClassNames.JAVA_UTIL_OPTIONAL + "." + methodName + "(" + expression.getText() + ")"; + String newExpressionText = CommonClassNames.JAVA_UTIL_OPTIONAL + "." + methodName + "(" + expression.getText() + ")"; return JavaPsiFacade.getElementFactory(project).createExpressionFromText(newExpressionText, expression); } } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapStringWithFileFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapStringWithFileFix.java index 8ebc6ca9e2..eaea62fdae 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapStringWithFileFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapStringWithFileFix.java @@ -19,17 +19,15 @@ 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.editor.inspection.LocalQuickFixAndIntentionActionOnPsiElement; import consulo.language.editor.intention.HighPriorityAction; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; -import org.jetbrains.annotations.Nls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.Nls; public class WrapStringWithFileFix extends LocalQuickFixAndIntentionActionOnPsiElement implements HighPriorityAction { public final static MyMethodArgumentFixerFactory REGISTAR = new MyMethodArgumentFixerFactory(); @@ -59,7 +57,7 @@ public String getFamilyName() { @Override public boolean isAvailable(@Nonnull Project project, @Nonnull PsiFile file, @Nonnull PsiElement startElement, @Nonnull PsiElement endElement) { - return myType != null && myType.isValid() && myType.equalsToText(JavaClassNames.JAVA_IO_FILE) && startElement.isValid() && startElement.getManager().isInProject(startElement) && + return myType != null && myType.isValid() && myType.equalsToText(CommonClassNames.JAVA_IO_FILE) && startElement.isValid() && startElement.getManager().isInProject(startElement) && isStringType(startElement); } @@ -76,11 +74,11 @@ private static boolean isStringType(@Nonnull PsiElement expression) { if (type == null) { return false; } - return type.equalsToText(JavaClassNames.JAVA_LANG_STRING); + return type.equalsToText(CommonClassNames.JAVA_LANG_STRING); } private static PsiElement getModifiedExpression(@Nonnull PsiElement expression) { - return JavaPsiFacade.getElementFactory(expression.getProject()).createExpressionFromText(PsiKeyword.NEW + " " + JavaClassNames.JAVA_IO_FILE + "(" + expression.getText() + ")", expression); + return JavaPsiFacade.getElementFactory(expression.getProject()).createExpressionFromText(PsiKeyword.NEW + " " + CommonClassNames.JAVA_IO_FILE + "(" + expression.getText() + ")", expression); } private static class MyMethodArgumentFix extends MethodArgumentFix implements HighPriorityAction { @@ -108,12 +106,12 @@ public static class MyMethodArgumentFixerFactory extends ArgumentFixerActionFact @Nullable @Override protected PsiExpression getModifiedArgument(final PsiExpression expression, final PsiType toType) throws IncorrectOperationException { - return isStringType(expression) && toType.equalsToText(JavaClassNames.JAVA_IO_FILE) ? (PsiExpression) getModifiedExpression(expression) : null; + return isStringType(expression) && toType.equalsToText(CommonClassNames.JAVA_IO_FILE) ? (PsiExpression) getModifiedExpression(expression) : null; } @Override public boolean areTypesConvertible(@Nonnull final PsiType exprType, @Nonnull final PsiType parameterType, @Nonnull final PsiElement context) { - return parameterType.isConvertibleFrom(exprType) || (parameterType.equalsToText(JavaClassNames.JAVA_IO_FILE) && exprType.equalsToText(JavaClassNames.JAVA_LANG_STRING)); + return parameterType.isConvertibleFrom(exprType) || (parameterType.equalsToText(CommonClassNames.JAVA_IO_FILE) && exprType.equalsToText(CommonClassNames.JAVA_LANG_STRING)); } @Override diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/TypeConstraints.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/TypeConstraints.java index 2e2d0ee7f5..7d4128f12f 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/TypeConstraints.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/TypeConstraints.java @@ -6,14 +6,12 @@ import com.intellij.java.language.psi.util.PsiTypesUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiManager; import consulo.project.Project; -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.*; @@ -119,12 +117,12 @@ public TypeConstraint notInstanceOf() { @Override public String toString() { - return JavaClassNames.JAVA_LANG_OBJECT; + return CommonClassNames.JAVA_LANG_OBJECT; } @Override public PsiType getPsiType(Project project) { - return JavaPsiFacade.getElementFactory(project).createTypeByFQClassName(JavaClassNames.JAVA_LANG_OBJECT); + return JavaPsiFacade.getElementFactory(project).createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT); } }; @@ -255,11 +253,11 @@ private static TypeConstraint.Exact exactClass(@Nonnull PsiClass psiClass) { String name = psiClass.getQualifiedName(); if (name != null) { switch (name) { - case JavaClassNames.JAVA_LANG_OBJECT: + case CommonClassNames.JAVA_LANG_OBJECT: return EXACTLY_OBJECT; - case JavaClassNames.JAVA_LANG_CLONEABLE: + case CommonClassNames.JAVA_LANG_CLONEABLE: return ArraySuperInterface.CLONEABLE; - case JavaClassNames.JAVA_IO_SERIALIZABLE: + case CommonClassNames.JAVA_IO_SERIALIZABLE: return ArraySuperInterface.SERIALIZABLE; } } @@ -319,8 +317,8 @@ public boolean isConvertibleFrom(@Nonnull Exact other) { } private enum ArraySuperInterface implements TypeConstraint.Exact { - CLONEABLE(JavaClassNames.JAVA_LANG_CLONEABLE), - SERIALIZABLE(JavaClassNames.JAVA_IO_SERIALIZABLE); + CLONEABLE(CommonClassNames.JAVA_LANG_CLONEABLE), + SERIALIZABLE(CommonClassNames.JAVA_IO_SERIALIZABLE); @Nonnull private final String myReference; @@ -403,13 +401,13 @@ public boolean canBeInstantiated() { // Abstract final type is incorrect. We, however, assume that final wins: it can be instantiated // otherwise TypeConstraints.instanceOf(type) would return impossible type return (myClass.isFinal() || !myClass.isAbstract()) - && !JavaClassNames.JAVA_LANG_VOID.equals(myClass.getQualifiedName()); + && !CommonClassNames.JAVA_LANG_VOID.equals(myClass.getQualifiedName()); } @Override public boolean isComparedByEquals() { String name = myClass.getQualifiedName(); - return name != null && (JavaClassNames.JAVA_LANG_STRING.equals(name) || TypeConversionUtil.isPrimitiveWrapper(name)); + return name != null && (CommonClassNames.JAVA_LANG_STRING.equals(name) || TypeConversionUtil.isPrimitiveWrapper(name)); } @Nonnull @@ -548,7 +546,7 @@ public boolean isConvertibleFrom(@Nonnull Exact other) { } //noinspection SimplifiableIfStatement if (other instanceof ExactClass exactClass) { - return JavaClassNames.JAVA_LANG_OBJECT.equals(exactClass.myClass.getQualifiedName()); + return CommonClassNames.JAVA_LANG_OBJECT.equals(exactClass.myClass.getQualifiedName()); } return false; } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/TransformInliner.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/TransformInliner.java index 30d6aad5cc..efbcda15b8 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/TransformInliner.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/TransformInliner.java @@ -2,10 +2,10 @@ package com.intellij.java.analysis.impl.codeInspection.dataFlow.inliner; import com.intellij.java.analysis.impl.codeInspection.dataFlow.CFGBuilder; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiExpression; import com.intellij.java.language.psi.PsiMethodCallExpression; import com.siyeh.ig.callMatcher.CallMatcher; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; public class TransformInliner implements CallInliner { @@ -23,7 +23,7 @@ public class TransformInliner implements CallInliner { CallMatcher.instanceCall("io.reactivex.rxjava3.core.Maybe", "to").parameterCount(1), CallMatcher.instanceCall("io.reactivex.rxjava3.core.Observable", "to").parameterCount(1), CallMatcher.instanceCall("io.reactivex.rxjava3.core.Single", "to").parameterCount(1), - CallMatcher.instanceCall(JavaClassNames.JAVA_LANG_STRING, "transform").parameterCount(1), + CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "transform").parameterCount(1), CallMatcher.instanceCall("one.util.streamex.BaseStreamEx", "chain").parameterCount(1) ); diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/deadCode/UnusedDeclarationInspectionBase.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/deadCode/UnusedDeclarationInspectionBase.java index 97274fbd89..1ba2960796 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/deadCode/UnusedDeclarationInspectionBase.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/deadCode/UnusedDeclarationInspectionBase.java @@ -43,11 +43,13 @@ import consulo.application.Application; import consulo.application.progress.ProgressManager; import consulo.java.deadCodeNotWorking.OldStyleInspection; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.Language; import consulo.language.editor.ImplicitUsageProvider; import consulo.language.editor.impl.inspection.reference.RefElementImpl; -import consulo.language.editor.inspection.*; +import consulo.language.editor.inspection.GlobalInspectionContext; +import consulo.language.editor.inspection.GlobalInspectionTool; +import consulo.language.editor.inspection.InspectionToolState; +import consulo.language.editor.inspection.ProblemDescriptionsProcessor; import consulo.language.editor.inspection.localize.InspectionLocalize; import consulo.language.editor.inspection.reference.RefElement; import consulo.language.editor.inspection.reference.RefEntity; @@ -219,7 +221,7 @@ private static boolean isWriteReplaceMethod(@Nonnull PsiMethod method, RefClass if (parameters.length != 0) { return false; } - if (!method.getReturnType().equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (!method.getReturnType().equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return false; } if (method.hasModifierProperty(PsiModifier.STATIC)) { @@ -238,7 +240,7 @@ private static boolean isReadResolveMethod(@Nonnull PsiMethod method, RefClass r if (parameters.length != 0) { return false; } - if (!method.getReturnType().equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (!method.getReturnType().equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return false; } if (method.hasModifierProperty(PsiModifier.STATIC)) { diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/TypeUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/TypeUtils.java index 31651660e2..5caafb358c 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/TypeUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/TypeUtils.java @@ -19,15 +19,14 @@ import com.intellij.java.language.psi.util.InheritanceUtil; 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.scope.GlobalSearchScope; import consulo.project.Project; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nonnull; -import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -65,11 +64,11 @@ public static PsiClassType getType(@Nonnull PsiClass aClass) { } public static PsiClassType getObjectType(@Nonnull PsiElement context) { - return getType(JavaClassNames.JAVA_LANG_OBJECT, context); + return getType(CommonClassNames.JAVA_LANG_OBJECT, context); } public static PsiClassType getStringType(@Nonnull PsiElement context) { - return getType(JavaClassNames.JAVA_LANG_STRING, context); + return getType(CommonClassNames.JAVA_LANG_STRING, context); } /** @@ -83,12 +82,12 @@ public static boolean isNarrowingConversion(@Nullable PsiType sourceType, @Nulla @Contract("null -> false") public static boolean isJavaLangObject(@Nullable PsiType targetType) { - return typeEquals(JavaClassNames.JAVA_LANG_OBJECT, targetType); + return typeEquals(CommonClassNames.JAVA_LANG_OBJECT, targetType); } @Contract("null -> false") public static boolean isJavaLangString(@Nullable PsiType targetType) { - return typeEquals(JavaClassNames.JAVA_LANG_STRING, targetType); + return typeEquals(CommonClassNames.JAVA_LANG_STRING, targetType); } public static boolean isOptional(@Nullable PsiType type) { @@ -101,7 +100,7 @@ public static boolean isOptional(PsiClass aClass) { return false; } final String qualifiedName = aClass.getQualifiedName(); - return JavaClassNames.JAVA_UTIL_OPTIONAL.equals(qualifiedName) || "java.util.OptionalDouble".equals(qualifiedName) || "java.util.OptionalInt".equals(qualifiedName) || ("java.util" + + return CommonClassNames.JAVA_UTIL_OPTIONAL.equals(qualifiedName) || "java.util.OptionalDouble".equals(qualifiedName) || "java.util.OptionalInt".equals(qualifiedName) || ("java.util" + ".OptionalLong").equals(qualifiedName) || "com.google.common.base.Optional".equals(qualifiedName); } @@ -245,19 +244,19 @@ public static PsiType unaryNumericPromotion(PsiType type) { if (type == null) { return null; } - if (type.equalsToText(JavaClassNames.JAVA_LANG_BYTE) - || type.equalsToText(JavaClassNames.JAVA_LANG_SHORT) - || type.equalsToText(JavaClassNames.JAVA_LANG_CHARACTER) - || type.equalsToText(JavaClassNames.JAVA_LANG_INTEGER) + if (type.equalsToText(CommonClassNames.JAVA_LANG_BYTE) + || type.equalsToText(CommonClassNames.JAVA_LANG_SHORT) + || type.equalsToText(CommonClassNames.JAVA_LANG_CHARACTER) + || type.equalsToText(CommonClassNames.JAVA_LANG_INTEGER) || type.equals(PsiType.BYTE) || type.equals(PsiType.SHORT) || type.equals(PsiType.CHAR)) { return PsiType.INT; - } else if (type.equalsToText(JavaClassNames.JAVA_LANG_LONG)) { + } else if (type.equalsToText(CommonClassNames.JAVA_LANG_LONG)) { return PsiType.LONG; - } else if (type.equalsToText(JavaClassNames.JAVA_LANG_FLOAT)) { + } else if (type.equalsToText(CommonClassNames.JAVA_LANG_FLOAT)) { return PsiType.FLOAT; - } else if (type.equalsToText(JavaClassNames.JAVA_LANG_DOUBLE)) { + } else if (type.equalsToText(CommonClassNames.JAVA_LANG_DOUBLE)) { return PsiType.DOUBLE; } return type; diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/UnBoxingEvaluator.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/UnBoxingEvaluator.java index 09cbce8558..fb4068ab80 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/UnBoxingEvaluator.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/UnBoxingEvaluator.java @@ -15,26 +15,20 @@ */ package com.intellij.java.debugger.impl.engine.evaluation.expression; -import java.util.Collections; -import java.util.Map; - import com.intellij.java.debugger.engine.evaluation.EvaluateException; import com.intellij.java.debugger.impl.engine.evaluation.EvaluationContextImpl; +import com.intellij.java.language.impl.psi.impl.PsiJavaParserFacadeImpl; +import com.intellij.java.language.psi.CommonClassNames; +import consulo.internal.com.sun.jdi.*; import consulo.logging.Logger; import consulo.util.lang.Couple; -import consulo.java.language.module.util.JavaClassNames; -import com.intellij.java.language.impl.psi.impl.PsiJavaParserFacadeImpl; -import java.util.HashMap; -import consulo.internal.com.sun.jdi.ClassType; -import consulo.internal.com.sun.jdi.Field; -import consulo.internal.com.sun.jdi.Method; -import consulo.internal.com.sun.jdi.ObjectReference; -import consulo.internal.com.sun.jdi.PrimitiveValue; -import consulo.internal.com.sun.jdi.ReferenceType; -import consulo.internal.com.sun.jdi.Value; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + /** * @author Eugene Zhuravlev * Date: Feb 8, 2010 @@ -48,14 +42,14 @@ public class UnBoxingEvaluator implements Evaluator static { - TYPES_TO_CONVERSION_METHOD_MAP.put(JavaClassNames.JAVA_LANG_BOOLEAN, Couple.of("booleanValue", "()Z")); - TYPES_TO_CONVERSION_METHOD_MAP.put(JavaClassNames.JAVA_LANG_BYTE, Couple.of("byteValue", "()B")); - TYPES_TO_CONVERSION_METHOD_MAP.put(JavaClassNames.JAVA_LANG_CHARACTER, Couple.of("charValue", "()C")); - TYPES_TO_CONVERSION_METHOD_MAP.put(JavaClassNames.JAVA_LANG_SHORT, Couple.of("shortValue", "()S")); - TYPES_TO_CONVERSION_METHOD_MAP.put(JavaClassNames.JAVA_LANG_INTEGER, Couple.of("intValue", "()I")); - TYPES_TO_CONVERSION_METHOD_MAP.put(JavaClassNames.JAVA_LANG_LONG, Couple.of("longValue", "()J")); - TYPES_TO_CONVERSION_METHOD_MAP.put(JavaClassNames.JAVA_LANG_FLOAT, Couple.of("floatValue", "()F")); - TYPES_TO_CONVERSION_METHOD_MAP.put(JavaClassNames.JAVA_LANG_DOUBLE, Couple.of("doubleValue", "()D")); + TYPES_TO_CONVERSION_METHOD_MAP.put(CommonClassNames.JAVA_LANG_BOOLEAN, Couple.of("booleanValue", "()Z")); + TYPES_TO_CONVERSION_METHOD_MAP.put(CommonClassNames.JAVA_LANG_BYTE, Couple.of("byteValue", "()B")); + TYPES_TO_CONVERSION_METHOD_MAP.put(CommonClassNames.JAVA_LANG_CHARACTER, Couple.of("charValue", "()C")); + TYPES_TO_CONVERSION_METHOD_MAP.put(CommonClassNames.JAVA_LANG_SHORT, Couple.of("shortValue", "()S")); + TYPES_TO_CONVERSION_METHOD_MAP.put(CommonClassNames.JAVA_LANG_INTEGER, Couple.of("intValue", "()I")); + TYPES_TO_CONVERSION_METHOD_MAP.put(CommonClassNames.JAVA_LANG_LONG, Couple.of("longValue", "()J")); + TYPES_TO_CONVERSION_METHOD_MAP.put(CommonClassNames.JAVA_LANG_FLOAT, Couple.of("floatValue", "()F")); + TYPES_TO_CONVERSION_METHOD_MAP.put(CommonClassNames.JAVA_LANG_DOUBLE, Couple.of("doubleValue", "()D")); } public static boolean isTypeUnboxable(String typeName) diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ToStringRenderer.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ToStringRenderer.java index 4337e7b6c6..7676e16630 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ToStringRenderer.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ToStringRenderer.java @@ -15,32 +15,28 @@ */ package com.intellij.java.debugger.impl.ui.tree.render; -import static consulo.java.language.module.util.JavaClassNames.JAVA_LANG_STRING; - -import consulo.execution.debug.ui.XDebuggerUIConstants; -import org.jdom.Element; -import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nonnull; import com.intellij.java.debugger.DebuggerBundle; import com.intellij.java.debugger.DebuggerContext; -import com.intellij.java.debugger.impl.engine.DebugProcessImpl; import com.intellij.java.debugger.engine.DebuggerUtils; import com.intellij.java.debugger.engine.evaluation.EvaluateException; import com.intellij.java.debugger.engine.evaluation.EvaluationContext; import com.intellij.java.debugger.impl.DebuggerUtilsEx; +import com.intellij.java.debugger.impl.engine.DebugProcessImpl; import com.intellij.java.debugger.impl.ui.tree.DebuggerTreeNode; -import com.intellij.java.debugger.ui.tree.NodeDescriptor; import com.intellij.java.debugger.impl.ui.tree.ValueDescriptor; -import consulo.util.xml.serializer.JDOMExternalizerUtil; -import consulo.util.lang.StringUtil; -import consulo.java.language.module.util.JavaClassNames; -import consulo.language.psi.PsiElement; import com.intellij.java.debugger.ui.classFilter.ClassFilter; -import consulo.internal.com.sun.jdi.ClassType; -import consulo.internal.com.sun.jdi.Method; -import consulo.internal.com.sun.jdi.ReferenceType; -import consulo.internal.com.sun.jdi.Type; -import consulo.internal.com.sun.jdi.Value; +import com.intellij.java.debugger.ui.tree.NodeDescriptor; +import com.intellij.java.language.psi.CommonClassNames; +import consulo.execution.debug.ui.XDebuggerUIConstants; +import consulo.internal.com.sun.jdi.*; +import consulo.language.psi.PsiElement; +import consulo.util.lang.StringUtil; +import consulo.util.xml.serializer.JDOMExternalizerUtil; +import jakarta.annotation.Nonnull; +import org.jdom.Element; +import org.jetbrains.annotations.NonNls; + +import static consulo.java.language.module.util.JavaClassNames.JAVA_LANG_STRING; public class ToStringRenderer extends NodeRendererImpl implements OnDemandRenderer { @@ -167,7 +163,7 @@ private static boolean overridesToString(Type type) if(type instanceof ClassType) { Method toStringMethod = ((ClassType) type).concreteMethodByName("toString", "()Ljava/lang/String;"); - return toStringMethod != null && !JavaClassNames.JAVA_LANG_OBJECT.equals(toStringMethod.declaringType().name()); + return toStringMethod != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(toStringMethod.declaringType().name()); } return false; } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/TypeRenderer.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/TypeRenderer.java index 106c4596a5..d03af0c872 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/TypeRenderer.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/TypeRenderer.java @@ -15,14 +15,14 @@ */ package com.intellij.java.debugger.impl.ui.tree.render; -import org.jdom.Element; -import jakarta.annotation.Nonnull; import com.intellij.java.debugger.engine.DebuggerUtils; +import com.intellij.java.language.psi.CommonClassNames; +import consulo.internal.com.sun.jdi.Type; import consulo.logging.Logger; import consulo.util.xml.serializer.InvalidDataException; import consulo.util.xml.serializer.WriteExternalException; -import consulo.java.language.module.util.JavaClassNames; -import consulo.internal.com.sun.jdi.Type; +import jakarta.annotation.Nonnull; +import org.jdom.Element; public abstract class TypeRenderer implements Renderer { @@ -31,7 +31,7 @@ public abstract class TypeRenderer implements Renderer protected TypeRenderer() { - this(JavaClassNames.JAVA_LANG_OBJECT); + this(CommonClassNames.JAVA_LANG_OBJECT); } protected TypeRenderer(@Nonnull String className) diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypeConversionUtil.java b/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypeConversionUtil.java index 0a33694778..b2cbe44ba9 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypeConversionUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypeConversionUtil.java @@ -19,7 +19,6 @@ import com.intellij.java.language.psi.*; import consulo.application.util.*; import consulo.application.util.function.Processor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; @@ -33,15 +32,13 @@ import consulo.util.collection.primitive.objects.ObjectMaps; import consulo.util.dataholder.Key; import consulo.util.lang.Comparing; -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.Supplier; -import static consulo.java.language.module.util.JavaClassNames.JAVA_LANG_STRING; - public class TypeConversionUtil { private static final Logger LOG = Logger.getInstance(TypeConversionUtil.class); @@ -605,7 +602,7 @@ public static int getTypeRank(@Nonnull PsiType type) { if (rank != 0) { return rank; } - if (type.equalsToText(JAVA_LANG_STRING)) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return STRING_RANK; } return Integer.MAX_VALUE; @@ -666,11 +663,11 @@ public static boolean isBinaryOperatorApplicable(final IElementType tokenType, f isApplicable = areTypesConvertible(ltype, rtype) || areTypesConvertible(rtype, ltype); } } else if (tokenType == JavaTokenType.PLUS) { - if (ltype.equalsToText(JAVA_LANG_STRING)) { + if (ltype.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { isApplicable = !isVoidType(rtype); resultTypeRank = STRING_RANK; break Label; - } else if (rtype.equalsToText(JAVA_LANG_STRING)) { + } else if (rtype.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { isApplicable = !isVoidType(ltype); resultTypeRank = STRING_RANK; break Label; @@ -705,7 +702,7 @@ public static boolean isBinaryOperatorApplicable(final IElementType tokenType, f } if (isApplicable && strict) { if (resultTypeRank > MAX_NUMERIC_RANK) { - isApplicable = ltypeRank == resultTypeRank || ltype.equalsToText(JavaClassNames.JAVA_LANG_OBJECT); + isApplicable = ltypeRank == resultTypeRank || ltype.equalsToText(CommonClassNames.JAVA_LANG_OBJECT); } else { isApplicable = ltypeRank <= MAX_NUMERIC_RANK; } @@ -923,9 +920,9 @@ private static boolean isAssignable(@Nonnull PsiType left, @Nonnull PsiType righ } if (lClass.isInterface()) { String qualifiedName = lClass.getQualifiedName(); - return JavaClassNames.JAVA_IO_SERIALIZABLE.equals(qualifiedName) || JavaClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName); + return CommonClassNames.JAVA_IO_SERIALIZABLE.equals(qualifiedName) || CommonClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName); } else { - return left.equalsToText(JavaClassNames.JAVA_LANG_OBJECT); + return left.equalsToText(CommonClassNames.JAVA_LANG_OBJECT); } } PsiType lCompType = ((PsiArrayType) left).getComponentType(); @@ -1173,11 +1170,11 @@ public static boolean typesAgree(final @Nonnull PsiType typeLeft, final @Nonnull if (leftBound == null) { return true; } - if (leftBound.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (leftBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { if (!leftWildcard.isSuper()) { return true; } - if (typeRight.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (typeRight.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return true; } } @@ -1377,14 +1374,14 @@ private static PsiType unbox(@Nonnull PsiType type) { private static final Set PRIMITIVE_WRAPPER_TYPES = new HashSet(8); static { - PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_BYTE); - PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_CHARACTER); - PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_DOUBLE); - PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_FLOAT); - PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_LONG); - PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_INTEGER); - PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_SHORT); - PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_BOOLEAN); + PRIMITIVE_WRAPPER_TYPES.add(CommonClassNames.JAVA_LANG_BYTE); + PRIMITIVE_WRAPPER_TYPES.add(CommonClassNames.JAVA_LANG_CHARACTER); + PRIMITIVE_WRAPPER_TYPES.add(CommonClassNames.JAVA_LANG_DOUBLE); + PRIMITIVE_WRAPPER_TYPES.add(CommonClassNames.JAVA_LANG_FLOAT); + PRIMITIVE_WRAPPER_TYPES.add(CommonClassNames.JAVA_LANG_LONG); + PRIMITIVE_WRAPPER_TYPES.add(CommonClassNames.JAVA_LANG_INTEGER); + PRIMITIVE_WRAPPER_TYPES.add(CommonClassNames.JAVA_LANG_SHORT); + PRIMITIVE_WRAPPER_TYPES.add(CommonClassNames.JAVA_LANG_BOOLEAN); } public static boolean isIntegerNumber(String typeName) { @@ -1405,8 +1402,8 @@ public static boolean isAssignableFromPrimitiveWrapper(final PsiType type) { return false; } return isPrimitiveWrapper(type) || - type.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) || - type.equalsToText(JavaClassNames.JAVA_LANG_NUMBER); + type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) || + type.equalsToText(CommonClassNames.JAVA_LANG_NUMBER); } @Contract("null -> false") @@ -1536,7 +1533,7 @@ public static Object computeCastTo(final Object operand, final PsiType castType) return null; } Object value; - if (operand instanceof String && castType.equalsToText(JAVA_LANG_STRING) || operand instanceof Boolean && PsiType.BOOLEAN.equals(castType)) { + if (operand instanceof String && castType.equalsToText(CommonClassNames.JAVA_LANG_STRING) || operand instanceof Boolean && PsiType.BOOLEAN.equals(castType)) { value = operand; } else { final PsiType primitiveType = wrapperToPrimitive(operand); @@ -1617,7 +1614,7 @@ public static PsiType calcTypeForBinaryExpression(PsiType lType, PsiType rType, if (rType == null) { return null; } - if (rType.equalsToText(JAVA_LANG_STRING)) { + if (rType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return rType; } if (!accessLType) { @@ -1626,7 +1623,7 @@ public static PsiType calcTypeForBinaryExpression(PsiType lType, PsiType rType, if (lType == null) { return null; } - if (lType.equalsToText(JAVA_LANG_STRING)) { + if (lType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return lType; } return unboxAndBalanceTypes(lType, rType); diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypesDistinctProver.java b/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypesDistinctProver.java index 47ab221f99..d124ef11ab 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypesDistinctProver.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypesDistinctProver.java @@ -15,13 +15,11 @@ */ package com.intellij.java.language.psi.util; -import java.util.Set; - import com.intellij.java.language.psi.*; +import consulo.util.lang.Comparing; import java.util.HashSet; -import consulo.java.language.module.util.JavaClassNames; -import consulo.util.lang.Comparing; +import java.util.Set; /** * User: anna @@ -33,9 +31,9 @@ public class TypesDistinctProver static { - ARRAY_SUPER_CLASSES.add(JavaClassNames.JAVA_IO_SERIALIZABLE); - ARRAY_SUPER_CLASSES.add(JavaClassNames.JAVA_LANG_CLONEABLE); - ARRAY_SUPER_CLASSES.add(JavaClassNames.JAVA_LANG_OBJECT); + ARRAY_SUPER_CLASSES.add(CommonClassNames.JAVA_IO_SERIALIZABLE); + ARRAY_SUPER_CLASSES.add(CommonClassNames.JAVA_LANG_CLONEABLE); + ARRAY_SUPER_CLASSES.add(CommonClassNames.JAVA_LANG_OBJECT); } private TypesDistinctProver() @@ -86,9 +84,9 @@ protected static boolean provablyDistinct(PsiType type1, PsiType type2, int leve return false; } - if(JavaClassNames.JAVA_LANG_OBJECT.equals(psiClass2.getQualifiedName()) && !(boundClass1 instanceof PsiTypeParameter)) + if(CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass2.getQualifiedName()) && !(boundClass1 instanceof PsiTypeParameter)) { - return !JavaClassNames.JAVA_LANG_OBJECT.equals(boundClass1.getQualifiedName()); + return !CommonClassNames.JAVA_LANG_OBJECT.equals(boundClass1.getQualifiedName()); } return proveExtendsBoundsDistinct(type1, type2, boundClass1, psiClass2); diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/cache/TypeInfo.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/cache/TypeInfo.java index 97f773fa1a..e1b97fac46 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/cache/TypeInfo.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/cache/TypeInfo.java @@ -3,8 +3,8 @@ import com.intellij.java.language.impl.psi.impl.java.stubs.impl.PsiClassStubImpl; import com.intellij.java.language.impl.psi.impl.source.tree.JavaElementType; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.JavaTokenType; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.*; import consulo.language.psi.stub.StubElement; import consulo.language.psi.stub.StubInputStream; @@ -48,10 +48,10 @@ "null", "short", "void", - JavaClassNames.JAVA_LANG_OBJECT_SHORT, - JavaClassNames.JAVA_LANG_OBJECT, - JavaClassNames.JAVA_LANG_STRING_SHORT, - JavaClassNames.JAVA_LANG_STRING + CommonClassNames.JAVA_LANG_OBJECT_SHORT, + CommonClassNames.JAVA_LANG_OBJECT, + CommonClassNames.JAVA_LANG_STRING_SHORT, + CommonClassNames.JAVA_LANG_STRING }; ourFrequentTypeIndex = ObjectMaps.newObjectIntHashMap(); @@ -92,16 +92,16 @@ public enum TypeKind { GENERIC, // References to widely used classes (skip encoding the class name) - JAVA_LANG_OBJECT(JavaClassNames.JAVA_LANG_OBJECT), - JAVA_LANG_STRING(JavaClassNames.JAVA_LANG_STRING), - JAVA_LANG_THROWABLE(JavaClassNames.JAVA_LANG_THROWABLE), - JAVA_LANG_EXCEPTION(JavaClassNames.JAVA_LANG_EXCEPTION), - JAVA_UTIL_COLLECTION(JavaClassNames.JAVA_UTIL_COLLECTION), - JAVA_UTIL_LIST(JavaClassNames.JAVA_UTIL_LIST), - JAVA_LANG_ITERABLE(JavaClassNames.JAVA_LANG_ITERABLE), - JAVA_UTIL_ITERATOR(JavaClassNames.JAVA_UTIL_ITERATOR), - JAVA_UTIL_MAP(JavaClassNames.JAVA_UTIL_MAP), - JAVA_LANG_ANNOTATION_ANNOTATION(JavaClassNames.JAVA_LANG_ANNOTATION_ANNOTATION), + JAVA_LANG_OBJECT(CommonClassNames.JAVA_LANG_OBJECT), + JAVA_LANG_STRING(CommonClassNames.JAVA_LANG_STRING), + JAVA_LANG_THROWABLE(CommonClassNames.JAVA_LANG_THROWABLE), + JAVA_LANG_EXCEPTION(CommonClassNames.JAVA_LANG_EXCEPTION), + JAVA_UTIL_COLLECTION(CommonClassNames.JAVA_UTIL_COLLECTION), + JAVA_UTIL_LIST(CommonClassNames.JAVA_UTIL_LIST), + JAVA_LANG_ITERABLE(CommonClassNames.JAVA_LANG_ITERABLE), + JAVA_UTIL_ITERATOR(CommonClassNames.JAVA_UTIL_ITERATOR), + JAVA_UTIL_MAP(CommonClassNames.JAVA_UTIL_MAP), + JAVA_LANG_ANNOTATION_ANNOTATION(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION), /** * Reference with outer class (which may probably be inner as well, or have generic parameters), diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/SwitchStatementPostfixTemplate.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/SwitchStatementPostfixTemplate.java index 257f8799ca..2f57904939 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/SwitchStatementPostfixTemplate.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/SwitchStatementPostfixTemplate.java @@ -12,7 +12,6 @@ import consulo.document.Document; import consulo.document.util.TextRange; import consulo.java.impl.JavaBundle; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.CodeInsightUtilCore; import consulo.language.editor.refactoring.postfixTemplate.PostfixTemplateExpressionSelector; @@ -57,7 +56,7 @@ public class SwitchStatementPostfixTemplate extends SurroundPostfixTemplateBase } } - if (type.equalsToText(JavaClassNames.JAVA_LANG_STRING) && expression.getContainingFile() instanceof PsiJavaFile javaFile) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_STRING) && expression.getContainingFile() instanceof PsiJavaFile javaFile) { if (PsiUtil.isAvailable(JavaFeature.STRING_SWITCH, javaFile)) { return true; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/ThrowExceptionPostfixTemplate.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/ThrowExceptionPostfixTemplate.java index 535b56483c..2ce9de7bd9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/ThrowExceptionPostfixTemplate.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/ThrowExceptionPostfixTemplate.java @@ -2,8 +2,8 @@ package com.intellij.java.impl.codeInsight.template.postfix.templates; import com.intellij.java.language.LanguageLevel; +import com.intellij.java.language.psi.CommonClassNames; import consulo.application.dumb.DumbAware; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import java.util.Collections; @@ -15,7 +15,7 @@ public ThrowExceptionPostfixTemplate(@Nonnull JavaPostfixTemplateProvider provid "throw $EXPR$;$END$", "throw expr", Collections.singleton( - new JavaPostfixTemplateExpressionCondition.JavaPostfixTemplateExpressionFqnCondition(JavaClassNames.JAVA_LANG_THROWABLE) + new JavaPostfixTemplateExpressionCondition.JavaPostfixTemplateExpressionFqnCondition(CommonClassNames.JAVA_LANG_THROWABLE) ), LanguageLevel.JDK_1_3, true, provider ); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/TryWithResourcesPostfixTemplate.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/TryWithResourcesPostfixTemplate.java index 9e39954832..0c42d3517b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/TryWithResourcesPostfixTemplate.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/TryWithResourcesPostfixTemplate.java @@ -24,7 +24,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import consulo.codeEditor.Editor; import consulo.document.Document; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.postfixTemplate.PostfixTemplate; import consulo.language.editor.template.Template; import consulo.language.editor.template.TemplateManager; @@ -58,7 +57,7 @@ public boolean isApplicable(@Nonnull PsiElement element, @Nonnull Document copyD final PsiClass aClass = ((PsiClassType)type).resolve(); Project project = element.getProject(); final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); - final PsiClass autoCloseable = facade.findClass(JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE, (GlobalSearchScope) ProjectScopes.getLibrariesScope(project)); + final PsiClass autoCloseable = facade.findClass(CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, (GlobalSearchScope) ProjectScopes.getLibrariesScope(project)); if (!InheritanceUtil.isInheritorOrSelf(aClass, autoCloseable, true)) return false; return true; diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/WrapWithMutableCollectionFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/WrapWithMutableCollectionFix.java index 4f1b29443b..0f61b49bd0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/WrapWithMutableCollectionFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/WrapWithMutableCollectionFix.java @@ -9,18 +9,16 @@ import com.siyeh.ig.psiutils.CommentTracker; import com.siyeh.ig.psiutils.ExpressionUtils; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.project.Project; import consulo.util.lang.ObjectUtil; import consulo.util.lang.StringUtil; -import org.jetbrains.annotations.Contract; -import org.jetbrains.annotations.Nls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.Nls; public class WrapWithMutableCollectionFix implements LocalQuickFix { private final String myVariableName; @@ -62,15 +60,15 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri return; } String typeParameters = ""; - if (myCollectionName.equals(JavaClassNames.JAVA_UTIL_HASH_MAP)) { - PsiType keyParameter = PsiUtil.substituteTypeParameter(type, JavaClassNames.JAVA_UTIL_MAP, 0, false); - PsiType valueParameter = PsiUtil.substituteTypeParameter(type, JavaClassNames.JAVA_UTIL_MAP, 1, false); + if (myCollectionName.equals(CommonClassNames.JAVA_UTIL_HASH_MAP)) { + PsiType keyParameter = PsiUtil.substituteTypeParameter(type, CommonClassNames.JAVA_UTIL_MAP, 0, false); + PsiType valueParameter = PsiUtil.substituteTypeParameter(type, CommonClassNames.JAVA_UTIL_MAP, 1, false); if (keyParameter != null && valueParameter != null) { typeParameters = "<" + keyParameter.getCanonicalText() + "," + valueParameter.getCanonicalText() + ">"; } } else { - PsiType elementParameter = PsiUtil.substituteTypeParameter(type, JavaClassNames.JAVA_LANG_ITERABLE, 0, false); + PsiType elementParameter = PsiUtil.substituteTypeParameter(type, CommonClassNames.JAVA_LANG_ITERABLE, 0, false); if (elementParameter != null) { typeParameters = "<" + elementParameter.getCanonicalText() + ">"; } @@ -133,10 +131,10 @@ private static String getWrapperByType(PsiType type) { return null; } return switch (name) { - case JavaClassNames.JAVA_LANG_ITERABLE, JavaClassNames.JAVA_UTIL_COLLECTION, JavaClassNames.JAVA_UTIL_LIST -> - JavaClassNames.JAVA_UTIL_ARRAY_LIST; - case JavaClassNames.JAVA_UTIL_SET -> JavaClassNames.JAVA_UTIL_HASH_SET; - case JavaClassNames.JAVA_UTIL_MAP -> JavaClassNames.JAVA_UTIL_HASH_MAP; + case CommonClassNames.JAVA_LANG_ITERABLE, CommonClassNames.JAVA_UTIL_COLLECTION, CommonClassNames.JAVA_UTIL_LIST -> + CommonClassNames.JAVA_UTIL_ARRAY_LIST; + case CommonClassNames.JAVA_UTIL_SET -> CommonClassNames.JAVA_UTIL_HASH_SET; + case CommonClassNames.JAVA_UTIL_MAP -> CommonClassNames.JAVA_UTIL_HASH_MAP; default -> null; }; } diff --git a/plugin/src/main/java/com/intellij/java/impl/generate/template/TemplatesManager.java b/plugin/src/main/java/com/intellij/java/impl/generate/template/TemplatesManager.java index 6ca21ca064..252330e6b5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/generate/template/TemplatesManager.java +++ b/plugin/src/main/java/com/intellij/java/impl/generate/template/TemplatesManager.java @@ -13,18 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * @author max - */ package com.intellij.java.impl.generate.template; import com.intellij.java.impl.generate.element.FieldElement; +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.PsiType; import consulo.component.persist.PersistentStateComponent; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.scope.GlobalSearchScope; import consulo.project.Project; import consulo.util.collection.ContainerUtil; @@ -32,8 +28,8 @@ import consulo.util.io.FileUtil; import consulo.util.lang.Comparing; import consulo.util.lang.StringUtil; - import jakarta.annotation.Nonnull; + import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStreamReader; @@ -42,6 +38,9 @@ import java.util.*; import java.util.function.Function; +/** + * @author max + */ public abstract class TemplatesManager implements PersistentStateComponent { public static final Key> TEMPLATE_IMPLICITS = Key.create("TEMPLATE_IMPLICITS"); @@ -124,7 +123,7 @@ public void setTemplates(List items) { @Nonnull public static PsiType createFieldListElementType(Project project) { final PsiType classType = createElementType(project, FieldElement.class); - final PsiClass listClass = JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_UTIL_LIST, GlobalSearchScope.allScope(project)); + final PsiClass listClass = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_UTIL_LIST, GlobalSearchScope.allScope(project)); return listClass != null ? JavaPsiFacade.getElementFactory(project).createType(listClass, classType) : PsiType.NULL; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/TypeHierarchyBrowser.java b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/TypeHierarchyBrowser.java index 6067c42784..dfe1d1d774 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/TypeHierarchyBrowser.java +++ b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/TypeHierarchyBrowser.java @@ -15,34 +15,31 @@ */ package com.intellij.java.impl.ide.hierarchy.type; -import java.text.MessageFormat; -import java.util.Comparator; -import java.util.Map; - +import com.intellij.java.impl.ide.hierarchy.JavaHierarchyUtil; +import com.intellij.java.language.impl.psi.presentation.java.ClassPresentationUtil; +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; -import jakarta.annotation.Nonnull; - -import javax.swing.JPanel; -import javax.swing.JTree; - import consulo.ide.impl.idea.ide.hierarchy.HierarchyBrowserBaseEx; import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor; import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure; -import com.intellij.java.impl.ide.hierarchy.JavaHierarchyUtil; import consulo.ide.impl.idea.ide.hierarchy.TypeHierarchyBrowserBase; -import consulo.ui.ex.action.DefaultActionGroup; -import consulo.ui.ex.tree.NodeDescriptor; -import consulo.ui.ex.action.IdeActions; +import consulo.language.psi.PsiElement; import consulo.logging.Logger; import consulo.project.Project; +import consulo.ui.ex.action.DefaultActionGroup; +import consulo.ui.ex.action.IdeActions; +import consulo.ui.ex.tree.NodeDescriptor; import consulo.util.lang.Comparing; -import consulo.java.language.module.util.JavaClassNames; -import com.intellij.java.language.psi.PsiAnonymousClass; -import com.intellij.java.language.psi.PsiClass; -import consulo.language.psi.PsiElement; -import com.intellij.java.language.impl.psi.presentation.java.ClassPresentationUtil; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import javax.swing.*; +import java.text.MessageFormat; +import java.util.Comparator; +import java.util.Map; + public class TypeHierarchyBrowser extends TypeHierarchyBrowserBase { private static final Logger LOG = Logger.getInstance(TypeHierarchyBrowser.class); @@ -135,7 +132,7 @@ public static class BaseOnThisTypeAction extends TypeHierarchyBrowserBase.BaseOn @Override protected boolean isEnabled(@Nonnull HierarchyBrowserBaseEx browser, @Nonnull PsiElement psiElement) { return super.isEnabled(browser, psiElement) - && !JavaClassNames.JAVA_LANG_OBJECT.equals(((PsiClass)psiElement).getQualifiedName()); + && !CommonClassNames.JAVA_LANG_OBJECT.equals(((PsiClass)psiElement).getQualifiedName()); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/TypeHierarchyTreeStructure.java b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/TypeHierarchyTreeStructure.java index c0cae4ba17..a76ccac797 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/TypeHierarchyTreeStructure.java +++ b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/TypeHierarchyTreeStructure.java @@ -15,10 +15,10 @@ */ package com.intellij.java.impl.ide.hierarchy.type; +import com.intellij.java.language.psi.CommonClassNames; +import com.intellij.java.language.psi.PsiClass; import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor; import consulo.project.Project; -import consulo.java.language.module.util.JavaClassNames; -import com.intellij.java.language.psi.PsiClass; import java.util.ArrayList; @@ -55,7 +55,7 @@ private static PsiClass[] createSuperClasses(PsiClass aClass) { } ArrayList superClasses = new ArrayList<>(); - while (!JavaClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) { + while (!CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) { PsiClass aClass1 = aClass; PsiClass[] superTypes = aClass1.getSupers(); PsiClass superType = null; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/TypeMayBeWeakenedInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/TypeMayBeWeakenedInspection.java index c25a6d00b7..c06f4d44a7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/TypeMayBeWeakenedInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/TypeMayBeWeakenedInspection.java @@ -26,7 +26,6 @@ import consulo.annotation.component.ExtensionImpl; import consulo.application.util.query.Query; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; @@ -260,7 +259,7 @@ else if (declarationScope instanceof PsiMethod) { if (doNotWeakenToJavaLangObject) { final Project project = variable.getProject(); final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); - final PsiClass javaLangObjectClass = facade.findClass(JavaClassNames.JAVA_LANG_OBJECT, variable.getResolveScope()); + final PsiClass javaLangObjectClass = facade.findClass(CommonClassNames.JAVA_LANG_OBJECT, variable.getResolveScope()); weakestClasses.remove(javaLangObjectClass); } if (onlyWeakentoInterface) { @@ -301,7 +300,7 @@ public void visitMethod(PsiMethod method) { if (doNotWeakenToJavaLangObject) { final Project project = method.getProject(); final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); - final PsiClass javaLangObjectClass = facade.findClass(JavaClassNames.JAVA_LANG_OBJECT, method.getResolveScope()); + final PsiClass javaLangObjectClass = facade.findClass(CommonClassNames.JAVA_LANG_OBJECT, method.getResolveScope()); weakestClasses.remove(javaLangObjectClass); } if (onlyWeakentoInterface) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/SuspiciousToArrayCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/SuspiciousToArrayCallInspection.java index 2ad3267880..423d5afab5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/SuspiciousToArrayCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/SuspiciousToArrayCallInspection.java @@ -21,7 +21,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -76,8 +75,7 @@ public void visitMethodCallExpression( final PsiClassType classType = (PsiClassType)type; final PsiClass aClass = classType.resolve(); if (aClass == null || - !InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_UTIL_COLLECTION)) { + !InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_UTIL_COLLECTION)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ThrowableInstanceNeverThrownInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ThrowableInstanceNeverThrownInspection.java index 0e61f17f3f..23cd7b1ae7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ThrowableInstanceNeverThrownInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ThrowableInstanceNeverThrownInspection.java @@ -16,13 +16,13 @@ package com.intellij.java.impl.ig.bugs; import com.intellij.java.language.psi.*; -import com.siyeh.InspectionGadgetsBundle;import com.siyeh.ig.BaseInspection; +import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.application.util.query.Query; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; import consulo.language.psi.search.ReferencesSearch; @@ -47,17 +47,17 @@ protected String buildErrorString(Object... infos) { final PsiExpression expression = (PsiExpression)infos[0]; final String type = TypeUtils.expressionHasTypeOrSubtype( expression, - JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, - JavaClassNames.JAVA_LANG_EXCEPTION, - JavaClassNames.JAVA_LANG_ERROR + CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, + CommonClassNames.JAVA_LANG_EXCEPTION, + CommonClassNames.JAVA_LANG_ERROR ); - if (JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION.equals(type)) { + if (CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION.equals(type)) { return InspectionGadgetsLocalize.throwableInstanceNeverThrownRuntimeExceptionProblemDescriptor().get(); } - else if (JavaClassNames.JAVA_LANG_EXCEPTION.equals(type)) { + else if (CommonClassNames.JAVA_LANG_EXCEPTION.equals(type)) { return InspectionGadgetsLocalize.throwableInstanceNeverThrownCheckedExceptionProblemDescriptor().get(); } - else if (JavaClassNames.JAVA_LANG_ERROR.equals(type)) { + else if (CommonClassNames.JAVA_LANG_ERROR.equals(type)) { return InspectionGadgetsLocalize.throwableInstanceNeverThrownErrorProblemDescriptor().get(); } else { @@ -82,7 +82,7 @@ private static class ExceptionInstanceNeverThrownVisitor public void visitNewExpression(PsiNewExpression expression) { super.visitNewExpression(expression); if (!TypeUtils.expressionHasTypeOrSubtype(expression, - JavaClassNames.JAVA_LANG_THROWABLE)) { + CommonClassNames.JAVA_LANG_THROWABLE)) { return; } final PsiElement parent = getParent(expression.getParent()); @@ -181,20 +181,17 @@ private static PsiElement skipInitCause(PsiElement parent) { if (!"initCause".equals(methodName)) { return null; } - final PsiMethod method = - methodCallExpression.resolveMethod(); + final PsiMethod method = methodCallExpression.resolveMethod(); if (method == null) { return null; } - final PsiParameterList parameterList = - method.getParameterList(); + final PsiParameterList parameterList = method.getParameterList(); if (parameterList.getParametersCount() != 1) { return null; } - final PsiParameter[] parameters = - parameterList.getParameters(); + final PsiParameter[] parameters = parameterList.getParameters(); final PsiType type = parameters[0].getType(); - if (!type.equalsToText(JavaClassNames.JAVA_LANG_THROWABLE)) { + if (!type.equalsToText(CommonClassNames.JAVA_LANG_THROWABLE)) { return null; } return getParent(methodCallExpression.getParent()); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ThrowableResultOfMethodCallIgnoredInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ThrowableResultOfMethodCallIgnoredInspection.java index 6d808c5e56..317dd252e8 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ThrowableResultOfMethodCallIgnoredInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ThrowableResultOfMethodCallIgnoredInspection.java @@ -16,17 +16,17 @@ package com.intellij.java.impl.ig.bugs; import com.intellij.java.language.psi.*; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.psi.*; -import consulo.language.psi.search.ReferencesSearch; import com.intellij.java.language.psi.util.InheritanceUtil; -import consulo.language.psi.util.PsiTreeUtil; -import consulo.application.util.query.Query; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; -import consulo.java.language.module.util.JavaClassNames; +import consulo.annotation.component.ExtensionImpl; +import consulo.application.util.query.Query; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiReference; +import consulo.language.psi.search.ReferencesSearch; +import consulo.language.psi.util.PsiTreeUtil; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -73,8 +73,7 @@ public void visitMethodCallExpression( parent instanceof PsiExpressionList) { return; } - if (!TypeUtils.expressionHasTypeOrSubtype(expression, - JavaClassNames.JAVA_LANG_THROWABLE)) { + if (!TypeUtils.expressionHasTypeOrSubtype(expression, CommonClassNames.JAVA_LANG_THROWABLE)) { return; } final PsiMethod method = expression.resolveMethod(); @@ -83,8 +82,7 @@ public void visitMethodCallExpression( } if (!method.hasModifierProperty(PsiModifier.STATIC)) { final PsiClass containingClass = method.getContainingClass(); - if (InheritanceUtil.isInheritor(containingClass, - JavaClassNames.JAVA_LANG_THROWABLE)) { + if (InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_LANG_THROWABLE)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/UseOfPropertiesAsHashtableInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/UseOfPropertiesAsHashtableInspection.java index ec35282d29..ece9dd5125 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/UseOfPropertiesAsHashtableInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/UseOfPropertiesAsHashtableInspection.java @@ -24,7 +24,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -62,8 +61,7 @@ protected InspectionGadgetsFix buildFix(Object... infos) { final PsiExpression[] arguments = argumentList.getExpressions(); for (PsiExpression argument : arguments) { final PsiType type = argument.getType(); - if (type == null || - !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return null; } } @@ -168,8 +166,7 @@ public void visitMethodCallExpression( if (qualifier == null) { return; } - if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, - JavaClassNames.JAVA_UTIL_PROPERTIES)) { + if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, CommonClassNames.JAVA_UTIL_PROPERTIES)) { return; } registerMethodCallError(expression, expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ThrowsRuntimeExceptionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ThrowsRuntimeExceptionInspection.java index d65092d7f6..eaa6d09069 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ThrowsRuntimeExceptionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ThrowsRuntimeExceptionInspection.java @@ -25,7 +25,6 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.documentation.CodeDocumentationProvider; import consulo.language.editor.documentation.CompositeDocumentationProvider; import consulo.language.editor.documentation.DocumentationProvider; @@ -195,7 +194,7 @@ public void visitMethod(PsiMethod method) { continue; } final PsiClass aClass = (PsiClass)target; - if (!InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { continue; } final String className = aClass.getName(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/UncheckedExceptionClassInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/UncheckedExceptionClassInspection.java index 3be4dbb714..7500941a04 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/UncheckedExceptionClassInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/UncheckedExceptionClassInspection.java @@ -15,13 +15,13 @@ */ package com.intellij.java.impl.ig.errorhandling; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.util.InheritanceUtil; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -49,14 +49,11 @@ private static class UncheckedExceptionClassVisitor @Override public void visitClass(@Nonnull PsiClass aClass) { - if (!InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_THROWABLE)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_THROWABLE)) { return; } - if (InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_EXCEPTION) && - !InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { + if (InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_EXCEPTION) && + !InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { return; } registerClassError(aClass); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/VarargParameterInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/VarargParameterInspection.java index 7e9e20d46b..d2abb4227e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/VarargParameterInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/VarargParameterInspection.java @@ -24,7 +24,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.application.util.query.Query; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -104,7 +103,7 @@ protected void doFix(Project project, ProblemDescriptor descriptor) { if (typeElement == null) { return; } - final PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, JavaClassNames.JAVA_LANG_SAFE_VARARGS); + final PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, CommonClassNames.JAVA_LANG_SAFE_VARARGS); if (annotation != null) { annotation.delete(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/junit/UnconstructableTestCaseInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/junit/UnconstructableTestCaseInspection.java index 7de744656e..32c2bf1932 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/junit/UnconstructableTestCaseInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/junit/UnconstructableTestCaseInspection.java @@ -22,7 +22,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -87,8 +86,7 @@ public void visitClass(@Nonnull PsiClass aClass) { final PsiParameter[] parameters = parameterList.getParameters(); final PsiType type = parameters[0].getType(); - if (TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, - type)) { + if (TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, type)) { hasStringConstructor = true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java index f04c05a207..1989e2f917 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java @@ -24,7 +24,6 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiComment; @@ -476,7 +475,7 @@ private static boolean isAutoCloseable(PsiVariable variable) { } final PsiClassType classType = (PsiClassType)type; final PsiClass aClass = classType.resolve(); - return aClass != null && InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE); + return aClass != null && InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE); } static int findInitialization(PsiElement[] elements, PsiVariable variable, diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/UnnecessaryUnboxingInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/UnnecessaryUnboxingInspection.java index 46e4176efe..89f7caea3c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/UnnecessaryUnboxingInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/UnnecessaryUnboxingInspection.java @@ -28,7 +28,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; @@ -55,14 +54,14 @@ public class UnnecessaryUnboxingInspection extends BaseInspection static { - s_unboxingMethods.put(JavaClassNames.JAVA_LANG_INTEGER, "intValue"); - s_unboxingMethods.put(JavaClassNames.JAVA_LANG_SHORT, "shortValue"); - s_unboxingMethods.put(JavaClassNames.JAVA_LANG_BOOLEAN, "booleanValue"); - s_unboxingMethods.put(JavaClassNames.JAVA_LANG_LONG, "longValue"); - s_unboxingMethods.put(JavaClassNames.JAVA_LANG_BYTE, "byteValue"); - s_unboxingMethods.put(JavaClassNames.JAVA_LANG_FLOAT, "floatValue"); - s_unboxingMethods.put(JavaClassNames.JAVA_LANG_DOUBLE, "doubleValue"); - s_unboxingMethods.put(JavaClassNames.JAVA_LANG_CHARACTER, "charValue"); + s_unboxingMethods.put(CommonClassNames.JAVA_LANG_INTEGER, "intValue"); + s_unboxingMethods.put(CommonClassNames.JAVA_LANG_SHORT, "shortValue"); + s_unboxingMethods.put(CommonClassNames.JAVA_LANG_BOOLEAN, "booleanValue"); + s_unboxingMethods.put(CommonClassNames.JAVA_LANG_LONG, "longValue"); + s_unboxingMethods.put(CommonClassNames.JAVA_LANG_BYTE, "byteValue"); + s_unboxingMethods.put(CommonClassNames.JAVA_LANG_FLOAT, "floatValue"); + s_unboxingMethods.put(CommonClassNames.JAVA_LANG_DOUBLE, "doubleValue"); + s_unboxingMethods.put(CommonClassNames.JAVA_LANG_CHARACTER, "charValue"); } @Override @@ -133,7 +132,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) return; } final String classname = containingClass.getQualifiedName(); - if(JavaClassNames.JAVA_LANG_BOOLEAN.equals(classname)) + if(CommonClassNames.JAVA_LANG_BOOLEAN.equals(classname)) { @NonNls final String name = field.getName(); if("TRUE".equals(name)) diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/WhileCanBeForeachInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/WhileCanBeForeachInspection.java index f832d5c38e..cd857e593b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/WhileCanBeForeachInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/WhileCanBeForeachInspection.java @@ -32,7 +32,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.application.util.query.Query; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleSettingsManager; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.editor.refactoring.rename.SuggestedNameInfo; @@ -383,7 +382,7 @@ private static boolean isCollectionLoopStatement(PsiWhileStatement whileStatemen return false; } final PsiVariable variable = (PsiVariable)declaredElement; - if (!TypeUtils.variableHasTypeOrSubtype(variable, JavaClassNames.JAVA_UTIL_ITERATOR, "java.util.ListIterator")) { + if (!TypeUtils.variableHasTypeOrSubtype(variable, CommonClassNames.JAVA_UTIL_ITERATOR, "java.util.ListIterator")) { return false; } final PsiExpression initialValue = variable.getInitializer(); @@ -416,8 +415,8 @@ private static boolean isCollectionLoopStatement(PsiWhileStatement whileStatemen if (qualifierClass == null) { return false; } - if (!InheritanceUtil.isInheritor(qualifierClass, JavaClassNames.JAVA_LANG_ITERABLE) && - !InheritanceUtil.isInheritor(qualifierClass, JavaClassNames.JAVA_UTIL_COLLECTION)) { + if (!InheritanceUtil.isInheritor(qualifierClass, CommonClassNames.JAVA_LANG_ITERABLE) && + !InheritanceUtil.isInheritor(qualifierClass, CommonClassNames.JAVA_UTIL_COLLECTION)) { return false; } final PsiExpression condition = whileStatement.getCondition(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspectionBase.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspectionBase.java index 431ab11d83..7333979a7a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspectionBase.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspectionBase.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.ConstructionUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; @@ -107,7 +106,7 @@ else if(!ConstructionUtils.isEmptyArrayInitializer(argument)) return; } final PsiClass containingClass = method.getContainingClass(); - if(!InheritanceUtil.isInheritor(containingClass, JavaClassNames.JAVA_UTIL_COLLECTION)) + if(!InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_UTIL_COLLECTION)) { return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java index 10412b8ae5..da807e2a99 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.util.IncorrectOperationException; import consulo.localize.LocalizeValue; @@ -46,13 +45,13 @@ public class UnnecessaryTemporaryOnConversionFromStringInspection new HashMap(7); static { - s_conversionMap.put(JavaClassNames.JAVA_LANG_BOOLEAN, "valueOf"); - s_conversionMap.put(JavaClassNames.JAVA_LANG_BYTE, "parseByte"); - s_conversionMap.put(JavaClassNames.JAVA_LANG_DOUBLE, "parseDouble"); - s_conversionMap.put(JavaClassNames.JAVA_LANG_FLOAT, "parseFloat"); - s_conversionMap.put(JavaClassNames.JAVA_LANG_INTEGER, "parseInt"); - s_conversionMap.put(JavaClassNames.JAVA_LANG_LONG, "parseLong"); - s_conversionMap.put(JavaClassNames.JAVA_LANG_SHORT, "parseShort"); + s_conversionMap.put(CommonClassNames.JAVA_LANG_BOOLEAN, "valueOf"); + s_conversionMap.put(CommonClassNames.JAVA_LANG_BYTE, "parseByte"); + s_conversionMap.put(CommonClassNames.JAVA_LANG_DOUBLE, "parseDouble"); + s_conversionMap.put(CommonClassNames.JAVA_LANG_FLOAT, "parseFloat"); + s_conversionMap.put(CommonClassNames.JAVA_LANG_INTEGER, "parseInt"); + s_conversionMap.put(CommonClassNames.JAVA_LANG_LONG, "parseLong"); + s_conversionMap.put(CommonClassNames.JAVA_LANG_SHORT, "parseShort"); } @Override @@ -99,7 +98,7 @@ static String calculateReplacementExpression( final String qualifierType = type.getPresentableText(); final String canonicalType = type.getCanonicalText(); final String conversionName = s_conversionMap.get(canonicalType); - if (TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_BOOLEAN, type)) { + if (TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_BOOLEAN, type)) { if (!PsiUtil.isLanguageLevel5OrHigher(expression)) { return qualifierType + '.' + conversionName + '(' + arg.getText() + ").booleanValue()"; @@ -172,13 +171,13 @@ private static class UnnecessaryTemporaryObjectVisitor new HashMap(7); static { - s_basicTypeMap.put(JavaClassNames.JAVA_LANG_BOOLEAN, "booleanValue"); - s_basicTypeMap.put(JavaClassNames.JAVA_LANG_BYTE, "byteValue"); - s_basicTypeMap.put(JavaClassNames.JAVA_LANG_DOUBLE, "doubleValue"); - s_basicTypeMap.put(JavaClassNames.JAVA_LANG_FLOAT, "floatValue"); - s_basicTypeMap.put(JavaClassNames.JAVA_LANG_INTEGER, "intValue"); - s_basicTypeMap.put(JavaClassNames.JAVA_LANG_LONG, "longValue"); - s_basicTypeMap.put(JavaClassNames.JAVA_LANG_SHORT, "shortValue"); + s_basicTypeMap.put(CommonClassNames.JAVA_LANG_BOOLEAN, "booleanValue"); + s_basicTypeMap.put(CommonClassNames.JAVA_LANG_BYTE, "byteValue"); + s_basicTypeMap.put(CommonClassNames.JAVA_LANG_DOUBLE, "doubleValue"); + s_basicTypeMap.put(CommonClassNames.JAVA_LANG_FLOAT, "floatValue"); + s_basicTypeMap.put(CommonClassNames.JAVA_LANG_INTEGER, "intValue"); + s_basicTypeMap.put(CommonClassNames.JAVA_LANG_LONG, "longValue"); + s_basicTypeMap.put(CommonClassNames.JAVA_LANG_SHORT, "shortValue"); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java index 13177b4510..3c82d42fc0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java @@ -136,14 +136,14 @@ private static class UnnecessaryTemporaryObjectVisitor private static final Set s_basicTypes = new HashSet(8); static { - s_basicTypes.add(JavaClassNames.JAVA_LANG_BOOLEAN); - s_basicTypes.add(JavaClassNames.JAVA_LANG_BYTE); - s_basicTypes.add(JavaClassNames.JAVA_LANG_CHARACTER); - s_basicTypes.add(JavaClassNames.JAVA_LANG_DOUBLE); - s_basicTypes.add(JavaClassNames.JAVA_LANG_FLOAT); - s_basicTypes.add(JavaClassNames.JAVA_LANG_INTEGER); - s_basicTypes.add(JavaClassNames.JAVA_LANG_LONG); - s_basicTypes.add(JavaClassNames.JAVA_LANG_SHORT); + s_basicTypes.add(CommonClassNames.JAVA_LANG_BOOLEAN); + s_basicTypes.add(CommonClassNames.JAVA_LANG_BYTE); + s_basicTypes.add(CommonClassNames.JAVA_LANG_CHARACTER); + s_basicTypes.add(CommonClassNames.JAVA_LANG_DOUBLE); + s_basicTypes.add(CommonClassNames.JAVA_LANG_FLOAT); + s_basicTypes.add(CommonClassNames.JAVA_LANG_INTEGER); + s_basicTypes.add(CommonClassNames.JAVA_LANG_LONG); + s_basicTypes.add(CommonClassNames.JAVA_LANG_SHORT); } @Override @@ -174,9 +174,7 @@ public void visitMethodCallExpression( } final PsiExpression argument = arguments[0]; final PsiType argumentType = argument.getType(); - if (argumentType != null && - argumentType.equalsToText( - JavaClassNames.JAVA_LANG_STRING)) { + if (argumentType != null && argumentType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return; } final PsiType type = qualifier.getType(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/SwitchUtils.java b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/SwitchUtils.java index 80b628c8b2..f46f957695 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/SwitchUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/SwitchUtils.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.ig.psiutils.SideEffectChecker; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiErrorElement; @@ -147,8 +146,8 @@ private static boolean canBeSwitchExpression(PsiExpression expression, LanguageL if (PsiType.CHAR.equals(type) || PsiType.BYTE.equals(type) || PsiType.SHORT.equals(type) || PsiType.INT.equals(type)) { return true; } else if (type instanceof PsiClassType) { - if (type.equalsToText(JavaClassNames.JAVA_LANG_CHARACTER) || type.equalsToText(JavaClassNames.JAVA_LANG_BYTE) || - type.equalsToText(JavaClassNames.JAVA_LANG_SHORT) || type.equalsToText(JavaClassNames.JAVA_LANG_INTEGER)) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_CHARACTER) || type.equalsToText(CommonClassNames.JAVA_LANG_BYTE) || + type.equalsToText(CommonClassNames.JAVA_LANG_SHORT) || type.equalsToText(CommonClassNames.JAVA_LANG_INTEGER)) { return true; } if (languageLevel.isAtLeast(LanguageLevel.JDK_1_5)) { @@ -158,7 +157,7 @@ private static boolean canBeSwitchExpression(PsiExpression expression, LanguageL return true; } } - if (languageLevel.isAtLeast(LanguageLevel.JDK_1_7) && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (languageLevel.isAtLeast(LanguageLevel.JDK_1_7) && type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return true; } } @@ -211,7 +210,7 @@ private static PsiExpression determinePossibleStringSwitchExpression(PsiExpressi return null; } final PsiType type = qualifierExpression.getType(); - if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return null; } final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); @@ -221,7 +220,7 @@ private static PsiExpression determinePossibleStringSwitchExpression(PsiExpressi } final PsiExpression argument = arguments[0]; final PsiType argumentType = argument.getType(); - if (argumentType == null || !argumentType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (argumentType == null || !argumentType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return null; } if (PsiUtil.isConstantExpression(qualifierExpression)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/WeakestTypeFinder.java b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/WeakestTypeFinder.java index 09460941f1..08fa1b9357 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/WeakestTypeFinder.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/WeakestTypeFinder.java @@ -19,23 +19,22 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.util.lang.Comparing; +import com.siyeh.HardcodedMethodConstants; +import com.siyeh.ig.psiutils.ExpectedTypeUtils; +import com.siyeh.ig.psiutils.TypeUtils; +import consulo.application.util.query.Query; +import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.psi.search.ReferencesSearch; -import consulo.language.ast.IElementType; import consulo.language.psi.util.PsiTreeUtil; import consulo.util.collection.ArrayUtil; -import consulo.application.util.query.Query; -import com.siyeh.HardcodedMethodConstants; -import com.siyeh.ig.psiutils.ExpectedTypeUtils; -import com.siyeh.ig.psiutils.TypeUtils; -import consulo.java.language.module.util.JavaClassNames; -import org.jetbrains.annotations.NonNls; - +import consulo.util.lang.Comparing; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; + import java.util.*; public class WeakestTypeFinder { @@ -73,7 +72,7 @@ public static Collection calculateWeakestClassesNecessary(@Nonnull Psi final JavaPsiFacade facade = JavaPsiFacade.getInstance(variableOrMethod.getProject()); final PsiClass lowerBoundClass; if (variableOrMethod instanceof PsiResourceVariable) { - lowerBoundClass = facade.findClass(JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE, scope); + lowerBoundClass = facade.findClass(CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, scope); if (lowerBoundClass == null || variableOrMethodClass.equals(lowerBoundClass)) { return Collections.emptyList(); } @@ -86,7 +85,7 @@ public static Collection calculateWeakestClassesNecessary(@Nonnull Psi return Collections.emptyList(); } } else { - lowerBoundClass = facade.findClass(JavaClassNames.JAVA_LANG_OBJECT, scope); + lowerBoundClass = facade.findClass(CommonClassNames.JAVA_LANG_OBJECT, scope); if (lowerBoundClass == null || variableOrMethodClass.equals(lowerBoundClass)) { return Collections.emptyList(); } @@ -136,7 +135,7 @@ public static Collection calculateWeakestClassesNecessary(@Nonnull Psi if (!Comparing.equal(foreachStatement.getIteratedValue(), referenceElement)) { return Collections.emptyList(); } - final PsiClass javaLangIterableClass = facade.findClass(JavaClassNames.JAVA_LANG_ITERABLE, scope); + final PsiClass javaLangIterableClass = facade.findClass(CommonClassNames.JAVA_LANG_ITERABLE, scope); if (javaLangIterableClass == null) { return Collections.emptyList(); } @@ -286,8 +285,8 @@ private static boolean findWeakestType(PsiElement referenceElement, HardcodedMethodConstants.INDEX_OF.equals(methodName) || HardcodedMethodConstants.LAST_INDEX_OF.equals(methodName)) { final PsiClass containingClass = method.getContainingClass(); - if (InheritanceUtil.isInheritor(containingClass, JavaClassNames.JAVA_UTIL_MAP) || - InheritanceUtil.isInheritor(containingClass, JavaClassNames.JAVA_UTIL_COLLECTION)) { + if (InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_UTIL_MAP) || + InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_UTIL_COLLECTION)) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (qualifier != null) { @@ -428,7 +427,7 @@ private static boolean findWeakestType(PsiArrayInitializerExpression arrayInitia private static boolean findWeakestType(PsiThrowStatement throwStatement, PsiClass variableOrMethodClass, Set weakestTypeClasses) { - final PsiClassType runtimeExceptionType = TypeUtils.getType(JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, throwStatement); + final PsiClassType runtimeExceptionType = TypeUtils.getType(CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, throwStatement); final PsiClass runtimeExceptionClass = runtimeExceptionType.resolve(); if (runtimeExceptionClass != null && InheritanceUtil.isInheritorOrSelf(variableOrMethodClass, runtimeExceptionClass, true)) { if (!checkType(runtimeExceptionType, weakestTypeClasses)) { @@ -478,8 +477,8 @@ private static boolean throwsIncompatibleException(PsiMethod method, Collection< if (aClass == null) { return true; } - if (!InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION) && - !InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_ERROR)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION) + && !InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_ERROR)) { return true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/SystemPropertiesInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/SystemPropertiesInspection.java index c26a818f54..59d7edeb0e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/SystemPropertiesInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/SystemPropertiesInspection.java @@ -15,15 +15,11 @@ */ package com.intellij.java.impl.ig.security; -import com.intellij.java.language.psi.PsiClass; -import com.intellij.java.language.psi.PsiMethod; -import com.intellij.java.language.psi.PsiMethodCallExpression; -import com.intellij.java.language.psi.PsiReferenceExpression; +import com.intellij.java.language.psi.*; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -132,7 +128,7 @@ private static boolean isIntegerGetInteger( if (className == null) { return false; } - return JavaClassNames.JAVA_LANG_INTEGER.equals(className); + return CommonClassNames.JAVA_LANG_INTEGER.equals(className); } private static boolean isBooleanGetBoolean( @@ -156,7 +152,7 @@ private static boolean isBooleanGetBoolean( if (className == null) { return false; } - return JavaClassNames.JAVA_LANG_BOOLEAN.equals(className); + return CommonClassNames.JAVA_LANG_BOOLEAN.equals(className); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/UnsecureRandomNumberGenerationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/UnsecureRandomNumberGenerationInspection.java index ffef8273f5..5492b9ec17 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/UnsecureRandomNumberGenerationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/UnsecureRandomNumberGenerationInspection.java @@ -21,7 +21,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -103,7 +102,7 @@ public void visitMethodCallExpression( return; } final String className = containingClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_MATH.equals(className)) { + if (!CommonClassNames.JAVA_LANG_MATH.equals(className)) { return; } registerMethodCallError(expression, expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/TypeParameterExtendsObjectInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/TypeParameterExtendsObjectInspection.java index 04316c9e3a..5e7b250a5c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/TypeParameterExtendsObjectInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/TypeParameterExtendsObjectInspection.java @@ -22,7 +22,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -122,7 +121,7 @@ public void visitTypeParameter(PsiTypeParameter parameter) { return; } final PsiClassType extendsType = extendsListTypes[0]; - if (!extendsType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (!extendsType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return; } final PsiIdentifier nameIdentifier = parameter.getNameIdentifier(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryCallToStringValueOfInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryCallToStringValueOfInspection.java index 577043761c..cb3e2bca93 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryCallToStringValueOfInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryCallToStringValueOfInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -61,7 +60,7 @@ public static String calculateReplacementText(PsiExpression expression) { return expression.getText(); } final PsiType type = expression.getType(); - if (TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, type) || + if (TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, type) || ParenthesesUtils.getPrecedence(expression) < ParenthesesUtils.ADDITIVE_PRECEDENCE) { return expression.getText(); } @@ -134,7 +133,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) { return; } final String qualifiedName = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(qualifiedName)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(qualifiedName)) { return; } registerError(expression, calculateReplacementText(argument)); @@ -145,7 +144,7 @@ private boolean isCallToStringValueOfNecessary(PsiMethodCallExpression expressio if (parent instanceof PsiPolyadicExpression) { final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiType type = polyadicExpression.getType(); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, type)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, type)) { return true; } final PsiExpression[] operands = polyadicExpression.getOperands(); @@ -157,11 +156,11 @@ private boolean isCallToStringValueOfNecessary(PsiMethodCallExpression expressio } } if (index > 0) { - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, operands[index - 1].getType())) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, operands[index - 1].getType())) { return true; } } else if (operands.length > 1) { - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, operands[index + 1].getType())) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, operands[index + 1].getType())) { return true; } } else { @@ -181,7 +180,7 @@ private boolean isCallToStringValueOfNecessary(PsiMethodCallExpression expressio if (expressions.length < 2 || !expression.equals(ParenthesesUtils.stripParentheses(expressions[1]))) { return true; } - if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER)) { + if (!isCallToMethodIn(methodCallExpression, CommonClassNames.JAVA_LANG_STRING_BUILDER, CommonClassNames.JAVA_LANG_STRING_BUFFER)) { return true; } @@ -189,11 +188,11 @@ private boolean isCallToStringValueOfNecessary(PsiMethodCallExpression expressio if (expressions.length < 1 || !expression.equals(ParenthesesUtils.stripParentheses(expressions[0]))) { return true; } - if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER)) { + if (!isCallToMethodIn(methodCallExpression, CommonClassNames.JAVA_LANG_STRING_BUILDER, CommonClassNames.JAVA_LANG_STRING_BUFFER)) { return true; } } else if ("print".equals(name) || "println".equals(name)) { - if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_IO_PRINT_STREAM, JavaClassNames.JAVA_IO_PRINT_WRITER)) { + if (!isCallToMethodIn(methodCallExpression, CommonClassNames.JAVA_IO_PRINT_STREAM, CommonClassNames.JAVA_IO_PRINT_WRITER)) { return true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java index 485402a194..f9b7aa5592 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java @@ -126,7 +126,7 @@ private boolean isToStringCallNecessary(PsiMethodCallExpression expression) { if (parent instanceof PsiPolyadicExpression) { final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiType type = polyadicExpression.getType(); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, type)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, type)) { return true; } final PsiExpression[] operands = polyadicExpression.getOperands(); @@ -138,11 +138,11 @@ private boolean isToStringCallNecessary(PsiMethodCallExpression expression) { } } if (index > 0) { - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, operands[index - 1].getType())) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, operands[index - 1].getType())) { return true; } } else if (operands.length > 1) { - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, operands[index + 1].getType())) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, operands[index + 1].getType())) { return true; } } else { @@ -162,7 +162,7 @@ private boolean isToStringCallNecessary(PsiMethodCallExpression expression) { if (expressions.length < 2 || !expression.equals(ParenthesesUtils.stripParentheses(expressions[1]))) { return true; } - if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER)) { + if (!isCallToMethodIn(methodCallExpression, CommonClassNames.JAVA_LANG_STRING_BUILDER, CommonClassNames.JAVA_LANG_STRING_BUFFER)) { return true; } @@ -170,11 +170,11 @@ private boolean isToStringCallNecessary(PsiMethodCallExpression expression) { if (expressions.length < 1 || !expression.equals(ParenthesesUtils.stripParentheses(expressions[0]))) { return true; } - if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER)) { + if (!isCallToMethodIn(methodCallExpression, CommonClassNames.JAVA_LANG_STRING_BUILDER, CommonClassNames.JAVA_LANG_STRING_BUFFER)) { return true; } } else if ("print".equals(name) || "println".equals(name)) { - if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_IO_PRINT_STREAM, JavaClassNames.JAVA_IO_PRINT_WRITER)) { + if (!isCallToMethodIn(methodCallExpression, CommonClassNames.JAVA_IO_PRINT_STREAM, CommonClassNames.JAVA_IO_PRINT_WRITER)) { return true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/threading/SynchronizedOnLiteralObjectInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/threading/SynchronizedOnLiteralObjectInspection.java index 9222cd2030..930bbb22a5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/threading/SynchronizedOnLiteralObjectInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/threading/SynchronizedOnLiteralObjectInspection.java @@ -23,7 +23,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; @@ -84,10 +83,10 @@ public void visitSynchronizedStatement(@Nonnull PsiSynchronizedStatement stateme if (type == null) { return; } - if (!type.equalsToText(JavaClassNames.JAVA_LANG_STRING) && - !type.equalsToText(JavaClassNames.JAVA_LANG_BOOLEAN) && - !type.equalsToText(JavaClassNames.JAVA_LANG_CHARACTER)) { - final PsiClassType javaLangNumberType = TypeUtils.getType(JavaClassNames.JAVA_LANG_NUMBER, statement); + if (!type.equalsToText(CommonClassNames.JAVA_LANG_STRING) && + !type.equalsToText(CommonClassNames.JAVA_LANG_BOOLEAN) && + !type.equalsToText(CommonClassNames.JAVA_LANG_CHARACTER)) { + final PsiClassType javaLangNumberType = TypeUtils.getType(CommonClassNames.JAVA_LANG_NUMBER, statement); if (!javaLangNumberType.isAssignableFrom(type)) { return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/threading/ThreadWithDefaultRunMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/threading/ThreadWithDefaultRunMethodInspection.java index c5bcd75dab..94841c5025 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/threading/ThreadWithDefaultRunMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/threading/ThreadWithDefaultRunMethodInspection.java @@ -22,7 +22,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; @@ -80,7 +79,7 @@ public void visitNewExpression(@Nonnull PsiNewExpression expression) { } final PsiExpression[] arguments = argumentList.getExpressions(); for (PsiExpression argument : arguments) { - if (TypeUtils.expressionHasTypeOrSubtype(argument, JavaClassNames.JAVA_LANG_RUNNABLE)) { + if (TypeUtils.expressionHasTypeOrSubtype(argument, CommonClassNames.JAVA_LANG_RUNNABLE)) { return; } } @@ -109,7 +108,7 @@ public void visitNewExpression(@Nonnull PsiNewExpression expression) { } final PsiExpression[] arguments = argumentList.getExpressions(); for (PsiExpression argument : arguments) { - if (TypeUtils.expressionHasTypeOrSubtype(argument, JavaClassNames.JAVA_LANG_RUNNABLE)) { + if (TypeUtils.expressionHasTypeOrSubtype(argument, CommonClassNames.JAVA_LANG_RUNNABLE)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/threading/WaitNotInSynchronizedContextInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/threading/WaitNotInSynchronizedContextInspection.java index 6916e147c1..74ab5780b3 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/threading/WaitNotInSynchronizedContextInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/threading/WaitNotInSynchronizedContextInspection.java @@ -16,14 +16,13 @@ package com.intellij.java.impl.ig.threading; import com.intellij.java.language.psi.*; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.psi.*; -import consulo.language.psi.util.PsiTreeUtil; import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import consulo.java.language.module.util.JavaClassNames; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.psi.PsiElement; +import consulo.language.psi.util.PsiTreeUtil; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; @@ -88,7 +87,7 @@ public void visitMethodCallExpression( return; } final String qualifiedName = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_OBJECT.equals(qualifiedName)) { + if (!CommonClassNames.JAVA_LANG_OBJECT.equals(qualifiedName)) { return; } final PsiExpression qualifier = diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/switchtoif/SwitchUtils.java b/plugin/src/main/java/com/intellij/java/impl/ipp/switchtoif/SwitchUtils.java index bd8d5005a3..fe14382bb0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/switchtoif/SwitchUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/switchtoif/SwitchUtils.java @@ -15,18 +15,18 @@ */ package com.intellij.java.impl.ipp.switchtoif; -import com.intellij.java.language.psi.*; -import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nullable; +import com.intellij.java.impl.ipp.psiutils.EquivalenceChecker; import com.intellij.java.language.LanguageLevel; -import consulo.language.psi.*; -import consulo.language.ast.IElementType; -import consulo.language.psi.util.PsiTreeUtil; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.ig.psiutils.SideEffectChecker; -import com.intellij.java.impl.ipp.psiutils.EquivalenceChecker; -import consulo.java.language.module.util.JavaClassNames; +import consulo.language.ast.IElementType; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiReference; +import consulo.language.psi.util.PsiTreeUtil; +import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; class SwitchUtils { @@ -93,8 +93,8 @@ private static boolean canBeSwitchExpression(PsiExpression expression, LanguageL return true; } else if (type instanceof PsiClassType) { - if (type.equalsToText(JavaClassNames.JAVA_LANG_CHARACTER) || type.equalsToText(JavaClassNames.JAVA_LANG_BYTE) || - type.equalsToText(JavaClassNames.JAVA_LANG_SHORT) || type.equalsToText(JavaClassNames.JAVA_LANG_INTEGER)) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_CHARACTER) || type.equalsToText(CommonClassNames.JAVA_LANG_BYTE) || + type.equalsToText(CommonClassNames.JAVA_LANG_SHORT) || type.equalsToText(CommonClassNames.JAVA_LANG_INTEGER)) { return true; } if (languageLevel.isAtLeast(LanguageLevel.JDK_1_5)) { @@ -104,7 +104,7 @@ else if (type instanceof PsiClassType) { return true; } } - if (languageLevel.isAtLeast(LanguageLevel.JDK_1_7) && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (languageLevel.isAtLeast(LanguageLevel.JDK_1_7) && type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return true; } } @@ -159,7 +159,7 @@ private static PsiExpression determinePossibleStringSwitchExpression(PsiExpressi return null; } final PsiType type = qualifierExpression.getType(); - if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return null; } final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); @@ -169,7 +169,7 @@ private static PsiExpression determinePossibleStringSwitchExpression(PsiExpressi } final PsiExpression argument = arguments[0]; final PsiType argumentType = argument.getType(); - if (argumentType == null || !argumentType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (argumentType == null || !argumentType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return null; } if (PsiUtil.isConstantExpression(qualifierExpression)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java index 2f550171f0..a0f07f29be 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java @@ -33,7 +33,6 @@ import consulo.application.ApplicationManager; import consulo.application.progress.ProgressManager; import consulo.application.util.function.Processor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.refactoring.BaseRefactoringProcessor; import consulo.language.editor.refactoring.localize.RefactoringLocalize; import consulo.language.editor.refactoring.rename.AutomaticRenamingDialog; @@ -404,7 +403,7 @@ private void checkToArray(PsiElement ref, PsiNewExpression newExpression) { PsiElement tmp; final PsiClass javaUtilCollectionClass = - JavaPsiFacade.getInstance(myManager.getProject()).findClass(JavaClassNames.JAVA_UTIL_COLLECTION, ref.getResolveScope()); + JavaPsiFacade.getInstance(myManager.getProject()).findClass(CommonClassNames.JAVA_UTIL_COLLECTION, ref.getResolveScope()); if (javaUtilCollectionClass == null) return; tmp = newExpression.getParent(); if (!(tmp instanceof PsiExpressionList)) return; @@ -508,7 +507,7 @@ void linkInheritors(final PsiMethod[] methods) { } else if (variable instanceof PsiResourceVariable) { final PsiJavaParserFacade facade = JavaPsiFacade.getInstance(myProject).getParserFacade(); - checkConstrainingType(type, facade.createTypeFromText(JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE, variable)); + checkConstrainingType(type, facade.createTypeFromText(CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, variable)); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/Util.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/Util.java index f8e9f221a7..fdf8b691e6 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/Util.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/Util.java @@ -20,7 +20,6 @@ import com.intellij.java.language.impl.psi.PsiTypeVariable; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; import consulo.language.psi.scope.GlobalSearchScope; @@ -87,7 +86,7 @@ else if (t instanceof PsiClassType) { return null; } - if (pp == Bottom.BOTTOM || (objectBottom && pp.getCanonicalText().equals(JavaClassNames.JAVA_LANG_OBJECT))) { + if (pp == Bottom.BOTTOM || (objectBottom && pp.getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT))) { anyBottom = true; } @@ -280,7 +279,7 @@ private static PsiType createParameterizedType(final PsiType t, final PsiTypeVariableFactory factory, final boolean upper, final PsiElement context) { - if (t == null || (upper && t.getCanonicalText().equals(JavaClassNames.JAVA_LANG_OBJECT))) { + if (t == null || (upper && t.getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT))) { return factory.create(context); } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/builder/SystemBuilder.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/builder/SystemBuilder.java index ecf41b9c16..2ab319b8ad 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/builder/SystemBuilder.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/builder/SystemBuilder.java @@ -27,7 +27,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.content.scope.SearchScope; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.impl.psi.PsiAnchor; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; @@ -907,7 +906,7 @@ private void addBoundConstraints(final ReductionSystem system, final PsiType def if (elemenType != null) { addBoundConstraintsImpl(definedType, elemenType, system); - if (mySettings.cookObjects() && elemenType.getCanonicalText().equals(JavaClassNames.JAVA_LANG_OBJECT)) { + if (mySettings.cookObjects() && elemenType.getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT)) { system.addSubtypeConstraint(definedType, elemenType); } } @@ -1014,7 +1013,7 @@ private void addForEachConstraint(final ReductionSystem system, final PsiForeach final PsiClass clazz = resolveResult.getElement(); if (clazz != null) { final PsiClass iterableClass = - JavaPsiFacade.getInstance(clazz.getProject()).findClass(JavaClassNames.JAVA_LANG_ITERABLE, clazz.getResolveScope()); + JavaPsiFacade.getInstance(clazz.getProject()).findClass(CommonClassNames.JAVA_LANG_ITERABLE, clazz.getResolveScope()); if (iterableClass != null) { final PsiTypeParameter[] typeParameters = iterableClass.getTypeParameters(); if (typeParameters.length == 1) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/util/VictimCollector.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/util/VictimCollector.java index 119c9ee0a8..58727286b3 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/util/VictimCollector.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/util/VictimCollector.java @@ -15,11 +15,11 @@ */ package com.intellij.java.impl.refactoring.typeCook.deductive.util; -import com.intellij.java.language.psi.*; -import consulo.language.psi.*; import com.intellij.java.impl.refactoring.typeCook.Settings; import com.intellij.java.impl.refactoring.typeCook.Util; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.language.psi.*; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiFile; import java.util.HashSet; @@ -38,7 +38,7 @@ public VictimCollector(final PsiElement[] elements, final Settings settings) { private void testNAdd(final PsiElement element, final PsiType t) { if (Util.isRaw(t, mySettings)) { - if (element instanceof PsiNewExpression && t.getCanonicalText().equals(JavaClassNames.JAVA_LANG_OBJECT)){ + if (element instanceof PsiNewExpression && t.getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT)){ return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/TypeMigrationStatementProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/TypeMigrationStatementProcessor.java index 64cec8b82b..53b05e3ac6 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/TypeMigrationStatementProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/TypeMigrationStatementProcessor.java @@ -26,7 +26,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.application.util.function.CommonProcessors; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.NavigatablePsiElement; import consulo.language.psi.PsiElement; @@ -38,8 +37,8 @@ import consulo.logging.Logger; import consulo.project.Project; import consulo.util.lang.Pair; - import jakarta.annotation.Nonnull; + import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -317,7 +316,7 @@ public void visitForeachStatement(final PsiForeachStatement statement) { private PsiType getTargetTypeParameter(PsiClass iterableClass, PsiExpression value, TypeView typeView) { final Project project = iterableClass.getProject(); - final PsiClass itClass = JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_ITERABLE, GlobalSearchScope.allScope(project)); + final PsiClass itClass = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_ITERABLE, GlobalSearchScope.allScope(project)); if (itClass == null) { return null; }