From ca65f4e399d3b7e9b315ea8a4588a822aa485666 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 9 May 2025 20:29:47 +0300 Subject: [PATCH] Replacing JavaClassNames with CommonClassNames (part 6). --- .../ParameterNullityInferenceKt.java | 10 ++--- .../nullable/NullableStuffInspectionBase.java | 10 ++--- .../siyeh/ig/psiutils/MethodCallUtils.java | 9 ++--- .../com/siyeh/ig/psiutils/MethodUtils.java | 15 ++++---- .../siyeh/ig/psiutils/ParenthesesUtils.java | 6 +-- .../impl/settings/NodeRendererSettings.java | 12 +++--- .../impl/runners/ProcessProxyFactoryImpl.java | 4 +- .../impl/runners/ProcessProxyImpl.java | 4 +- .../config/MethodParameterInjection.java | 5 +-- .../java/language/psi/PsiClassType.java | 5 +-- .../java/language/psi/util/PropertyUtil.java | 11 +++--- .../language/psi/util/PropertyUtilBase.java | 7 ++-- .../psi/util/PsiConcatenationUtil.java | 15 ++++---- .../impl/codeInsight/MetaAnnotationUtil.java | 5 +-- .../OverrideImplementExploreUtil.java | 5 +-- .../impl/psi/impl/PsiClassImplUtil.java | 37 +++++++++---------- .../impl/psi/impl/PsiElementFactoryImpl.java | 9 ++--- .../language/impl/psi/impl/PsiImplUtil.java | 9 ++--- .../psi/impl/source/PsiEnumConstantImpl.java | 4 +- .../impl/psi/impl/source/PsiFieldImpl.java | 3 +- .../impl/codeInsight/MetaAnnotationUtil.java | 5 +-- .../completion/MethodReturnTypeProvider.java | 3 +- .../completion/PreferByKindWeigher.java | 25 ++++++------- .../completion/PreferMostUsedWeigher.java | 18 +++++---- ...ossibleHeapPollutionVarargsInspection.java | 26 ++++++------- .../method/MethodHierarchyTreeStructure.java | 3 +- .../PointlessBitwiseExpressionInspection.java | 4 +- ...atchedCollectionQueryUpdateInspection.java | 19 +++++----- ...hedStringBuilderQueryUpdateInspection.java | 9 ++--- ...tringBufferWithCharArgumentInspection.java | 3 +- .../ig/bugs/NumberEqualityInspection.java | 9 +---- .../ig/bugs/ObjectEqualityInspection.java | 7 ++-- .../ig/bugs/ObjectToStringInspection.java | 9 ++--- .../ig/bugs/ParameterClassCheckVisitor.java | 16 ++++---- ...MissingDeprecatedAnnotationInspection.java | 3 +- .../MissingOverrideAnnotationInspection.java | 4 +- .../PointlessBooleanExpressionInspection.java | 24 ++++++------ ...ewExceptionWithoutArgumentsInspection.java | 3 +- .../NonFinalFieldOfExceptionInspection.java | 12 +++--- .../java/impl/ig/fixes/MemberSignature.java | 3 +- ...eptionsDeclaredOnTestMethodInspection.java | 4 +- ...erCountMatchesArgumentCountInspection.java | 15 +++----- ...NameMayNotStartWithQuestionInspection.java | 4 +- ...eptionNameEndsWithExceptionInspection.java | 10 ++--- .../NonReproducibleMathCallInspection.java | 3 +- .../MethodMayBeStaticInspection.java | 7 ++-- ...bleObjectBoundToHttpSessionInspection.java | 30 ++++++++------- ...eObjectPassedToObjectStreamInspection.java | 16 ++++---- .../impl/migration/MigrationClassImpl.java | 15 ++++---- .../MoveInstanceMethodProcessor.java | 3 +- 50 files changed, 220 insertions(+), 277 deletions(-) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inference/ParameterNullityInferenceKt.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inference/ParameterNullityInferenceKt.java index 453f7f5cfb..97b837247d 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inference/ParameterNullityInferenceKt.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inference/ParameterNullityInferenceKt.java @@ -2,8 +2,8 @@ import com.intellij.java.language.impl.psi.impl.source.JavaLightTreeUtil; import com.intellij.java.language.impl.psi.impl.source.tree.ElementType; +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.util.collection.ContainerUtil; import jakarta.annotation.Nonnull; @@ -183,10 +183,10 @@ else if (ElementType.JAVA_STATEMENT_BIT_SET.contains(type)) { "Exception", "RuntimeException", "NullPointerException", - JavaClassNames.JAVA_LANG_THROWABLE, - JavaClassNames.JAVA_LANG_EXCEPTION, - JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, - JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION + CommonClassNames.JAVA_LANG_THROWABLE, + CommonClassNames.JAVA_LANG_EXCEPTION, + CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, + CommonClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION ); private static boolean canCatchNpe(LighterAST tree, @Nullable LighterASTNode type) { diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/nullable/NullableStuffInspectionBase.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/nullable/NullableStuffInspectionBase.java index 46e4308383..15d8eaaa00 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/nullable/NullableStuffInspectionBase.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/nullable/NullableStuffInspectionBase.java @@ -19,7 +19,6 @@ import consulo.annotation.access.RequiredReadAction; import consulo.application.util.registry.Registry; import consulo.java.analysis.impl.localize.JavaInspectionsLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.*; import consulo.language.editor.inspection.localize.InspectionLocalize; import consulo.language.psi.PsiElement; @@ -38,10 +37,9 @@ import consulo.util.lang.ObjectUtil; import consulo.util.lang.StringUtil; import consulo.virtualFileSystem.VirtualFile; -import org.jetbrains.annotations.Contract; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.Contract; import java.util.*; @@ -175,7 +173,7 @@ private boolean hasStringConstructor(PsiClass aClass) { for (PsiMethod method : aClass.getConstructors()) { PsiParameterList list = method.getParameterList(); if (list.getParametersCount() == 1 && - list.getParameters()[0].getType().equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + list.getParameters()[0].getType().equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return true; } } @@ -329,8 +327,8 @@ private boolean isNullableNotNullCollectionConflict( } for (int i = 0; i <= 1; i++) { - PsiType expectedArg = PsiUtil.substituteTypeParameter(expectedType, JavaClassNames.JAVA_UTIL_MAP, i, false); - PsiType assignedArg = PsiUtil.substituteTypeParameter(assignedType, JavaClassNames.JAVA_UTIL_MAP, i, false); + PsiType expectedArg = PsiUtil.substituteTypeParameter(expectedType, CommonClassNames.JAVA_UTIL_MAP, i, false); + PsiType assignedArg = PsiUtil.substituteTypeParameter(assignedType, CommonClassNames.JAVA_UTIL_MAP, i, false); if (isNullityConflict(expectedArg, assignedArg) || expectedArg != null && assignedArg != null && isNullableNotNullCollectionConflict(expectedArg, assignedArg, visited)) { diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodCallUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodCallUtils.java index 69d9fd1ea6..850dee49b1 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodCallUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodCallUtils.java @@ -21,15 +21,14 @@ import com.intellij.java.language.psi.util.MethodSignatureUtil; import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.HardcodedMethodConstants; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.psi.util.PsiTreeUtil; import consulo.util.collection.ArrayUtil; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; + import java.util.HashSet; import java.util.Set; import java.util.regex.Matcher; @@ -209,7 +208,7 @@ public static boolean isCallToRegexMethod(PsiMethodCallExpression expression) { return false; } final String className = containingClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_STRING.equals(className) || "java.util.regex.Pattern".equals(className); + return CommonClassNames.JAVA_LANG_STRING.equals(className) || "java.util.regex.Pattern".equals(className); } public static boolean isCallDuringObjectConstruction(PsiMethodCallExpression expression) { @@ -389,7 +388,7 @@ public static boolean callWithNonConstantString(@Nonnull PsiMethodCallExpression return false; } final PsiType type = argument.getType(); - if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return false; } if (considerStaticFinalConstant && argument instanceof PsiReferenceExpression) { diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodUtils.java index 490aa1f857..c3e2889579 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodUtils.java @@ -25,16 +25,15 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.HardcodedMethodConstants; import consulo.application.util.query.Query; -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; import one.util.streamex.StreamEx; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nonnull; -import jakarta.annotation.Nullable; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -46,13 +45,13 @@ private MethodUtils() { @Contract("null -> false") public static boolean isComparatorCompare(@Nullable PsiMethod method) { - return method != null && methodMatches(method, JavaClassNames.JAVA_UTIL_COMPARATOR, PsiType.INT, "compare", null, null); + return method != null && methodMatches(method, CommonClassNames.JAVA_UTIL_COMPARATOR, PsiType.INT, "compare", null, null); } @Contract("null -> false") public static boolean isCompareTo(@Nullable PsiMethod method) { return method != null && methodMatches(method, null, PsiType.INT, HardcodedMethodConstants.COMPARE_TO, PsiType.NULL) && InheritanceUtil.isInheritor(method.getContainingClass(), - JavaClassNames.JAVA_LANG_COMPARABLE); + CommonClassNames.JAVA_LANG_COMPARABLE); } @Contract("null -> false") @@ -61,7 +60,7 @@ public static boolean isCompareToIgnoreCase(@Nullable PsiMethod method) { return false; } final PsiClassType stringType = TypeUtils.getStringType(method); - return methodMatches(method, JavaClassNames.JAVA_LANG_STRING, PsiType.INT, "compareToIgnoreCase", stringType); + return methodMatches(method, CommonClassNames.JAVA_LANG_STRING, PsiType.INT, "compareToIgnoreCase", stringType); } @Contract("null -> false") @@ -98,7 +97,7 @@ public static boolean isEqualsIgnoreCase(@Nullable PsiMethod method) { return false; } final PsiClassType stringType = TypeUtils.getStringType(method); - return methodMatches(method, JavaClassNames.JAVA_LANG_STRING, PsiType.BOOLEAN, HardcodedMethodConstants.EQUALS_IGNORE_CASE, stringType); + return methodMatches(method, CommonClassNames.JAVA_LANG_STRING, PsiType.BOOLEAN, HardcodedMethodConstants.EQUALS_IGNORE_CASE, stringType); } /** @@ -424,6 +423,6 @@ public static boolean isStringLength(@Nullable PsiMethod method) { return false; } PsiClass aClass = method.getContainingClass(); - return aClass != null && JavaClassNames.JAVA_LANG_STRING.equals(aClass.getQualifiedName()); + return aClass != null && CommonClassNames.JAVA_LANG_STRING.equals(aClass.getQualifiedName()); } } diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ParenthesesUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ParenthesesUtils.java index 77a8ddd44f..5db6502005 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ParenthesesUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ParenthesesUtils.java @@ -16,15 +16,13 @@ package com.siyeh.ig.psiutils; import com.intellij.java.language.psi.*; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; -import jakarta.annotation.Nonnull; - import java.util.HashMap; import java.util.Map; @@ -488,7 +486,7 @@ public static boolean areParenthesesNeeded(PsiExpression expression, PsiExpressi if (!parentType.equals(childType)) { return true; } - if (childType.equalsToText(JavaClassNames.JAVA_LANG_STRING) && !PsiTreeUtil.isAncestor(parentPolyadicExpression.getOperands()[0], childPolyadicExpression, true)) { + if (childType.equalsToText(CommonClassNames.JAVA_LANG_STRING) && !PsiTreeUtil.isAncestor(parentPolyadicExpression.getOperands()[0], childPolyadicExpression, true)) { final PsiExpression[] operands = childPolyadicExpression.getOperands(); for (PsiExpression operand : operands) { if (!childType.equals(operand.getType())) { diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java index 898ca71e29..4963f1641c 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java @@ -33,6 +33,7 @@ import com.intellij.java.debugger.impl.ui.tree.render.*; import com.intellij.java.debugger.localize.JavaDebuggerLocalize; import com.intellij.java.language.impl.JavaFileType; +import com.intellij.java.language.psi.CommonClassNames; import consulo.annotation.component.ComponentScope; import consulo.annotation.component.ServiceAPI; import consulo.annotation.component.ServiceImpl; @@ -42,7 +43,6 @@ import consulo.disposer.Disposable; import consulo.ide.ServiceManager; import consulo.internal.com.sun.jdi.Value; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; import consulo.localize.LocalizeValue; @@ -86,7 +86,7 @@ public class NodeRendererSettings implements PersistentStateComponent { private final NodeRenderer[] myAlternateCollectionRenderers = new NodeRenderer[]{ createCompoundReferenceRenderer( "Map", - JavaClassNames.JAVA_UTIL_MAP, + CommonClassNames.JAVA_UTIL_MAP, createLabelRenderer(" size = ", "size()", null), createExpressionChildrenRenderer( "entrySet().toArray()", @@ -111,7 +111,7 @@ public class NodeRendererSettings implements PersistentStateComponent { new ListObjectRenderer(this), createCompoundReferenceRenderer( "Collection", - JavaClassNames.JAVA_UTIL_COLLECTION, + CommonClassNames.JAVA_UTIL_COLLECTION, createLabelRenderer(" size = ", "size()", null), createExpressionChildrenRenderer("toArray()", "!isEmpty()") ) @@ -347,10 +347,10 @@ else if (rendererId.equals(ToStringRenderer.UNIQUE_ID)) { return myToStringRenderer; } else if (rendererId.equals(CompoundNodeRenderer.UNIQUE_ID) || rendererId.equals(REFERENCE_RENDERER)) { - return createCompoundReferenceRenderer("unnamed", JavaClassNames.JAVA_LANG_OBJECT, null, null); + return createCompoundReferenceRenderer("unnamed", CommonClassNames.JAVA_LANG_OBJECT, null, null); } else if (rendererId.equals(CompoundTypeRenderer.UNIQUE_ID)) { - return createCompoundTypeRenderer("unnamed", JavaClassNames.JAVA_LANG_OBJECT, null, null); + return createCompoundTypeRenderer("unnamed", CommonClassNames.JAVA_LANG_OBJECT, null, null); } return null; } @@ -559,7 +559,7 @@ public ListObjectRenderer(NodeRendererSettings rendererSettings) { createLabelRenderer(" size = ", "size()", null), createExpressionChildrenRenderer("toArray()", "!isEmpty()") ); - setClassName(JavaClassNames.JAVA_UTIL_LIST); + setClassName(CommonClassNames.JAVA_UTIL_LIST); } @Override diff --git a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyFactoryImpl.java b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyFactoryImpl.java index d2c5ea431c..4610fec352 100644 --- a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyFactoryImpl.java +++ b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyFactoryImpl.java @@ -20,10 +20,10 @@ import com.intellij.java.execution.runners.ProcessProxyFactory; import com.intellij.java.language.impl.projectRoots.ex.JavaSdkUtil; import com.intellij.java.language.projectRoots.JavaSdkVersion; +import com.intellij.java.language.psi.CommonClassNames; import consulo.annotation.component.ServiceImpl; import consulo.container.plugin.PluginManager; import consulo.java.execution.configurations.OwnJavaParameters; -import consulo.java.language.module.util.JavaClassNames; import consulo.java.rt.JavaRtClassNames; import consulo.java.rt.execution.application.AppMainV2Constants; import consulo.logging.Logger; @@ -54,7 +54,7 @@ public ProcessProxy createCommandLineProxy(JavaCommandLine javaCmdLine) throws E try { ProcessProxyImpl proxy = new ProcessProxyImpl(StringUtil.getShortName(mainClass)); String port = String.valueOf(proxy.getPortNumber()); - String binPath = new File(PluginManager.getPluginPath(JavaClassNames.class), "breakgen").getPath(); + String binPath = new File(PluginManager.getPluginPath(CommonClassNames.class), "breakgen").getPath(); if (runtimeJarFile && JavaSdkUtil.isJdkAtLeast(javaParameters.getJdk(), JavaSdkVersion.JDK_1_5)) { javaParameters.getVMParametersList().add("-javaagent:" + rtJarPath + '=' + port + ':' + binPath); diff --git a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyImpl.java b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyImpl.java index 33cea1cb95..cb1952dc1c 100644 --- a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyImpl.java +++ b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/runners/ProcessProxyImpl.java @@ -2,8 +2,8 @@ package com.intellij.java.execution.impl.runners; import com.intellij.java.execution.runners.ProcessProxy; +import com.intellij.java.language.psi.CommonClassNames; import consulo.container.plugin.PluginManager; -import consulo.java.language.module.util.JavaClassNames; import consulo.logging.Logger; import consulo.platform.Platform; import consulo.process.ProcessHandler; @@ -90,7 +90,7 @@ public boolean canSendBreak() { return false; } } - return new File(PluginManager.getPluginPath(JavaClassNames.class), "breakgen/breakgen.dll").exists(); + return new File(PluginManager.getPluginPath(CommonClassNames.class), "breakgen/breakgen.dll").exists(); } synchronized (myLock) { diff --git a/java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java b/java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java index cc30b10ff6..b0ea1ea9e8 100644 --- a/java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java +++ b/java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java @@ -18,7 +18,6 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiFormatUtil; import consulo.java.impl.intelliLang.JavaLanguageInjectionSupport; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.inject.advanced.BaseInjection; import consulo.language.inject.advanced.InjectionPlace; import consulo.language.inject.advanced.pattern.PatternCompiler; @@ -220,10 +219,10 @@ public static boolean isInjectable(@Nullable final PsiType type, final Project p if (project.isDefault()) { @NonNls final String text = type.getPresentableText(); if (text == null) return false; - return text.equals(JavaClassNames.JAVA_LANG_STRING) || text.equals("java.lang.String...") || text.equals("java.lang.String[]"); + return text.equals(CommonClassNames.JAVA_LANG_STRING) || text.equals("java.lang.String...") || text.equals("java.lang.String[]"); } else { - return type.equalsToText(JavaClassNames.JAVA_LANG_STRING) || type.equalsToText("java.lang.String...") || type.equalsToText("java.lang.String[]"); + return type.equalsToText(CommonClassNames.JAVA_LANG_STRING) || type.equalsToText("java.lang.String...") || type.equalsToText("java.lang.String[]"); } } diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/PsiClassType.java b/java-language-api/src/main/java/com/intellij/java/language/psi/PsiClassType.java index 45ee9e1265..a622331f7f 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/PsiClassType.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/PsiClassType.java @@ -22,7 +22,6 @@ import com.intellij.java.language.jvm.types.JvmType; import com.intellij.java.language.jvm.types.JvmTypeResolveResult; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; import consulo.util.collection.ArrayFactory; @@ -95,8 +94,8 @@ public boolean equals(Object obj) { if (this == obj) return true; if (!(obj instanceof PsiClassType)) { return obj instanceof PsiCapturedWildcardType && - ((PsiCapturedWildcardType)obj).getLowerBound().equalsToText(JavaClassNames.JAVA_LANG_OBJECT) && - equalsToText(JavaClassNames.JAVA_LANG_OBJECT); + ((PsiCapturedWildcardType)obj).getLowerBound().equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && + equalsToText(CommonClassNames.JAVA_LANG_OBJECT); } PsiClassType otherClassType = (PsiClassType)obj; diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/util/PropertyUtil.java b/java-language-api/src/main/java/com/intellij/java/language/psi/util/PropertyUtil.java index d88869640d..df169ba013 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/util/PropertyUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/util/PropertyUtil.java @@ -19,7 +19,6 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; import com.intellij.java.language.psi.codeStyle.VariableKind; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -29,11 +28,11 @@ import consulo.util.collection.ContainerUtil; import consulo.util.lang.Comparing; import consulo.util.lang.StringUtil; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import kava.beans.Introspector; +import org.jetbrains.annotations.NonNls; + import java.util.*; /** @@ -174,7 +173,7 @@ private static boolean filterMethods(final PsiMethod method) { return false; } final String className = psiClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_OBJECT.equals(className); + return CommonClassNames.JAVA_LANG_OBJECT.equals(className); } @Nonnull @@ -381,7 +380,7 @@ public static String[] getReadableProperties(@Nonnull PsiClass aClass, boolean i PsiMethod[] methods = includeSuperClass ? aClass.getAllMethods() : aClass.getMethods(); for (PsiMethod method : methods) { - if (JavaClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) { continue; } @@ -400,7 +399,7 @@ public static String[] getWritableProperties(@Nonnull PsiClass aClass, boolean i PsiMethod[] methods = includeSuperClass ? aClass.getAllMethods() : aClass.getMethods(); for (PsiMethod method : methods) { - if (JavaClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) { continue; } diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/util/PropertyUtilBase.java b/java-language-api/src/main/java/com/intellij/java/language/psi/util/PropertyUtilBase.java index 410fe7e581..74436b3c88 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/util/PropertyUtilBase.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/util/PropertyUtilBase.java @@ -7,7 +7,6 @@ import com.intellij.java.language.psi.codeStyle.VariableKind; import com.intellij.java.language.util.PropertyKind; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.psi.PsiElement; import consulo.project.Project; @@ -80,7 +79,7 @@ private static boolean filterMethods(PsiMethod method) { return false; } String className = psiClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_OBJECT.equals(className); + return CommonClassNames.JAVA_LANG_OBJECT.equals(className); } @Nonnull @@ -128,7 +127,7 @@ public static String[] getReadableProperties(@Nonnull PsiClass aClass, boolean i PsiMethod[] methods = includeSuperClass ? aClass.getAllMethods() : aClass.getMethods(); for (PsiMethod method : methods) { - if (JavaClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) { continue; } @@ -147,7 +146,7 @@ public static String[] getWritableProperties(@Nonnull PsiClass aClass, boolean i PsiMethod[] methods = includeSuperClass ? aClass.getAllMethods() : aClass.getMethods(); for (PsiMethod method : methods) { - if (JavaClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) { continue; } diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/util/PsiConcatenationUtil.java b/java-language-api/src/main/java/com/intellij/java/language/psi/util/PsiConcatenationUtil.java index 921de7314d..6ded0576c1 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/util/PsiConcatenationUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/util/PsiConcatenationUtil.java @@ -16,7 +16,6 @@ package com.intellij.java.language.psi.util; import com.intellij.java.language.psi.*; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiWhiteSpace; import consulo.language.psi.scope.GlobalSearchScope; @@ -26,7 +25,7 @@ import java.util.List; /** - * User: cdr + * @author cdr */ public class PsiConcatenationUtil { public static void buildFormatString( @@ -49,12 +48,12 @@ public static void buildFormatString( } else if (expression instanceof PsiPolyadicExpression) { final PsiType type = expression.getType(); - if (type != null && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type != null && type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { final PsiPolyadicExpression binaryExpression = (PsiPolyadicExpression)expression; PsiExpression[] operands = binaryExpression.getOperands(); PsiType left = operands[0].getType(); - boolean stringStarted = left != null && left.equalsToText(JavaClassNames.JAVA_LANG_STRING); + boolean stringStarted = left != null && left.equalsToText(CommonClassNames.JAVA_LANG_STRING); if (stringStarted) { buildFormatString(operands[0], formatString, formatParameters, printfFormat); } @@ -62,7 +61,7 @@ else if (expression instanceof PsiPolyadicExpression) { PsiExpression op = operands[i]; PsiType optype = op.getType(); PsiType r = TypeConversionUtil.calcTypeForBinaryExpression(left, optype, binaryExpression.getOperationTokenType(), true); - if (r != null && r.equalsToText(JavaClassNames.JAVA_LANG_STRING) && !stringStarted) { + if (r != null && r.equalsToText(CommonClassNames.JAVA_LANG_STRING) && !stringStarted) { stringStarted = true; PsiElement element = binaryExpression.getTokenBeforeOperand(op); if (element.getPrevSibling() instanceof PsiWhiteSpace) element = element.getPrevSibling(); @@ -72,7 +71,7 @@ else if (expression instanceof PsiPolyadicExpression) { addFormatParameter(subExpression, formatString, formatParameters, printfFormat); } if (stringStarted) { - if (optype != null && (optype.equalsToText(JavaClassNames.JAVA_LANG_STRING) || PsiType.CHAR.equals(optype))) { + if (optype != null && (optype.equalsToText(CommonClassNames.JAVA_LANG_STRING) || PsiType.CHAR.equals(optype))) { buildFormatString(op, formatString, formatParameters, printfFormat); } else { @@ -101,8 +100,8 @@ private static void addFormatParameter(PsiExpression expression, else if (type != null && (type.equalsToText("long") || type.equalsToText("int") || - type.equalsToText(JavaClassNames.JAVA_LANG_LONG) || - type.equalsToText(JavaClassNames.JAVA_LANG_INTEGER))) { + type.equalsToText(CommonClassNames.JAVA_LANG_LONG) || + type.equalsToText(CommonClassNames.JAVA_LANG_INTEGER))) { formatString.append("%d"); } else { diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/MetaAnnotationUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/MetaAnnotationUtil.java index d5eca301f1..783e8a7120 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/MetaAnnotationUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/MetaAnnotationUtil.java @@ -22,7 +22,6 @@ import consulo.application.util.CachedValueProvider; import consulo.application.util.CachedValuesManager; import consulo.application.util.ConcurrentFactoryMap; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiModificationTracker; import consulo.language.psi.PsiUtilCore; @@ -37,9 +36,9 @@ import consulo.util.lang.Comparing; import consulo.util.lang.Pair; import consulo.virtualFileSystem.VirtualFile; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.*; import java.util.concurrent.ConcurrentMap; import java.util.stream.Stream; @@ -138,7 +137,7 @@ private static GlobalSearchScope getAllAnnotationFilesScope(Project project) { { GlobalSearchScope scope = GlobalSearchScope.allScope(project); Set allAnnotationFiles = new HashSet<>(); - for (PsiClass javaLangAnnotation : JavaPsiFacade.getInstance(project).findClasses(JavaClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope)) { + for (PsiClass javaLangAnnotation : JavaPsiFacade.getInstance(project).findClasses(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope)) { DirectClassInheritorsSearch.search(javaLangAnnotation, scope, false).forEach(annotationClass -> { ContainerUtil.addIfNotNull(allAnnotationFiles, PsiUtilCore.getVirtualFile(annotationClass)); diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/generation/OverrideImplementExploreUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/generation/OverrideImplementExploreUtil.java index 38022caa23..041ad96386 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/generation/OverrideImplementExploreUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/generation/OverrideImplementExploreUtil.java @@ -9,12 +9,11 @@ import com.intellij.java.language.psi.util.MethodSignatureUtil; import com.intellij.java.language.psi.util.PsiUtil; import consulo.application.Application; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiUtilCore; import consulo.logging.Logger; import consulo.util.lang.StringUtil; - import jakarta.annotation.Nonnull; + import java.util.*; public class OverrideImplementExploreUtil { @@ -94,7 +93,7 @@ public static Map getMapToOverrideImplement(PsiC if (finals.get(signature) == null) { PsiMethod abstractOne = abstracts.get(signature); if (abstractOne == null || !abstractOne.getContainingClass().isInheritor(concrete.getContainingClass(), true) || - JavaClassNames.JAVA_LANG_OBJECT.equals(concrete.getContainingClass().getQualifiedName())) { + CommonClassNames.JAVA_LANG_OBJECT.equals(concrete.getContainingClass().getQualifiedName())) { PsiSubstitutor subst = correctSubstitutor(concrete, signature.getSubstitutor()); CandidateInfo info = new CandidateInfo(concrete, subst); result.put(signature, info); diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java index 3200441d38..95af192fe9 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java @@ -37,7 +37,6 @@ import consulo.application.util.*; import consulo.content.scope.SearchScope; import consulo.ide.ServiceManager; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.content.FileIndexFacade; import consulo.language.impl.psi.ResolveScopeManager; import consulo.language.psi.*; @@ -755,30 +754,30 @@ static boolean processSuperTypes(@Nonnull PsiClass aClass, @Nullable public static PsiClass getSuperClass(@Nonnull PsiClass psiClass) { if (psiClass.isInterface()) { - return findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_OBJECT); + return findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_OBJECT); } if (psiClass.isEnum()) { - return findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_ENUM); + return findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_ENUM); } if (psiClass.isRecord()) { - return findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_RECORD); + return findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_RECORD); } if (psiClass instanceof PsiAnonymousClass) { PsiClassType baseClassReference = ((PsiAnonymousClass)psiClass).getBaseClassType(); PsiClass baseClass = baseClassReference.resolve(); - if (baseClass == null || baseClass.isInterface()) return findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_OBJECT); + if (baseClass == null || baseClass.isInterface()) return findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_OBJECT); return baseClass; } - if (JavaClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) return null; + if (CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) return null; PsiClassType[] referenceElements = psiClass.getExtendsListTypes(); - if (referenceElements.length == 0) return findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_OBJECT); + if (referenceElements.length == 0) return findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_OBJECT); PsiClass psiResolved = referenceElements[0].resolve(); - return psiResolved == null ? findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_OBJECT) : psiResolved; + return psiResolved == null ? findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_OBJECT) : psiResolved; } @Nullable @@ -809,7 +808,7 @@ private static PsiClass[] getSupersInner(@Nonnull PsiClass psiClass) { PsiClass baseClass = baseClassReference.resolve(); if (baseClass != null) { if (baseClass.isInterface()) { - PsiClass objectClass = findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_OBJECT); + PsiClass objectClass = findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_OBJECT); return objectClass != null ? new PsiClass[]{ objectClass, baseClass @@ -818,12 +817,12 @@ private static PsiClass[] getSupersInner(@Nonnull PsiClass psiClass) { return new PsiClass[]{baseClass}; } - PsiClass objectClass = findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_OBJECT); + PsiClass objectClass = findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_OBJECT); return objectClass != null ? new PsiClass[]{objectClass} : PsiClass.EMPTY_ARRAY; } if (psiClass instanceof PsiTypeParameter) { if (extendsListTypes.length == 0) { - final PsiClass objectClass = findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_OBJECT); + final PsiClass objectClass = findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_OBJECT); return objectClass != null ? new PsiClass[]{objectClass} : PsiClass.EMPTY_ARRAY; } return resolveClassReferenceList(extendsListTypes, psiClass, false); @@ -867,7 +866,7 @@ public static PsiClassType[] getSuperTypes(@Nonnull PsiClass psiClass) { System.arraycopy(extendsTypes, 0, result, 0, extendsTypes.length); if (!hasExtends) { - if (JavaClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) { return PsiClassType.EMPTY_ARRAY; } PsiManager manager = psiClass.getManager(); @@ -880,15 +879,15 @@ public static PsiClassType[] getSuperTypes(@Nonnull PsiClass psiClass) { @Nonnull private static PsiClassType getAnnotationSuperType(@Nonnull PsiClass psiClass, @Nonnull PsiElementFactory factory) { - return factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, psiClass.getResolveScope()); + return factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, psiClass.getResolveScope()); } private static PsiClassType getEnumSuperType(@Nonnull PsiClass psiClass, @Nonnull PsiElementFactory factory) { PsiClassType superType; - final PsiClass enumClass = findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_ENUM); + final PsiClass enumClass = findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_ENUM); if (enumClass == null) { try { - superType = (PsiClassType) factory.createTypeFromText(JavaClassNames.JAVA_LANG_ENUM, null); + superType = (PsiClassType) factory.createTypeFromText(CommonClassNames.JAVA_LANG_ENUM, null); } catch (IncorrectOperationException e) { superType = null; } @@ -939,7 +938,7 @@ public static PsiClass[] getInterfaces(@Nonnull PsiClass psiClass) { private static PsiClass[] resolveClassReferenceList(@Nonnull PsiClassType[] listOfTypes, @Nonnull PsiClass psiClass, boolean includeObject) { PsiClass objectClass = null; if (includeObject) { - objectClass = findSpecialSuperClass(psiClass, JavaClassNames.JAVA_LANG_OBJECT); + objectClass = findSpecialSuperClass(psiClass, CommonClassNames.JAVA_LANG_OBJECT); if (objectClass == null) { includeObject = false; } @@ -1054,10 +1053,10 @@ public static PsiClassType[] getImplementsListTypes(@Nonnull PsiClass psiClass) static boolean isInExtendsList(@Nonnull PsiClass psiClass, @Nonnull PsiClass baseClass, @Nullable String baseName, @Nonnull PsiManager manager) { if (psiClass.isEnum()) { - return JavaClassNames.JAVA_LANG_ENUM.equals(baseClass.getQualifiedName()); + return CommonClassNames.JAVA_LANG_ENUM.equals(baseClass.getQualifiedName()); } if (psiClass.isAnnotationType()) { - return JavaClassNames.JAVA_LANG_ANNOTATION_ANNOTATION.equals(baseClass.getQualifiedName()); + return CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION.equals(baseClass.getQualifiedName()); } PsiType upperBound = InferenceSession.getUpperBound(psiClass); if (upperBound == null && psiClass instanceof PsiTypeParameter) { @@ -1095,7 +1094,7 @@ static boolean isInReferenceList(@Nullable PsiReferenceList list, @Nonnull PsiCl if (typeParam != -1) { name = name.substring(0, typeParam); } - // baseName=="ArrayList" classStub.getReferenceNames()[i]==JavaClassNames.JAVA_UTIL_ARRAY_LIST + // baseName=="ArrayList" classStub.getReferenceNames()[i]==CommonClassNames.JAVA_UTIL_ARRAY_LIST if (name.endsWith(baseName)) { PsiClassType[] referencedTypes = classStub.getReferencedTypes(); PsiClass resolved = referencedTypes[i].resolve(); diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiElementFactoryImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiElementFactoryImpl.java index 17a0420ff4..227c236e36 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiElementFactoryImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiElementFactoryImpl.java @@ -29,7 +29,6 @@ import com.intellij.java.language.psi.javadoc.PsiDocTag; import com.intellij.java.language.psi.util.PsiUtil; import consulo.annotation.component.ServiceImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.java.language.psi.JavaLanguageVersion; import consulo.language.Language; import consulo.language.ast.ASTNode; @@ -50,12 +49,12 @@ import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import jakarta.inject.Inject; import jakarta.inject.Singleton; import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nonnull; -import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -181,10 +180,10 @@ public PsiTypeParameterList createTypeParameterList() { public PsiTypeParameter createTypeParameter(String name, PsiClassType[] superTypes) { StringBuilder builder = new StringBuilder(); builder.append("public <").append(name); - if (superTypes.length > 1 || superTypes.length == 1 && !superTypes[0].equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (superTypes.length > 1 || superTypes.length == 1 && !superTypes[0].equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { builder.append(" extends "); for (PsiClassType type : superTypes) { - if (!type.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (!type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { builder.append(type.getCanonicalText(true)).append('&'); } } diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiImplUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiImplUtil.java index a67ac74f83..e1c1cb384e 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiImplUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiImplUtil.java @@ -33,7 +33,6 @@ import consulo.annotation.access.RequiredWriteAction; import consulo.application.Application; import consulo.content.scope.SearchScope; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.ast.FileASTNode; import consulo.language.ast.IElementType; @@ -327,9 +326,9 @@ public static PsiType[] typesByTypeElements(@Nonnull PsiTypeElement[] typeElemen public static PsiType getType(@Nonnull PsiClassObjectAccessExpression classAccessExpression) { GlobalSearchScope resolveScope = classAccessExpression.getResolveScope(); PsiManager manager = classAccessExpression.getManager(); - PsiClass classClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_LANG_CLASS, resolveScope); + PsiClass classClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_CLASS, resolveScope); if (classClass == null) { - return new PsiClassReferenceType(new LightClassReference(manager, "Class", JavaClassNames.JAVA_LANG_CLASS, resolveScope), null); + return new PsiClassReferenceType(new LightClassReference(manager, "Class", CommonClassNames.JAVA_LANG_CLASS, resolveScope), null); } if (!PsiUtil.isLanguageLevel5OrHigher(classAccessExpression)) { //Raw java.lang.Class @@ -342,7 +341,7 @@ public static PsiType getType(@Nonnull PsiClassObjectAccessExpression classAcces if (PsiType.VOID.equals(primitiveType)) { operandType = JavaPsiFacade.getInstance(manager.getProject()) .getElementFactory() - .createTypeByFQClassName(JavaClassNames.JAVA_LANG_VOID, classAccessExpression.getResolveScope()); + .createTypeByFQClassName(CommonClassNames.JAVA_LANG_VOID, classAccessExpression.getResolveScope()); } else { operandType = primitiveType.getBoxedType(classAccessExpression); @@ -546,7 +545,7 @@ public static PsiElement setName(@Nonnull PsiElement element, @Nonnull String na public static boolean isDeprecatedByAnnotation(@Nonnull PsiModifierListOwner owner) { PsiModifierList modifierList = owner.getModifierList(); - return modifierList != null && modifierList.findAnnotation(JavaClassNames.JAVA_LANG_DEPRECATED) != null; + return modifierList != null && modifierList.findAnnotation(CommonClassNames.JAVA_LANG_DEPRECATED) != null; } public static boolean isDeprecatedByDocTag(@Nonnull PsiJavaDocumentedElement owner) { diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiEnumConstantImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiEnumConstantImpl.java index ce1f97c1cd..7be72b2d53 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiEnumConstantImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiEnumConstantImpl.java @@ -23,7 +23,6 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.javadoc.PsiDocComment; import consulo.document.util.TextRange; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; @@ -33,7 +32,6 @@ import consulo.logging.Logger; import consulo.navigation.ItemPresentation; import consulo.navigation.ItemPresentationProvider; - import jakarta.annotation.Nonnull; /** @@ -202,7 +200,7 @@ public boolean isDeprecated() { PsiDocComment docComment = getDocComment(); return docComment != null && docComment.findTagByName("deprecated") != null - || getModifierList().findAnnotation(JavaClassNames.JAVA_LANG_DEPRECATED) != null; + || getModifierList().findAnnotation(CommonClassNames.JAVA_LANG_DEPRECATED) != null; } @Override diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiFieldImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiFieldImpl.java index 6d6399dfc7..3d2dc34ecf 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiFieldImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiFieldImpl.java @@ -30,7 +30,6 @@ import com.intellij.java.language.psi.javadoc.PsiDocComment; import consulo.application.util.Queryable; import consulo.content.scope.SearchScope; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.file.light.LightVirtualFile; import consulo.language.impl.ast.CompositeElement; @@ -296,7 +295,7 @@ public Object execute(@Nonnull PsiVariable variable, Set visitedVar private Object _computeConstantValue(Set visitedVars) { PsiType type = getType(); // javac rejects all non primitive and non String constants, although JLS states constants "variables whose initializers are constant expressions" - if (!(type instanceof PsiPrimitiveType) && !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (!(type instanceof PsiPrimitiveType) && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return null; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/MetaAnnotationUtil.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/MetaAnnotationUtil.java index 6a86b61022..18532d2d5f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/MetaAnnotationUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/MetaAnnotationUtil.java @@ -24,7 +24,6 @@ import consulo.application.util.CachedValueProvider; import consulo.application.util.CachedValuesManager; import consulo.application.util.ConcurrentFactoryMap; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiModificationTracker; import consulo.language.psi.PsiUtilCore; @@ -39,9 +38,9 @@ import consulo.util.lang.Comparing; import consulo.util.lang.Pair; import consulo.virtualFileSystem.VirtualFile; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.*; import java.util.concurrent.ConcurrentMap; import java.util.stream.Stream; @@ -138,7 +137,7 @@ private static GlobalSearchScope getAllAnnotationFilesScope(Project project) { { GlobalSearchScope scope = GlobalSearchScope.allScope(project); Set allAnnotationFiles = new HashSet<>(); - for (PsiClass javaLangAnnotation : JavaPsiFacade.getInstance(project).findClasses(JavaClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope)) { + for (PsiClass javaLangAnnotation : JavaPsiFacade.getInstance(project).findClasses(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope)) { DirectClassInheritorsSearch.search(javaLangAnnotation, scope, false).forEach(annotationClass -> { ContainerUtil.addIfNotNull(allAnnotationFiles, PsiUtilCore.getVirtualFile(annotationClass)); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/MethodReturnTypeProvider.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/MethodReturnTypeProvider.java index e5b148c7ff..eee6f14cc0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/MethodReturnTypeProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/MethodReturnTypeProvider.java @@ -20,7 +20,6 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.completion.CompletionParameters; import consulo.language.editor.completion.CompletionProvider; import consulo.language.editor.completion.CompletionResultSet; @@ -64,7 +63,7 @@ static void addProbableReturnTypes(@Nonnull CompletionParameters parameters, fin @Override public PsiType visitType(PsiType type) { if (myProcessed.add(type)) { - int priority = type.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) ? 1 : 1000 - myProcessed.size(); + int priority = type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) ? 1 : 1000 - myProcessed.size(); consumer.accept(PrioritizedLookupElement.withPriority(PsiTypeLookupItem.createLookupItem(type, position), priority)); } return type; diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/PreferByKindWeigher.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/PreferByKindWeigher.java index 47d63c8bcd..6d2b6bf853 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/PreferByKindWeigher.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/PreferByKindWeigher.java @@ -15,9 +15,6 @@ */ package com.intellij.java.impl.codeInsight.completion; -import consulo.language.editor.completion.CompletionType; -import consulo.language.editor.completion.lookup.LookupElement; -import consulo.language.editor.completion.lookup.LookupElementWeigher; import com.intellij.java.impl.codeInsight.ExpectedTypeInfo; import com.intellij.java.impl.psi.filters.getters.MembersGetter; import com.intellij.java.impl.psi.util.proximity.KnownElementWeigher; @@ -28,15 +25,17 @@ import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PropertyUtil; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.util.lang.function.Condition; -import consulo.util.lang.function.Conditions; -import consulo.util.lang.StringUtil; +import consulo.language.editor.completion.CompletionType; +import consulo.language.editor.completion.lookup.LookupElement; +import consulo.language.editor.completion.lookup.LookupElementWeigher; import consulo.language.pattern.ElementPattern; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; -import consulo.util.lang.ThreeState; import consulo.util.collection.ContainerUtil; -import consulo.java.language.module.util.JavaClassNames; +import consulo.util.lang.StringUtil; +import consulo.util.lang.ThreeState; +import consulo.util.lang.function.Condition; +import consulo.util.lang.function.Conditions; import jakarta.annotation.Nonnull; import java.util.Arrays; @@ -90,7 +89,7 @@ private static Condition createSuitabilityCondition(final PsiElement p } } if (thrownExceptions.isEmpty()) { - ContainerUtil.addIfNotNull(thrownExceptions, JavaPsiFacade.getInstance(position.getProject()).findClass(JavaClassNames.JAVA_LANG_THROWABLE, position.getResolveScope())); + ContainerUtil.addIfNotNull(thrownExceptions, JavaPsiFacade.getInstance(position.getProject()).findClass(CommonClassNames.JAVA_LANG_THROWABLE, position.getResolveScope())); } return psiClass -> { @@ -102,11 +101,11 @@ private static Condition createSuitabilityCondition(final PsiElement p return false; }; } else if (JavaSmartCompletionContributor.AFTER_THROW_NEW.accepts(position) || INSIDE_METHOD_THROWS_CLAUSE.accepts(position)) { - return psiClass -> InheritanceUtil.isInheritor(psiClass, JavaClassNames.JAVA_LANG_THROWABLE); + return psiClass -> InheritanceUtil.isInheritor(psiClass, CommonClassNames.JAVA_LANG_THROWABLE); } if (IN_RESOURCE.accepts(position)) { - return psiClass -> InheritanceUtil.isInheritor(psiClass, JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE); + return psiClass -> InheritanceUtil.isInheritor(psiClass, CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE); } if (psiElement().withParents(PsiJavaCodeReferenceElement.class, PsiAnnotation.class).accepts(position)) { @@ -170,11 +169,11 @@ public MyResult weigh(@Nonnull LookupElement item) { if (object instanceof PsiMethod) { PsiClass containingClass = ((PsiMethod) object).getContainingClass(); - if (containingClass != null && JavaClassNames.JAVA_UTIL_COLLECTIONS.equals(containingClass.getQualifiedName())) { + if (containingClass != null && CommonClassNames.JAVA_UTIL_COLLECTIONS.equals(containingClass.getQualifiedName())) { return MyResult.collectionFactory; } } - if (object instanceof PsiClass && JavaClassNames.JAVA_LANG_STRING.equals(((PsiClass) object).getQualifiedName()) && JavaSmartCompletionContributor.AFTER_NEW.accepts(myPosition)) { + if (object instanceof PsiClass && CommonClassNames.JAVA_LANG_STRING.equals(((PsiClass) object).getQualifiedName()) && JavaSmartCompletionContributor.AFTER_NEW.accepts(myPosition)) { return MyResult.unlikelyClass; } Boolean expectedTypeMember = item.getUserData(MembersGetter.EXPECTED_TYPE_MEMBER); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/PreferMostUsedWeigher.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/PreferMostUsedWeigher.java index da97b6be61..2d0d68aad0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/PreferMostUsedWeigher.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/PreferMostUsedWeigher.java @@ -15,27 +15,29 @@ */ package com.intellij.java.impl.codeInsight.completion; -import consulo.language.editor.completion.lookup.LookupElement; -import consulo.language.editor.completion.lookup.LookupElementWeigher; import com.intellij.java.language.patterns.PsiMethodPattern; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiMethod; import com.intellij.java.language.psi.PsiParameter; import com.intellij.java.language.psi.PsiType; import com.intellij.java.language.psi.util.TypeConversionUtil; +import consulo.language.editor.completion.lookup.LookupElement; +import consulo.language.editor.completion.lookup.LookupElementWeigher; import consulo.language.pattern.StandardPatterns; import consulo.language.psi.PsiElement; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; - import jakarta.annotation.Nullable; import static com.intellij.java.language.patterns.PsiJavaPatterns.psiMethod; class PreferMostUsedWeigher extends LookupElementWeigher { - private static final PsiMethodPattern OBJECT_METHOD_PATTERN = psiMethod().withName(StandardPatterns.string().oneOf("hashCode", "equals", "finalize", "wait", "notify", "notifyAll", "getClass", - "clone", "toString")). - inClass(JavaClassNames.JAVA_LANG_OBJECT); + private static final PsiMethodPattern OBJECT_METHOD_PATTERN = psiMethod() + .withName( + StandardPatterns.string() + .oneOf("hashCode", "equals", "finalize", "wait", "notify", "notifyAll", "getClass", "clone", "toString") + ) + .inClass(CommonClassNames.JAVA_LANG_OBJECT); private final boolean myConstructorSuggestion; @@ -121,6 +123,6 @@ private static boolean isRawDeepTypeEqualToObject(@Nullable PsiType type) { return false; } - return rawType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT); + return rawType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/PossibleHeapPollutionVarargsInspection.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/PossibleHeapPollutionVarargsInspection.java index 215de40bf0..c010122d2d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/PossibleHeapPollutionVarargsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/PossibleHeapPollutionVarargsInspection.java @@ -15,12 +15,6 @@ */ package com.intellij.java.impl.codeInspection; -import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; -import consulo.language.editor.inspection.LocalInspectionToolSession; -import consulo.language.editor.inspection.LocalQuickFix; -import consulo.language.editor.inspection.ProblemDescriptor; -import consulo.language.editor.inspection.ProblemsHolder; import com.intellij.java.analysis.codeInspection.BaseJavaBatchLocalInspectionTool; import com.intellij.java.analysis.impl.codeInsight.intention.AddAnnotationPsiFix; import com.intellij.java.indexing.search.searches.OverridingMethodsSearch; @@ -29,20 +23,24 @@ import com.intellij.java.language.codeInsight.daemon.impl.analysis.JavaGenericsUtil; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.editor.inspection.LocalInspectionToolSession; +import consulo.language.editor.inspection.LocalQuickFix; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.editor.inspection.localize.InspectionLocalize; -import consulo.project.Project; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.PsiReference; import consulo.language.psi.search.ReferencesSearch; import consulo.logging.Logger; -import org.jetbrains.annotations.Nls; - +import consulo.project.Project; import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.Nls; /** - * User: anna - * Date: 1/28/11 + * @author anna + * @since 2011-01-28 */ @ExtensionImpl public class PossibleHeapPollutionVarargsInspection extends BaseJavaBatchLocalInspectionTool { @@ -125,7 +123,7 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri if (psiElement instanceof PsiIdentifier) { final PsiMethod psiMethod = (PsiMethod) psiElement.getParent(); if (psiMethod != null) { - new AddAnnotationPsiFix(JavaClassNames.JAVA_LANG_SAFE_VARARGS, psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); + new AddAnnotationPsiFix(CommonClassNames.JAVA_LANG_SAFE_VARARGS, psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); } } } @@ -150,7 +148,7 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri if (psiElement instanceof PsiIdentifier) { final PsiMethod psiMethod = (PsiMethod) psiElement.getParent(); psiMethod.getModifierList().setModifierProperty(PsiModifier.FINAL, true); - new AddAnnotationPsiFix(JavaClassNames.JAVA_LANG_SAFE_VARARGS, psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); + new AddAnnotationPsiFix(CommonClassNames.JAVA_LANG_SAFE_VARARGS, psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); } } } @@ -160,7 +158,7 @@ public abstract static class HeapPollutionVisitor extends JavaElementVisitor { public void visitMethod(PsiMethod method) { super.visitMethod(method); if (!PsiUtil.getLanguageLevel(method).isAtLeast(LanguageLevel.JDK_1_7)) return; - if (AnnotationUtil.isAnnotated(method, JavaClassNames.JAVA_LANG_SAFE_VARARGS, false)) return; + if (AnnotationUtil.isAnnotated(method, CommonClassNames.JAVA_LANG_SAFE_VARARGS, false)) return; if (!method.isVarArgs()) return; final PsiParameter psiParameter = method.getParameterList().getParameters()[method.getParameterList().getParametersCount() - 1]; diff --git a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/method/MethodHierarchyTreeStructure.java b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/method/MethodHierarchyTreeStructure.java index 1b0683f514..3b32e52801 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/method/MethodHierarchyTreeStructure.java +++ b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/method/MethodHierarchyTreeStructure.java @@ -22,7 +22,6 @@ import consulo.ide.impl.idea.ide.hierarchy.HierarchyBrowserManager; import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor; import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.SmartPointerManager; import consulo.language.psi.SmartPsiElementPointer; @@ -129,7 +128,7 @@ private static ArrayList createSuperClasses(PsiClass aClass) { } private static boolean isJavaLangObject(PsiClass aClass) { - return JavaClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName()); + return CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName()); } private static PsiClass findSuitableBaseClass(PsiMethod method) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bitwise/PointlessBitwiseExpressionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bitwise/PointlessBitwiseExpressionInspection.java index 5e379c8f82..5f3a4abcdd 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bitwise/PointlessBitwiseExpressionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bitwise/PointlessBitwiseExpressionInspection.java @@ -25,7 +25,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.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.util.IncorrectOperationException; @@ -200,8 +199,7 @@ public void visitPolyadicExpression( return; } final PsiType type = operand.getType(); - if (type == null || type.equals(PsiType.BOOLEAN) || - type.equalsToText(JavaClassNames.JAVA_LANG_BOOLEAN)) { + if (type == null || type.equals(PsiType.BOOLEAN) || type.equalsToText(CommonClassNames.JAVA_LANG_BOOLEAN)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedCollectionQueryUpdateInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedCollectionQueryUpdateInspection.java index 455e855334..43cf0a4735 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedCollectionQueryUpdateInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedCollectionQueryUpdateInspection.java @@ -34,7 +34,6 @@ import consulo.annotation.component.ExtensionImpl; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; @@ -60,7 +59,7 @@ public class MismatchedCollectionQueryUpdateInspection extends BaseInspection { private static final CallMatcher TRANSFORMED = CallMatcher.staticCall( - JavaClassNames.JAVA_UTIL_COLLECTIONS, + CommonClassNames.JAVA_UTIL_COLLECTIONS, "asLifoQueue", "checkedCollection", "checkedList", @@ -83,14 +82,14 @@ public class MismatchedCollectionQueryUpdateInspection ); private static final CallMatcher DERIVED = CallMatcher.anyOf( CollectionUtils.DERIVED_COLLECTION, - CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_LIST, "subList"), - CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_SORTED_MAP, "headMap", "tailMap", "subMap"), - CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_SORTED_SET, "headSet", "tailSet", "subSet") + CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_LIST, "subList"), + CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_SORTED_MAP, "headMap", "tailMap", "subMap"), + CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_SORTED_SET, "headSet", "tailSet", "subSet") ); private static final CallMatcher COLLECTION_SAFE_ARGUMENT_METHODS = CallMatcher.anyOf( - CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_COLLECTION, "addAll", "removeAll", "containsAll", "remove"), - CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "putAll", "remove") + CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_COLLECTION, "addAll", "removeAll", "containsAll", "remove"), + CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "putAll", "remove") ); private static final Set COLLECTIONS_QUERIES = Set.of("binarySearch", "disjoint", "indexOfSubList", "lastIndexOfSubList", "max", "min"); @@ -153,8 +152,8 @@ public JComponent createOptionsPanel() { JPanel ignoredClassesPanel = UiUtils.createAddRemoveTreeClassChooserPanel( ignoredClassesTable, ignoreClassesMessage.get(), - JavaClassNames.JAVA_UTIL_COLLECTION, - JavaClassNames.JAVA_UTIL_MAP + CommonClassNames.JAVA_UTIL_COLLECTION, + CommonClassNames.JAVA_UTIL_MAP ); JPanel namesPanel = new JPanel(new GridLayout(1, 2, UIUtil.DEFAULT_HGAP, UIUtil.DEFAULT_VGAP)); @@ -471,7 +470,7 @@ private static boolean isCollectionsClassMethod(PsiMethodCallExpression call) { return false; } String qualifiedName = aClass.getQualifiedName(); - return JavaClassNames.JAVA_UTIL_COLLECTIONS.equals(qualifiedName); + return CommonClassNames.JAVA_UTIL_COLLECTIONS.equals(qualifiedName); } private static boolean isQueryMethod(@Nonnull PsiCallExpression call) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java index a9bd9b3f64..3cd1e47448 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java @@ -24,7 +24,6 @@ import com.siyeh.ig.psiutils.VariableAccessUtils; 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.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; @@ -128,7 +127,7 @@ private static boolean checkVariable(PsiVariable variable, PsiElement context) { if (context == null) { return false; } - if (!TypeUtils.variableHasTypeOrSubtype(variable, JavaClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER)) { + if (!TypeUtils.variableHasTypeOrSubtype(variable, CommonClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER)) { return false; } if (VariableAccessUtils.variableIsAssigned(variable, context)) { @@ -174,8 +173,8 @@ private static boolean isDefaultConstructorCall(PsiExpression initializer) { } final PsiClass aClass = (PsiClass)target; final String qualifiedName = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING_BUILDER.equals(qualifiedName) && - !JavaClassNames.JAVA_LANG_STRING_BUFFER.equals(qualifiedName)) { + if (!CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(qualifiedName) && + !CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(qualifiedName)) { return false; } final PsiExpressionList argumentList = newExpression.getArgumentList(); @@ -312,7 +311,7 @@ public void visitReferenceExpression(PsiReferenceExpression expression) { return; } final PsiType type = polyadicExpression.getType(); - if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return; } queried = true; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/NewStringBufferWithCharArgumentInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/NewStringBufferWithCharArgumentInspection.java index c373829bba..41439e8a15 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/NewStringBufferWithCharArgumentInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/NewStringBufferWithCharArgumentInspection.java @@ -22,7 +22,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.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -118,7 +117,7 @@ public void visitNewExpression(PsiNewExpression expression) { return; } final PsiClass aClass = constructor.getContainingClass(); - if (!InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER)) { return; } registerNewExpressionError(expression, argument); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/NumberEqualityInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/NumberEqualityInspection.java index 2886bfde0a..fa61533db4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/NumberEqualityInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/NumberEqualityInspection.java @@ -16,10 +16,7 @@ package com.intellij.java.impl.ig.bugs; import com.intellij.java.impl.ig.fixes.EqualityToEqualsFix; -import com.intellij.java.language.psi.PsiBinaryExpression; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiJavaToken; -import com.intellij.java.language.psi.PsiKeyword; +import com.intellij.java.language.psi.*; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; @@ -27,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 jakarta.annotation.Nonnull; @ExtensionImpl @@ -90,8 +86,7 @@ public void visitBinaryExpression( } private static boolean hasNumberType(PsiExpression expression) { - return TypeUtils.expressionHasTypeOrSubtype(expression, - JavaClassNames.JAVA_LANG_NUMBER); + return TypeUtils.expressionHasTypeOrSubtype(expression, CommonClassNames.JAVA_LANG_NUMBER); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ObjectEqualityInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ObjectEqualityInspection.java index c8b36a4194..3f6b662688 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ObjectEqualityInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ObjectEqualityInspection.java @@ -28,7 +28,6 @@ import consulo.annotation.component.ExtensionImpl; import consulo.application.progress.ProgressManager; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.resolve.PsiElementProcessor; import consulo.language.psi.resolve.PsiElementProcessorAdapter; import consulo.language.psi.scope.GlobalSearchScope; @@ -194,11 +193,11 @@ private boolean isClass(@Nullable PsiExpression expression) { } final PsiClassType classType = (PsiClassType)type; final PsiClassType rawType = classType.rawType(); - return rawType.equalsToText(JavaClassNames.JAVA_LANG_CLASS); + return rawType.equalsToText(CommonClassNames.JAVA_LANG_CLASS); } private boolean isEnumType(@Nullable PsiExpression expression) { - return expression != null && TypeUtils.expressionHasTypeOrSubtype(expression, JavaClassNames.JAVA_LANG_ENUM); + return expression != null && TypeUtils.expressionHasTypeOrSubtype(expression, CommonClassNames.JAVA_LANG_ENUM); } private boolean isObjectType(PsiExpression expression) { @@ -210,7 +209,7 @@ private boolean isObjectType(PsiExpression expression) { !(type instanceof PsiArrayType) && !(type instanceof PsiPrimitiveType) && !TypeUtils.isJavaLangString(type) && - !TypeUtils.expressionHasTypeOrSubtype(expression, JavaClassNames.JAVA_LANG_NUMBER); + !TypeUtils.expressionHasTypeOrSubtype(expression, CommonClassNames.JAVA_LANG_NUMBER); } } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ObjectToStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ObjectToStringInspection.java index a195abeb50..f9b5fce6a4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ObjectToStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ObjectToStringInspection.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.ast.IElementType; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -93,7 +92,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) { } else if ("append".equals(name)) { final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, JavaClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER)) { + if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, CommonClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); @@ -111,7 +110,7 @@ else if ("valueOf".equals(name)) { } final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifierExpression; final String canonicalText = referenceExpression.getCanonicalText(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(canonicalText)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(canonicalText)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); @@ -133,7 +132,7 @@ private void checkExpression(PsiExpression expression) { return; } final PsiClassType classType = (PsiClassType)type; - if (type.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return; } final PsiClass referencedClass = classType.resolve(); @@ -157,7 +156,7 @@ private static boolean hasGoodToString(PsiClass aClass) { continue; } final String name = containingClass.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(name)) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(name)) { continue; } final PsiParameterList parameterList = method.getParameterList(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ParameterClassCheckVisitor.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ParameterClassCheckVisitor.java index 0a8e1965ba..c0d40b674d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ParameterClassCheckVisitor.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ParameterClassCheckVisitor.java @@ -15,13 +15,11 @@ */ package com.intellij.java.impl.ig.bugs; -import jakarta.annotation.Nonnull; - import com.intellij.java.language.psi.*; -import consulo.language.psi.*; -import consulo.language.psi.util.PsiTreeUtil; import com.siyeh.HardcodedMethodConstants; -import consulo.java.language.module.util.JavaClassNames; +import consulo.language.psi.PsiElement; +import consulo.language.psi.util.PsiTreeUtil; +import jakarta.annotation.Nonnull; class ParameterClassCheckVisitor extends JavaRecursiveElementWalkingVisitor { @@ -76,7 +74,7 @@ private boolean isGetInstanceCall(PsiMethodCallExpression methodCallExpression) return false; } final String className = aClass.getQualifiedName(); - if(!JavaClassNames.JAVA_LANG_CLASS.equals(className)) + if(!CommonClassNames.JAVA_LANG_CLASS.equals(className)) { return false; } @@ -115,7 +113,7 @@ private boolean isGetClassCall(PsiMethodCallExpression methodCallExpression) return false; } final String className = aClass.getQualifiedName(); - if(!JavaClassNames.JAVA_LANG_OBJECT.equals(className)) + if(!CommonClassNames.JAVA_LANG_OBJECT.equals(className)) { return false; } @@ -195,7 +193,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression expression) for(PsiParameter parameter : parameters) { final PsiType type = parameter.getType(); - if(type.equalsToText(JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION)) + if(type.equalsToText(CommonClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION)) { nullPointerExceptionFound = true; if(classCastExceptionFound) @@ -203,7 +201,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression expression) break; } } - else if(type.equalsToText(JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION)) + else if(type.equalsToText(CommonClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION)) { classCastExceptionFound = true; if(nullPointerExceptionFound) diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingDeprecatedAnnotationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingDeprecatedAnnotationInspection.java index dced5d3808..f51cc34d2f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingDeprecatedAnnotationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingDeprecatedAnnotationInspection.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.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.project.Project; @@ -127,7 +126,7 @@ private static boolean hasDeprecatedAnnotation(PsiModifierListOwner element) { if (modifierList == null) { return false; } - final PsiAnnotation annotation = modifierList.findAnnotation(JavaClassNames.JAVA_LANG_DEPRECATED); + final PsiAnnotation annotation = modifierList.findAnnotation(CommonClassNames.JAVA_LANG_DEPRECATED); return annotation != null; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingOverrideAnnotationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingOverrideAnnotationInspection.java index 2819ba5592..4b704c9b24 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingOverrideAnnotationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingOverrideAnnotationInspection.java @@ -25,7 +25,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.CleanupLocalInspectionTool; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -172,8 +171,7 @@ private boolean hasOverrideAnnotation( if (modifierList == null) { return false; } - final PsiAnnotation annotation = - modifierList.findAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); + final PsiAnnotation annotation = modifierList.findAnnotation(CommonClassNames.JAVA_LANG_OVERRIDE); return annotation != null; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/PointlessBooleanExpressionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/PointlessBooleanExpressionInspection.java index 7ebd4e38d3..be0bbe6c40 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/PointlessBooleanExpressionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/PointlessBooleanExpressionInspection.java @@ -15,26 +15,24 @@ */ package com.intellij.java.impl.ig.controlflow; -import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; -import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; import com.intellij.java.language.psi.*; -import consulo.localize.LocalizeValue; -import consulo.project.Project; -import consulo.language.psi.*; -import consulo.language.ast.IElementType; import com.intellij.java.language.psi.util.ConstantExpressionUtil; -import consulo.language.util.IncorrectOperationException; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ComparisonUtils; import com.siyeh.ig.psiutils.ExpressionUtils; import com.siyeh.ig.psiutils.ParenthesesUtils; -import consulo.java.language.module.util.JavaClassNames; - +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import consulo.language.ast.IElementType; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiWhiteSpace; +import consulo.language.util.IncorrectOperationException; +import consulo.localize.LocalizeValue; +import consulo.project.Project; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -342,7 +340,7 @@ else if (expression instanceof PsiPolyadicExpression) { return false; } final PsiType type = operand.getType(); - if (type == null || !type.equals(PsiType.BOOLEAN) && !type.equalsToText(JavaClassNames.JAVA_LANG_BOOLEAN)) { + if (type == null || !type.equals(PsiType.BOOLEAN) && !type.equalsToText(CommonClassNames.JAVA_LANG_BOOLEAN)) { return false; } containsConstant |= (evaluate(operand) != null); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java index 77d4eb0653..f9b7ba1ded 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java @@ -22,7 +22,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; @@ -82,7 +81,7 @@ public void visitNewExpression(PsiNewExpression expression) { return; } final PsiClass aClass = (PsiClass)target; - if (!InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_EXCEPTION)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_EXCEPTION)) { return; } if (ignoreWithoutParameters) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NonFinalFieldOfExceptionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NonFinalFieldOfExceptionInspection.java index 43814957a3..620d84e2cd 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NonFinalFieldOfExceptionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NonFinalFieldOfExceptionInspection.java @@ -15,18 +15,17 @@ */ package com.intellij.java.impl.ig.errorhandling; -import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.impl.ig.fixes.MakeFieldFinalFix; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiField; import com.intellij.java.language.psi.PsiModifier; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.java.impl.ig.fixes.MakeFieldFinalFix; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -69,8 +68,7 @@ public void visitField(PsiField field) { if (containingClass == null) { return; } - if (!InheritanceUtil.isInheritor(containingClass, - JavaClassNames.JAVA_LANG_EXCEPTION)) { + if (!InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_LANG_EXCEPTION)) { return; } registerFieldError(field, field); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MemberSignature.java b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MemberSignature.java index 47e7b8d7b4..137f483d4d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MemberSignature.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MemberSignature.java @@ -16,7 +16,6 @@ package com.intellij.java.impl.ig.fixes; import com.intellij.java.language.psi.*; -import consulo.java.language.module.util.JavaClassNames; import org.jetbrains.annotations.NonNls; import java.lang.reflect.Modifier; @@ -199,7 +198,7 @@ public static String createTypeSignature(PsiType type) { final String qualifiedName = psiClass.getQualifiedName(); if (qualifiedName == null) { // for type parameters - buffer.append(JavaClassNames.JAVA_LANG_OBJECT); + buffer.append(CommonClassNames.JAVA_LANG_OBJECT); } else { buffer.append(qualifiedName.replace('.', '/')); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java index 15e6f54eb3..48529f59a8 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.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.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; @@ -79,8 +78,7 @@ protected void doFix(Project project, ProblemDescriptor descriptor) project); final GlobalSearchScope scope = referenceList.getResolveScope(); final PsiJavaCodeReferenceElement referenceElement = - factory.createReferenceElementByFQClassName( - JavaClassNames.JAVA_LANG_EXCEPTION, scope); + factory.createReferenceElementByFQClassName(CommonClassNames.JAVA_LANG_EXCEPTION, scope); referenceList.add(referenceElement); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java index e646753745..1217e256a2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java @@ -15,19 +15,14 @@ */ package com.intellij.java.impl.ig.logging; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiExpressionList; -import com.intellij.java.language.psi.PsiMethodCallExpression; -import com.intellij.java.language.psi.PsiReferenceExpression; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.annotation.component.ExtensionImpl; -import consulo.ide.impl.idea.util.containers.ContainerUtilRt; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ExpressionUtils; -import consulo.java.language.module.util.JavaClassNames; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.ide.impl.idea.util.containers.ContainerUtilRt; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; @@ -112,7 +107,7 @@ else if (ExpressionUtils.hasStringType(firstArgument)) { } private static boolean hasThrowableType(PsiExpression lastArgument) { - return InheritanceUtil.isInheritor(lastArgument.getType(), JavaClassNames.JAVA_LANG_THROWABLE); + return InheritanceUtil.isInheritor(lastArgument.getType(), CommonClassNames.JAVA_LANG_THROWABLE); } public static int countPlaceholders(String value) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java index abc14bdcc5..dc2476c8fb 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java @@ -18,6 +18,7 @@ import com.intellij.java.impl.ig.fixes.RenameFix; import com.intellij.java.impl.ig.psiutils.LibraryUtil; import com.intellij.java.impl.ig.ui.UiUtils; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiMethod; import com.intellij.java.language.psi.PsiType; import com.siyeh.ig.BaseInspection; @@ -29,7 +30,6 @@ import consulo.deadCodeNotWorking.impl.CheckBox; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; -import consulo.java.language.module.util.JavaClassNames; import consulo.ui.ex.awt.FormBuilder; import consulo.util.xml.serializer.InvalidDataException; import consulo.util.xml.serializer.WriteExternalException; @@ -130,7 +130,7 @@ public void visitMethod(@Nonnull PsiMethod method) { if (returnType == null || returnType.equals(PsiType.BOOLEAN)) { return; } - if (ignoreBooleanMethods && returnType.equalsToText(JavaClassNames.JAVA_LANG_BOOLEAN)) { + if (ignoreBooleanMethods && returnType.equalsToText(CommonClassNames.JAVA_LANG_BOOLEAN)) { return; } final String name = method.getName(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/naming/NonExceptionNameEndsWithExceptionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/naming/NonExceptionNameEndsWithExceptionInspection.java index 2b06c5c55e..d9d9ee3a34 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/naming/NonExceptionNameEndsWithExceptionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/naming/NonExceptionNameEndsWithExceptionInspection.java @@ -23,7 +23,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.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; @@ -93,8 +92,7 @@ protected void doFix(Project project, ProblemDescriptor descriptor) final PsiElementFactory factory = facade.getElementFactory(); final GlobalSearchScope scope = aClass.getResolveScope(); final PsiJavaCodeReferenceElement reference = - factory.createReferenceElementByFQClassName( - JavaClassNames.JAVA_LANG_EXCEPTION, scope); + factory.createReferenceElementByFQClassName(CommonClassNames.JAVA_LANG_EXCEPTION, scope); final PsiJavaCodeReferenceElement[] referenceElements = extendsList.getReferenceElements(); for (PsiJavaCodeReferenceElement referenceElement : @@ -129,12 +127,10 @@ public void visitClass(@Nonnull PsiClass aClass) { if (!className.endsWith(exception)) { return; } - if (InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_EXCEPTION)) { + if (InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_EXCEPTION)) { return; } - registerClassError(aClass, className, - Boolean.valueOf(isOnTheFly())); + registerClassError(aClass, className, Boolean.valueOf(isOnTheFly())); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/NonReproducibleMathCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/NonReproducibleMathCallInspection.java index 2661a9419d..8a0c6f53d6 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/NonReproducibleMathCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/NonReproducibleMathCallInspection.java @@ -21,7 +21,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.inspection.ProblemDescriptor; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; @@ -114,7 +113,7 @@ public void visitMethodCallExpression( return; } final String className = referencedClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_MATH.equals(className)) { + if (!CommonClassNames.JAVA_LANG_MATH.equals(className)) { return; } registerMethodCallError(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java index 880f053ca1..92e842471d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java @@ -30,7 +30,6 @@ import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; import consulo.java.analysis.codeInspection.CantBeStaticCondition; import consulo.java.analysis.codeInspection.JavaExtensionPoints; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.util.lang.ref.SimpleReference; import jakarta.annotation.Nonnull; @@ -167,7 +166,7 @@ private boolean isExcluded(PsiMethod method) { if (!method.isPrivate()) { return false; } - if (!MethodUtils.hasInThrows(method, JavaClassNames.JAVA_IO_IO_EXCEPTION)) { + if (!MethodUtils.hasInThrows(method, CommonClassNames.JAVA_IO_IO_EXCEPTION)) { return false; } PsiType returnType = method.getReturnType(); @@ -186,7 +185,7 @@ private boolean isExcluded(PsiMethod method) { if (!method.isPrivate()) { return false; } - if (!MethodUtils.hasInThrows(method, JavaClassNames.JAVA_IO_IO_EXCEPTION, "java.lang.ClassNotFoundException")) { + if (!MethodUtils.hasInThrows(method, CommonClassNames.JAVA_IO_IO_EXCEPTION, "java.lang.ClassNotFoundException")) { return false; } PsiType returnType = method.getReturnType(); @@ -206,7 +205,7 @@ private boolean isExcluded(PsiMethod method) { return false; } PsiType returnType = method.getReturnType(); - if (returnType == null || !returnType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (returnType == null || !returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return false; } PsiParameterList parameterList = method.getParameterList(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/NonSerializableObjectBoundToHttpSessionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/NonSerializableObjectBoundToHttpSessionInspection.java index 60725164d0..efb4b94d5f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/NonSerializableObjectBoundToHttpSessionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/NonSerializableObjectBoundToHttpSessionInspection.java @@ -16,16 +16,12 @@ package com.intellij.java.impl.ig.serialization; import com.intellij.java.impl.ig.psiutils.SerializationUtils; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiExpressionList; -import com.intellij.java.language.psi.PsiMethodCallExpression; -import com.intellij.java.language.psi.PsiType; +import com.intellij.java.language.psi.*; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.MethodCallUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -56,14 +52,22 @@ private static class NonSerializableObjectBoundToHttpSessionVisitor public void visitMethodCallExpression( PsiMethodCallExpression methodCallExpression) { super.visitMethodCallExpression(methodCallExpression); - if (!MethodCallUtils.isSimpleCallToMethod(methodCallExpression, - "javax.servlet.http.HttpSession", PsiType.VOID, - "putValue", JavaClassNames.JAVA_LANG_STRING, - JavaClassNames.JAVA_LANG_OBJECT) && - !MethodCallUtils.isSimpleCallToMethod(methodCallExpression, - "javax.servlet.http.HttpSession", PsiType.VOID, - "setAttribute", JavaClassNames.JAVA_LANG_STRING, - JavaClassNames.JAVA_LANG_OBJECT)) { + if (!MethodCallUtils.isSimpleCallToMethod( + methodCallExpression, + "javax.servlet.http.HttpSession", + PsiType.VOID, + "putValue", + CommonClassNames.JAVA_LANG_STRING, + CommonClassNames.JAVA_LANG_OBJECT + ) + && !MethodCallUtils.isSimpleCallToMethod( + methodCallExpression, + "javax.servlet.http.HttpSession", + PsiType.VOID, + "setAttribute", + CommonClassNames.JAVA_LANG_STRING, + CommonClassNames.JAVA_LANG_OBJECT + )) { return; } final PsiExpressionList argumentList = diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/NonSerializableObjectPassedToObjectStreamInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/NonSerializableObjectPassedToObjectStreamInspection.java index f3e44e52e5..9945f58668 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/NonSerializableObjectPassedToObjectStreamInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/NonSerializableObjectPassedToObjectStreamInspection.java @@ -16,16 +16,12 @@ package com.intellij.java.impl.ig.serialization; import com.intellij.java.impl.ig.psiutils.SerializationUtils; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiExpressionList; -import com.intellij.java.language.psi.PsiMethodCallExpression; -import com.intellij.java.language.psi.PsiType; +import com.intellij.java.language.psi.*; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.MethodCallUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -57,9 +53,13 @@ public void visitMethodCallExpression( PsiMethodCallExpression methodCallExpression) { super.visitMethodCallExpression(methodCallExpression); - if (!MethodCallUtils.isSimpleCallToMethod(methodCallExpression, - "java.io.ObjectOutputStream", PsiType.VOID, "writeObject", - JavaClassNames.JAVA_LANG_OBJECT)) { + if (!MethodCallUtils.isSimpleCallToMethod( + methodCallExpression, + "java.io.ObjectOutputStream", + PsiType.VOID, + "writeObject", + CommonClassNames.JAVA_LANG_OBJECT + )) { return; } final PsiExpressionList argumentList = diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/migration/MigrationClassImpl.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/migration/MigrationClassImpl.java index ff30a968d5..d1fd3be049 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/migration/MigrationClassImpl.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/migration/MigrationClassImpl.java @@ -16,19 +16,18 @@ package com.intellij.java.impl.psi.impl.migration; import com.intellij.java.language.JavaLanguage; -import com.intellij.java.language.psi.*; -import consulo.util.lang.Pair; -import consulo.language.psi.*; import com.intellij.java.language.impl.psi.impl.InheritanceImplUtil; import com.intellij.java.language.impl.psi.impl.PsiClassImplUtil; -import consulo.language.impl.psi.LightElement; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.javadoc.PsiDocComment; +import consulo.content.scope.SearchScope; +import consulo.language.impl.psi.LightElement; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.meta.PsiMetaData; import consulo.language.psi.scope.GlobalSearchScope; -import consulo.content.scope.SearchScope; import consulo.language.util.IncorrectOperationException; -import consulo.java.language.module.util.JavaClassNames; - +import consulo.util.lang.Pair; import jakarta.annotation.Nonnull; import java.util.ArrayList; @@ -126,7 +125,7 @@ public PsiClassType[] getImplementsListTypes() { @Override public PsiClass getSuperClass() { return JavaPsiFacade.getInstance(myManager.getProject()) - .findClass(JavaClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(myManager.getProject())); + .findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(myManager.getProject())); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java index 3377558b5c..fbd837e44d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java @@ -27,7 +27,6 @@ import com.intellij.java.language.psi.javadoc.PsiDocTagValue; import com.intellij.java.language.psi.util.PsiUtil; import com.intellij.java.language.util.VisibilityUtil; -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.ui.RefactoringUIUtil; @@ -375,7 +374,7 @@ private static PsiMethod addMethodToClass(final PsiClass aClass, final PsiMethod final PsiMethod method = (PsiMethod) aClass.add(patternMethod); ChangeContextUtil.decodeContextInfo(method, null, null); if (canAddOverride && OverrideImplementUtil.isInsertOverride(method, aClass)) { - method.getModifierList().addAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); + method.getModifierList().addAnnotation(CommonClassNames.JAVA_LANG_OVERRIDE); } return method; } catch (IncorrectOperationException e) {