From 8788c85c98ec7c9b753cecb420a3a6131537e545 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 9 May 2025 22:10:41 +0300 Subject: [PATCH] Replacing JavaClassNames with CommonClassNames (part 9). --- .../SuspiciousMethodCallUtil.java | 20 +++++++--------- .../com/siyeh/ig/psiutils/StreamApiUtil.java | 11 ++++----- .../imports/StaticImportInspectionTest.java | 4 ++-- .../impl/memory/utils/StackFrameItem.java | 4 ++-- .../StrictSubtypingConstraint.java | 13 +++++----- ...WithQuotesAnnotationParameterValueFix.java | 3 +-- .../impl/SurroundAutoCloseableAction.java | 7 +++--- .../StreamFilterNotNullFix.java | 2 +- ...HasFrequentlyUsedInheritorsInspection.java | 11 ++++----- .../type/SubtypesHierarchyTreeStructure.java | 4 ++-- .../SupertypesHierarchyTreeStructure.java | 19 +++++++-------- ...tenationInMessageFormatCallInspection.java | 5 ++-- .../StringCompareToInspection.java | 7 +++--- .../StringConcatenationInspection.java | 3 +-- .../StringEqualsIgnoreCaseInspection.java | 8 +++---- .../StringEqualsInspection.java | 11 ++++----- .../StringToUpperWithoutLocaleInspection.java | 3 +-- .../memory/StringBufferFieldInspection.java | 5 ++-- ...rReplaceableByStringBuilderInspection.java | 9 ++++--- .../StandardVariableNamesInspection.java | 23 +++++++++--------- ...fferMustHaveInitialCapacityInspection.java | 11 +++------ ...fferToStringInConcatenationInspection.java | 5 ++-- ...ionInsideStringBufferAppendInspection.java | 7 +++--- .../StringConstructorInspection.java | 4 +--- .../StringEqualsEmptyStringInspection.java | 3 +-- ...ngReplaceableByStringBufferInspection.java | 9 ++----- .../performance/StringToStringInspection.java | 3 +-- .../performance/SubstringZeroInspection.java | 3 +-- ...ngBufferReplaceableByStringInspection.java | 15 ++++++------ .../chartostring/StringToCharPredicate.java | 24 +++++++++---------- .../concatenation/StringConcatPredicate.java | 12 +++++----- 31 files changed, 116 insertions(+), 152 deletions(-) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/miscGenerics/SuspiciousMethodCallUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/miscGenerics/SuspiciousMethodCallUtil.java index c136b6d4a8..9015d05372 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/miscGenerics/SuspiciousMethodCallUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/miscGenerics/SuspiciousMethodCallUtil.java @@ -10,7 +10,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import consulo.annotation.access.RequiredReadAction; import consulo.application.util.NullableLazyValue; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.InspectionsBundle; import consulo.language.editor.inspection.localize.InspectionLocalize; import consulo.language.psi.PsiElement; @@ -19,23 +18,22 @@ import consulo.language.psi.util.PsiTreeUtil; import consulo.util.collection.ArrayUtil; import consulo.util.lang.ObjectUtil; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; -import jakarta.annotation.Nonnull; - import java.util.List; public class SuspiciousMethodCallUtil { // List.of/Set.of are unnecessary here as they don't accept nulls private static final CallMatcher.Simple SINGLETON_COLLECTION = - CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_COLLECTIONS, "singletonList", "singleton").parameterCount(1); + CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_COLLECTIONS, "singletonList", "singleton").parameterCount(1); @RequiredReadAction private static void setupPatternMethods(PsiManager manager, GlobalSearchScope searchScope, List patternMethods) { JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(manager.getProject()); - PsiClass collectionClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_COLLECTION, searchScope); + PsiClass collectionClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_COLLECTION, searchScope); PsiClassType object = PsiType.getJavaLangObject(manager, searchScope); PsiType[] javaLangObject = {object}; PsiType[] twoObjects = { @@ -58,13 +56,13 @@ private static void setupPatternMethods(PsiManager manager, GlobalSearchScope se } } - PsiClass listClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_LIST, searchScope); + PsiClass listClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_LIST, searchScope); if (listClass != null) { addSingleParameterMethod(patternMethods, listClass, "indexOf", object); addSingleParameterMethod(patternMethods, listClass, "lastIndexOf", object); } - PsiClass mapClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_MAP, searchScope); + PsiClass mapClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, searchScope); if (mapClass != null) { PsiMethod remove = MethodSignatureUtil.findMethodBySignature(mapClass, removeSignature, false); addMethod(remove, 0, patternMethods, 0); @@ -104,7 +102,7 @@ private static void setupPatternMethods(PsiManager manager, GlobalSearchScope se addMethod(containsValue, 1, patternMethods, 0); } - PsiClass concurrentMapClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP, searchScope); + PsiClass concurrentMapClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP, searchScope); if (concurrentMapClass != null) { MethodSignature containsSignature = MethodSignatureUtil.createMethodSignature("contains", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY); @@ -276,7 +274,7 @@ public static String getSuspiciousMethodCallMessage( if (arg instanceof PsiConditionalExpression && argType != null - && argType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) + && argType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && PsiPolyExpressionUtil.isPolyExpression(arg)) { return null; } @@ -361,7 +359,7 @@ public static String getSuspiciousMethodCallMessage( PsiParameter[] parameters = method.getParameterList().getParameters(); if (parameters.length == 1 && ("removeAll".equals(method.getName()) || "retainAll".equals(method.getName()))) { PsiType paramType = parameters[0].getType(); - if (InheritanceUtil.isInheritor(paramType, JavaClassNames.JAVA_UTIL_COLLECTION)) { + if (InheritanceUtil.isInheritor(paramType, CommonClassNames.JAVA_UTIL_COLLECTION)) { PsiType qualifierType = qualifier.getType(); if (qualifierType != null) { PsiType itemType = JavaGenericsUtil.getCollectionItemType(argType, calleeMethod.getResolveScope()); @@ -422,7 +420,7 @@ public static String getSuspiciousMethodCallMessage( } private static String getPreciseObjectTitle(PsiClass patternClass, int index) { - if (InheritanceUtil.isInheritor(patternClass, JavaClassNames.JAVA_UTIL_MAP)) { + if (InheritanceUtil.isInheritor(patternClass, CommonClassNames.JAVA_UTIL_MAP)) { return index == 0 ? "keys" : "values"; } diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/StreamApiUtil.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/StreamApiUtil.java index d6231d3d50..80656f391e 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/StreamApiUtil.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/StreamApiUtil.java @@ -18,7 +18,6 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.java.language.module.util.JavaClassNames; import org.jetbrains.annotations.Contract; /** @@ -36,19 +35,19 @@ public static PsiType getStreamElementType(PsiType type, boolean variableType) { return null; } PsiClass aClass = ((PsiClassType) type).resolve(); - if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_INT_STREAM)) { + if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_INT_STREAM)) { return PsiType.INT; } - if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_LONG_STREAM)) { + if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_LONG_STREAM)) { return PsiType.LONG; } - if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_DOUBLE_STREAM)) { + if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_DOUBLE_STREAM)) { return PsiType.DOUBLE; } - if (!InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_STREAM)) { + if (!InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_STREAM)) { return null; } - PsiType streamType = PsiUtil.substituteTypeParameter(type, JavaClassNames.JAVA_UTIL_STREAM_STREAM, 0, false); + PsiType streamType = PsiUtil.substituteTypeParameter(type, CommonClassNames.JAVA_UTIL_STREAM_STREAM, 0, false); if (variableType) { if (streamType instanceof PsiIntersectionType) { return null; diff --git a/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java b/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java index ed707b21fc..8a76839f9e 100644 --- a/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java +++ b/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java @@ -1,13 +1,13 @@ package com.siyeh.ig.imports; +import com.intellij.java.language.psi.CommonClassNames; import com.siyeh.ig.IGInspectionTestCase; -import consulo.java.language.module.util.JavaClassNames; public class StaticImportInspectionTest extends IGInspectionTestCase { public void test() throws Exception { final StaticImportInspection tool = new StaticImportInspection(); - tool.allowedClasses.add(JavaClassNames.JAVA_UTIL_MAP); + tool.allowedClasses.add(CommonClassNames.JAVA_UTIL_MAP); doTest("com/siyeh/igtest/imports/static_import", tool); } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/memory/utils/StackFrameItem.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/memory/utils/StackFrameItem.java index fefaedcf97..3b5aa14a7d 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/memory/utils/StackFrameItem.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/memory/utils/StackFrameItem.java @@ -26,6 +26,7 @@ import com.intellij.java.debugger.impl.settings.NodeRendererSettings; import com.intellij.java.debugger.impl.ui.breakpoints.StackCapturingLineBreakpoint; import com.intellij.java.debugger.impl.ui.tree.render.ClassRenderer; +import com.intellij.java.language.psi.CommonClassNames; import consulo.execution.debug.XSourcePosition; import consulo.execution.debug.frame.*; import consulo.execution.debug.frame.presentation.XStringValuePresentation; @@ -33,7 +34,6 @@ import consulo.execution.debug.ui.XDebuggerUIConstants; import consulo.ide.setting.ShowSettingsUtil; import consulo.internal.com.sun.jdi.*; -import consulo.java.language.module.util.JavaClassNames; import consulo.logging.Logger; import consulo.platform.base.icon.PlatformIconGroup; import consulo.ui.ex.ColoredTextContainer; @@ -194,7 +194,7 @@ public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace p ClassRenderer classRenderer = NodeRendererSettings.getInstance().getClassRenderer(); String type = classRenderer.renderTypeName(myType); Image icon = myVarType == VariableItem.VarType.PARAM ? PlatformIconGroup.nodesParameter() : ExecutionDebugIconGroup.nodeValue(); - if (myType != null && myType.startsWith(JavaClassNames.JAVA_LANG_STRING + "@")) { + if (myType != null && myType.startsWith(CommonClassNames.JAVA_LANG_STRING + "@")) { node.setPresentation(icon, new XStringValuePresentation(myValue) { @Nullable @Override diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java index 8b48caef33..4c5e193525 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java @@ -15,17 +15,16 @@ */ package com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.constraints; -import java.util.HashSet; -import java.util.List; - -import com.intellij.java.language.psi.*; import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceBound; import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceSession; import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceVariable; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PsiUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; -import consulo.java.language.module.util.JavaClassNames; + +import java.util.HashSet; +import java.util.List; /** * User: anna @@ -68,7 +67,7 @@ private boolean doReduce(InferenceSession session, HashSet de { if(myT == null) { - return myS == null || myS.equalsToText(JavaClassNames.JAVA_LANG_OBJECT); + return myS == null || myS.equalsToText(CommonClassNames.JAVA_LANG_OBJECT); } if(myS == null) { @@ -81,7 +80,7 @@ private boolean doReduce(InferenceSession session, HashSet de { return false; } - if(PsiType.NULL.equals(myS) || myS == null || myT.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) + if(PsiType.NULL.equals(myS) || myS == null || myT.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return true; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java index cac5e4710b..2d477a8dc6 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java @@ -17,7 +17,6 @@ import com.intellij.java.language.psi.*; import consulo.codeEditor.Editor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.SyntheticIntentionAction; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; @@ -45,7 +44,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file return false; } final PsiClass resolvedType = ((PsiClassType)myExpectedType).resolve(); - return resolvedType != null && JavaClassNames.JAVA_LANG_STRING.equals(resolvedType.getQualifiedName()) && + return resolvedType != null && CommonClassNames.JAVA_LANG_STRING.equals(resolvedType.getQualifiedName()) && myValue instanceof PsiLiteralExpression; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/SurroundAutoCloseableAction.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/SurroundAutoCloseableAction.java index 1d4f3d99d9..182e681e78 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/SurroundAutoCloseableAction.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/SurroundAutoCloseableAction.java @@ -23,7 +23,6 @@ import consulo.annotation.access.RequiredReadAction; import consulo.annotation.component.ExtensionImpl; import consulo.codeEditor.Editor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.editor.intention.PsiElementBaseIntentionAction; @@ -64,8 +63,10 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor, if (!(type instanceof PsiClassType)) return false; final PsiClass aClass = ((PsiClassType)type).resolve(); final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); - final PsiClass autoCloseable = - facade.findClass(JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE, (GlobalSearchScope) ProjectScopes.getLibrariesScope(project)); + final PsiClass autoCloseable = facade.findClass( + CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, + (GlobalSearchScope) ProjectScopes.getLibrariesScope(project) + ); return InheritanceUtil.isInheritorOrSelf(aClass, autoCloseable, true); } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/StreamFilterNotNullFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/StreamFilterNotNullFix.java index b417e08259..171f768ec2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/StreamFilterNotNullFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/StreamFilterNotNullFix.java @@ -122,7 +122,7 @@ public static StreamFilterNotNullFix makeFix(PsiElement reference) { return null; } PsiExpression qualifier = call.getMethodExpression().getQualifierExpression(); - if (qualifier == null || !InheritanceUtil.isInheritor(qualifier.getType(), JavaClassNames.JAVA_UTIL_STREAM_STREAM)) { + if (qualifier == null || !InheritanceUtil.isInheritor(qualifier.getType(), CommonClassNames.JAVA_UTIL_STREAM_STREAM)) { return null; } return new StreamFilterNotNullFix(); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/inheritance/SuperClassHasFrequentlyUsedInheritorsInspection.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/inheritance/SuperClassHasFrequentlyUsedInheritorsInspection.java index 2d72f462db..209d24718a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/inheritance/SuperClassHasFrequentlyUsedInheritorsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/inheritance/SuperClassHasFrequentlyUsedInheritorsInspection.java @@ -5,16 +5,15 @@ import com.intellij.java.impl.codeInspection.inheritance.search.InheritorsStatisticsSearchResult; import com.intellij.java.language.psi.*; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.editor.inspection.ProblemHighlightType; import consulo.language.editor.inspection.localize.InspectionLocalize; import consulo.language.editor.inspection.scheme.InspectionManager; -import org.jetbrains.annotations.Nls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.Nls; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -100,9 +99,9 @@ private static PsiClass getSuperIfUnique(final @Nonnull PsiClass aClass) { final PsiJavaCodeReferenceElement[] referenceElements = extendsList.getReferenceElements(); if (referenceElements.length == 1) { PsiClass returnClass = (PsiClass)referenceElements[0].resolve(); - if (returnClass != null && - !JavaClassNames.JAVA_LANG_OBJECT.equals(returnClass.getQualifiedName()) && - !returnClass.isInterface()) { + if (returnClass != null + && !CommonClassNames.JAVA_LANG_OBJECT.equals(returnClass.getQualifiedName()) + && !returnClass.isInterface()) { return returnClass; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SubtypesHierarchyTreeStructure.java b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SubtypesHierarchyTreeStructure.java index cdc86a51b5..6662639071 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SubtypesHierarchyTreeStructure.java +++ b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SubtypesHierarchyTreeStructure.java @@ -17,13 +17,13 @@ import com.intellij.java.indexing.search.searches.ClassInheritorsSearch; import com.intellij.java.indexing.search.searches.FunctionalExpressionSearch; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiAnonymousClass; import com.intellij.java.language.psi.PsiClass; import consulo.content.scope.SearchScope; import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor; import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure; import consulo.ide.localize.IdeLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.project.Project; import consulo.util.collection.ArrayUtil; import jakarta.annotation.Nonnull; @@ -51,7 +51,7 @@ protected final Object[] buildChildren(@Nonnull HierarchyNodeDescriptor descript if (!(element instanceof PsiClass psiClass)) { return ArrayUtil.EMPTY_OBJECT_ARRAY; } - if (JavaClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) { return new Object[]{IdeLocalize.nodeHierarchyJavaLangObject().get()}; } if (psiClass instanceof PsiAnonymousClass) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SupertypesHierarchyTreeStructure.java b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SupertypesHierarchyTreeStructure.java index 3644c212c3..6c69bdb954 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SupertypesHierarchyTreeStructure.java +++ b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/type/SupertypesHierarchyTreeStructure.java @@ -15,20 +15,19 @@ */ package com.intellij.java.impl.ide.hierarchy.type; -import java.util.ArrayList; -import java.util.List; - -import jakarta.annotation.Nonnull; - -import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor; -import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure; -import consulo.project.Project; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.JavaPsiFacade; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiFunctionalExpression; import com.intellij.java.language.psi.util.PsiUtil; +import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor; +import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure; +import consulo.project.Project; import consulo.util.collection.ArrayUtil; +import jakarta.annotation.Nonnull; + +import java.util.ArrayList; +import java.util.List; public final class SupertypesHierarchyTreeStructure extends HierarchyTreeStructure { public SupertypesHierarchyTreeStructure(Project project, PsiClass aClass) { @@ -43,7 +42,7 @@ protected final Object[] buildChildren(@Nonnull HierarchyNodeDescriptor descript PsiClass[] supers = psiClass.getSupers(); List descriptors = new ArrayList<>(); PsiClass objectClass = - JavaPsiFacade.getInstance(myProject).findClass(JavaClassNames.JAVA_LANG_OBJECT, psiClass.getResolveScope()); + JavaPsiFacade.getInstance(myProject).findClass(CommonClassNames.JAVA_LANG_OBJECT, psiClass.getResolveScope()); for (PsiClass aSuper : supers) { if (!psiClass.isInterface() || !aSuper.equals(objectClass)) { descriptors.add(new TypeHierarchyNodeDescriptor(myProject, descriptor, aSuper, false)); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/StringConcatenationInMessageFormatCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/StringConcatenationInMessageFormatCallInspection.java index 7b5f0faac6..372318e587 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/StringConcatenationInMessageFormatCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/StringConcatenationInMessageFormatCallInspection.java @@ -25,7 +25,6 @@ import com.siyeh.ig.psiutils.ExpressionUtils; 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; @@ -171,7 +170,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) { } final PsiExpression formatArgument = arguments[formatArgumentIndex]; final PsiType formatArgumentType = formatArgument.getType(); - if (formatArgumentType == null || !formatArgumentType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (formatArgumentType == null || !formatArgumentType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return; } if (!(formatArgument instanceof PsiBinaryExpression)) { @@ -183,7 +182,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) { final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)formatArgument; final PsiExpression lhs = binaryExpression.getLOperand(); final PsiType lhsType = lhs.getType(); - if (lhsType == null || !lhsType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (lhsType == null || !lhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return; } final PsiExpression rhs = binaryExpression.getROperand(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringCompareToInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringCompareToInspection.java index 74eeaac0cd..ec5acb4100 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringCompareToInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringCompareToInspection.java @@ -15,19 +15,18 @@ */ package com.intellij.java.impl.ig.internationalization; -import com.intellij.java.language.codeInsight.AnnotationUtil; import com.intellij.java.analysis.impl.codeInsight.intention.AddAnnotationFix; +import com.intellij.java.impl.ig.DelegatingFix; +import com.intellij.java.language.codeInsight.AnnotationUtil; import com.intellij.java.language.psi.*; import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import com.intellij.java.impl.ig.DelegatingFix; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.MethodUtils; import com.siyeh.ig.psiutils.TypeUtils; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import java.util.ArrayList; @@ -144,7 +143,7 @@ private static boolean isStringCompareTo( return false; } final String className = aClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_STRING.equals(className); + return CommonClassNames.JAVA_LANG_STRING.equals(className); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringConcatenationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringConcatenationInspection.java index 10bb31f49d..62953a90b8 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringConcatenationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringConcatenationInspection.java @@ -32,7 +32,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.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; @@ -208,7 +207,7 @@ public void visitPolyadicExpression(@Nonnull PsiPolyadicExpression expression) { PsiTreeUtil.getParentOfType(expression, PsiNewExpression.class, true, PsiCodeBlock.class, PsiClass.class); if (newExpression != null) { final PsiType newExpressionType = newExpression.getType(); - if (InheritanceUtil.isInheritor(newExpressionType, JavaClassNames.JAVA_LANG_THROWABLE)) { + if (InheritanceUtil.isInheritor(newExpressionType, CommonClassNames.JAVA_LANG_THROWABLE)) { return; } } else { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringEqualsIgnoreCaseInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringEqualsIgnoreCaseInspection.java index 0c6534502d..a7ca5b5926 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringEqualsIgnoreCaseInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringEqualsIgnoreCaseInspection.java @@ -15,19 +15,17 @@ */ package com.intellij.java.impl.ig.internationalization; -import com.intellij.java.language.codeInsight.AnnotationUtil; import com.intellij.java.analysis.impl.codeInsight.intention.AddAnnotationFix; +import com.intellij.java.impl.ig.DelegatingFix; +import com.intellij.java.language.codeInsight.AnnotationUtil; import com.intellij.java.language.psi.*; import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import com.intellij.java.impl.ig.DelegatingFix; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.TypeUtils; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; - import jakarta.annotation.Nonnull; import java.util.ArrayList; @@ -121,7 +119,7 @@ public void visitMethodCallExpression( return; } final String className = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(className)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(className)) { return; } final PsiExpression qualifier = diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringEqualsInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringEqualsInspection.java index cc74ce5ade..7a1cac9fe4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringEqualsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringEqualsInspection.java @@ -26,9 +26,8 @@ import com.siyeh.ig.psiutils.MethodCallUtils; import com.siyeh.ig.psiutils.TypeUtils; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; - import jakarta.annotation.Nonnull; + import java.util.ArrayList; import java.util.List; @@ -113,13 +112,11 @@ public void visitMethodCallExpression( return; } final String className = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(className)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(className)) { return; } - final PsiReferenceExpression methodExpression = - expression.getMethodExpression(); - final PsiExpression qualifier = - methodExpression.getQualifierExpression(); + final PsiReferenceExpression methodExpression = expression.getMethodExpression(); + final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (NonNlsUtils.isNonNlsAnnotated(qualifier)) { return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringToUpperWithoutLocaleInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringToUpperWithoutLocaleInspection.java index e05d26d9eb..f9f3fe0877 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringToUpperWithoutLocaleInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringToUpperWithoutLocaleInspection.java @@ -25,7 +25,6 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -92,7 +91,7 @@ public void visitMethodCallExpression(@Nonnull PsiMethodCallExpression expressio return; } final String className = containingClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(className)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(className)) { return; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/memory/StringBufferFieldInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/memory/StringBufferFieldInspection.java index 5e75118cf3..b21ea7dddc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/memory/StringBufferFieldInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/memory/StringBufferFieldInspection.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.ig.memory; +import com.intellij.java.language.psi.CommonClassNames; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.java.language.module.util.JavaClassNames; @@ -55,8 +56,8 @@ private static class StringBufferFieldVisitor public void visitField(@Nonnull PsiField field) { super.visitField(field); final PsiType type = field.getType(); - if (!type.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUFFER) && - !type.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUILDER)) { + if (!type.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUFFER) && + !type.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUILDER)) { return; } registerFieldError(field, type); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/StringBufferReplaceableByStringBuilderInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/StringBufferReplaceableByStringBuilderInspection.java index 12f0f1ec95..fb14af08c2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/StringBufferReplaceableByStringBuilderInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/StringBufferReplaceableByStringBuilderInspection.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.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; @@ -102,7 +101,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); - final PsiClass stringBuilderClass = psiFacade.findClass(JavaClassNames.JAVA_LANG_STRING_BUILDER, element.getResolveScope()); + final PsiClass stringBuilderClass = psiFacade.findClass(CommonClassNames.JAVA_LANG_STRING_BUILDER, element.getResolveScope()); if (stringBuilderClass == null) { return; } @@ -148,8 +147,8 @@ public BaseInspectionVisitor buildVisitor() { private static class StringBufferReplaceableByStringBuilderVisitor extends BaseInspectionVisitor { - private static final Set excludes = new HashSet(Arrays.asList(JavaClassNames.JAVA_LANG_STRING_BUILDER, - JavaClassNames.JAVA_LANG_STRING_BUFFER)); + private static final Set excludes = + new HashSet(Arrays.asList(CommonClassNames.JAVA_LANG_STRING_BUILDER, CommonClassNames.JAVA_LANG_STRING_BUFFER)); @Override public void visitDeclarationStatement(PsiDeclarationStatement statement) { @@ -180,7 +179,7 @@ private static boolean isReplaceableStringBuffer(PsiVariable variable, PsiElemen return false; } final PsiType type = variable.getType(); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING_BUFFER, type)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUFFER, type)) { return false; } final PsiExpression initializer = variable.getInitializer(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/naming/StandardVariableNamesInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/naming/StandardVariableNamesInspection.java index 68ff6aca3f..7d01105511 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/naming/StandardVariableNamesInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/naming/StandardVariableNamesInspection.java @@ -24,7 +24,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; @@ -54,17 +53,17 @@ public class StandardVariableNamesInspection extends BaseInspection { s_expectedTypes.put("m", "int"); s_expectedTypes.put("n", "int"); s_expectedTypes.put("l", "long"); - s_expectedTypes.put("s", JavaClassNames.JAVA_LANG_STRING); - s_expectedTypes.put("str", JavaClassNames.JAVA_LANG_STRING); - - s_boxingClasses.put("int", JavaClassNames.JAVA_LANG_INTEGER); - s_boxingClasses.put("short", JavaClassNames.JAVA_LANG_SHORT); - s_boxingClasses.put("boolean", JavaClassNames.JAVA_LANG_BOOLEAN); - s_boxingClasses.put("long", JavaClassNames.JAVA_LANG_LONG); - s_boxingClasses.put("byte", JavaClassNames.JAVA_LANG_BYTE); - s_boxingClasses.put("float", JavaClassNames.JAVA_LANG_FLOAT); - s_boxingClasses.put("double", JavaClassNames.JAVA_LANG_DOUBLE); - s_boxingClasses.put("char", JavaClassNames.JAVA_LANG_CHARACTER); + s_expectedTypes.put("s", CommonClassNames.JAVA_LANG_STRING); + s_expectedTypes.put("str", CommonClassNames.JAVA_LANG_STRING); + + s_boxingClasses.put("int", CommonClassNames.JAVA_LANG_INTEGER); + s_boxingClasses.put("short", CommonClassNames.JAVA_LANG_SHORT); + s_boxingClasses.put("boolean", CommonClassNames.JAVA_LANG_BOOLEAN); + s_boxingClasses.put("long", CommonClassNames.JAVA_LANG_LONG); + s_boxingClasses.put("byte", CommonClassNames.JAVA_LANG_BYTE); + s_boxingClasses.put("float", CommonClassNames.JAVA_LANG_FLOAT); + s_boxingClasses.put("double", CommonClassNames.JAVA_LANG_DOUBLE); + s_boxingClasses.put("char", CommonClassNames.JAVA_LANG_CHARACTER); } @SuppressWarnings("PublicField") diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferMustHaveInitialCapacityInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferMustHaveInitialCapacityInspection.java index 90a072f1e5..15e7f1d709 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferMustHaveInitialCapacityInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferMustHaveInitialCapacityInspection.java @@ -15,16 +15,12 @@ */ package com.intellij.java.impl.ig.performance; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiExpressionList; -import com.intellij.java.language.psi.PsiNewExpression; -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.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -63,9 +59,8 @@ public void visitNewExpression( super.visitNewExpression(expression); final PsiType type = expression.getType(); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING_BUFFER, - type) && - !TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING_BUILDER, type)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUFFER, type) && + !TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUILDER, type)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferToStringInConcatenationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferToStringInConcatenationInspection.java index d4750d3ca8..a0b7929e6a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferToStringInConcatenationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferToStringInConcatenationInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.ExpressionUtils; 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,8 +117,8 @@ private static boolean isStringBufferToString( return false; } final String className = aClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || - JavaClassNames.JAVA_LANG_STRING_BUILDER.equals(className); + return CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) + || CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java index 3ab12805fa..582efeb3e7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java @@ -25,7 +25,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.access.RequiredReadAction; 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; @@ -128,8 +127,8 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) { return; } final String className = containingClass.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || - JavaClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { + if (CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) + || CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { registerMethodCallError(expression, containingClass); return; } @@ -160,7 +159,7 @@ private static boolean isConcatenation(PsiExpression expression) { if (type == null) { return false; } - return type.equalsToText(JavaClassNames.JAVA_LANG_STRING); + return type.equalsToText(CommonClassNames.JAVA_LANG_STRING); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConstructorInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConstructorInspection.java index e766d66735..8e8df440f1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConstructorInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConstructorInspection.java @@ -23,7 +23,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -169,8 +168,7 @@ private boolean hasSubstringArgument(PsiExpression argument) { } final String className = aClass.getQualifiedName(); @NonNls final String methodName = method.getName(); - return JavaClassNames.JAVA_LANG_STRING.equals(className) && - methodName.equals("substring"); + return CommonClassNames.JAVA_LANG_STRING.equals(className) && methodName.equals("substring"); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringEqualsEmptyStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringEqualsEmptyStringInspection.java index 4d80824541..6bb2d67ff9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringEqualsEmptyStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringEqualsEmptyStringInspection.java @@ -26,7 +26,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -156,7 +155,7 @@ private String getRemainingText(PsiExpression expression) { } final PsiType type = qualifierExpression.getType(); if (HardcodedMethodConstants.TO_STRING.equals(referenceName) && type != null && (type.equalsToText( - JavaClassNames.JAVA_LANG_STRING_BUFFER) || type.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUILDER))) { + CommonClassNames.JAVA_LANG_STRING_BUFFER) || type.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUILDER))) { return qualifierExpression.getText(); } else { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringReplaceableByStringBufferInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringReplaceableByStringBufferInspection.java index ba57b55b72..880bd8d903 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringReplaceableByStringBufferInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringReplaceableByStringBufferInspection.java @@ -15,17 +15,13 @@ */ package com.intellij.java.impl.ig.performance; -import com.intellij.java.language.psi.PsiCodeBlock; -import com.intellij.java.language.psi.PsiLocalVariable; -import com.intellij.java.language.psi.PsiType; -import com.intellij.java.language.psi.PsiVariable; +import com.intellij.java.language.psi.*; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; import consulo.localize.LocalizeValue; @@ -81,8 +77,7 @@ public void visitLocalVariable( return; } final PsiType type = variable.getType(); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, - type)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, type)) { return; } if (!variableIsAppendedTo(variable, codeBlock)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringToStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringToStringInspection.java index 3898fa9ae5..258d7e1fbb 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringToStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringToStringInspection.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.util.IncorrectOperationException; import consulo.project.Project; @@ -107,7 +106,7 @@ public void visitMethodCallExpression(@Nonnull PsiMethodCallExpression expressio return; } final String className = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(className)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(className)) { return; } registerError(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/SubstringZeroInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/SubstringZeroInspection.java index f9284772d3..441980a81a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/SubstringZeroInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/SubstringZeroInspection.java @@ -22,7 +22,6 @@ import com.siyeh.ig.psiutils.ExpressionUtils; 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; @@ -105,7 +104,7 @@ public void visitMethodCallExpression(@Nonnull PsiMethodCallExpression expressio return; } final String className = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(className)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(className)) { return; } registerError(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java index 5b40b3485e..9a8231e763 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.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.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; @@ -58,7 +57,7 @@ public String buildErrorString(Object... infos) { @Override protected InspectionGadgetsFix buildFix(Object... infos) { final String typeText = ((PsiType)infos[1]).getCanonicalText(); - return new StringBufferReplaceableByStringFix(JavaClassNames.JAVA_LANG_STRING_BUILDER.equals(typeText)); + return new StringBufferReplaceableByStringFix(CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(typeText)); } private static class StringBufferReplaceableByStringFix extends InspectionGadgetsFix { @@ -125,7 +124,7 @@ private static StringBuilder buildStringExpression(PsiExpression expression, @No final PsiType type = argument.getType(); if (!PsiType.INT.equals(type)) { result.append(argument.getText()); - if (type != null && type.equalsToText(JavaClassNames.JAVA_LANG_CHAR_SEQUENCE)) { + if (type != null && type.equalsToText(CommonClassNames.JAVA_LANG_CHAR_SEQUENCE)) { result.append(".toString()"); } } @@ -186,7 +185,7 @@ else if (expression instanceof PsiMethodCallExpression) { result.append('(').append(argumentText).append(')'); } else { - if (type != null && !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type != null && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { result.append("String.valueOf(").append(argumentText).append(")"); } else { @@ -217,8 +216,8 @@ public void visitLocalVariable(@Nonnull PsiLocalVariable variable) { return; } final PsiType type = variable.getType(); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING_BUFFER, type) && - !TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING_BUILDER, type)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUFFER, type) && + !TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUILDER, type)) { return; } final PsiExpression initializer = variable.getInitializer(); @@ -250,8 +249,8 @@ public void visitLocalVariable(@Nonnull PsiLocalVariable variable) { public void visitNewExpression(PsiNewExpression expression) { super.visitNewExpression(expression); final PsiType type = expression.getType(); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING_BUFFER, type) && - !TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING_BUILDER, type)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUFFER, type) && + !TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUILDER, type)) { return; } final PsiExpression completeExpression = getCompleteExpression(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/StringToCharPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/StringToCharPredicate.java index 43ba6e66ed..9fcb8f785a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/StringToCharPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/StringToCharPredicate.java @@ -15,12 +15,11 @@ */ package com.intellij.java.impl.ipp.chartostring; +import com.intellij.java.impl.ipp.base.PsiElementPredicate; import com.intellij.java.language.psi.*; -import consulo.language.psi.*; import consulo.language.ast.IElementType; +import consulo.language.psi.PsiElement; import consulo.util.collection.ArrayUtil; -import com.intellij.java.impl.ipp.base.PsiElementPredicate; -import consulo.java.language.module.util.JavaClassNames; import org.jetbrains.annotations.NonNls; class StringToCharPredicate implements PsiElementPredicate { @@ -36,7 +35,7 @@ public boolean satisfiedBy(PsiElement element) { return false; } final String typeText = type.getCanonicalText(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(typeText)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(typeText)) { return false; } final String value = (String)expression.getValue(); @@ -56,7 +55,7 @@ private static boolean isInConcatenationContext(PsiElement element) { return false; } final String parentTypeText = parentType.getCanonicalText(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(parentTypeText)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(parentTypeText)) { return false; } if (parentExpression.getOperationTokenType() != JavaTokenType.PLUS) { @@ -67,14 +66,14 @@ private static boolean isInConcatenationContext(PsiElement element) { if (index > 0) { for (int i = 0; i < index && i < operands.length; i++) { final PsiType type = operands[i].getType(); - if (type != null && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type != null && type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return true; } } } else if (index == 0) { final PsiType type = operands[index + 1].getType(); - return type != null && type.equalsToText(JavaClassNames.JAVA_LANG_STRING); + return type != null && type.equalsToText(CommonClassNames.JAVA_LANG_STRING); } return false; } @@ -90,7 +89,7 @@ else if (parent instanceof PsiAssignmentExpression) { return false; } final String parentTypeText = parentType.getCanonicalText(); - return JavaClassNames.JAVA_LANG_STRING.equals(parentTypeText); + return CommonClassNames.JAVA_LANG_STRING.equals(parentTypeText); } if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); @@ -116,8 +115,8 @@ else if (parent instanceof PsiAssignmentExpression) { return false; } final String className = type.getCanonicalText(); - if (JavaClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || - JavaClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { + if (CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || + CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { @NonNls final String methodName = methodExpression.getReferenceName(); if (!"append".equals(methodName) && @@ -127,9 +126,8 @@ else if (parent instanceof PsiAssignmentExpression) { final PsiElement method = methodExpression.resolve(); return method != null; } - else if (JavaClassNames.JAVA_LANG_STRING.equals(className)) { - @NonNls final String methodName = - methodExpression.getReferenceName(); + else if (CommonClassNames.JAVA_LANG_STRING.equals(className)) { + @NonNls final String methodName = methodExpression.getReferenceName(); if (!"indexOf".equals(methodName) && !"lastIndexOf".equals(methodName) && !"replace".equals(methodName)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/StringConcatPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/StringConcatPredicate.java index 5dbc727452..938f4c2ee7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/StringConcatPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/StringConcatPredicate.java @@ -15,11 +15,11 @@ */ package com.intellij.java.impl.ipp.concatenation; +import com.intellij.java.impl.ipp.base.PsiElementPredicate; import com.intellij.java.language.psi.*; -import consulo.language.psi.*; import consulo.language.ast.IElementType; -import com.intellij.java.impl.ipp.base.PsiElementPredicate; -import consulo.java.language.module.util.JavaClassNames; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiWhiteSpace; class StringConcatPredicate implements PsiElementPredicate { @@ -41,7 +41,7 @@ public boolean satisfiedBy(PsiElement element) { } final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiType type = polyadicExpression.getType(); - if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return false; } final PsiExpression[] operands = polyadicExpression.getOperands(); @@ -55,11 +55,11 @@ public boolean satisfiedBy(PsiElement element) { if (!(previous instanceof PsiLiteralExpression) || !(operand instanceof PsiLiteralExpression)) { return false; } - return stringTypeSeen || (i == 1 && operandType != null && operandType.equalsToText(JavaClassNames.JAVA_LANG_STRING)); + return stringTypeSeen || (i == 1 && operandType != null && operandType.equalsToText(CommonClassNames.JAVA_LANG_STRING)); } previous = operand; if (!stringTypeSeen) { - stringTypeSeen = operandType != null && operandType.equalsToText(JavaClassNames.JAVA_LANG_STRING); + stringTypeSeen = operandType != null && operandType.equalsToText(CommonClassNames.JAVA_LANG_STRING); } } return false;