From 09253adcb74a2785d00d1e9f91267f70bba21e74 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 9 May 2025 20:13:56 +0300 Subject: [PATCH] Replacing JavaClassNames with CommonClassNames (part 5). --- .../impl/analysis/JavaHighlightUtil.java | 17 +++++----- .../codeInspection/JavaSuppressionUtil.java | 5 ++- .../dataFlow/inliner/MapUpdateInliner.java | 6 ++-- .../impl/JavaReflectionReferenceUtil.java | 18 +++++------ .../ig/psiutils/JavaDeprecationUtils.java | 2 +- .../impl/cache/JavaDependencyProcessor.java | 9 +++--- .../compiler/impl/cache/JavaMakeUtil.java | 6 ++-- .../java/debugger/impl/engine/JavaValue.java | 6 ++-- .../JavaExceptionBreakpointType.java | 4 +-- .../search/JavaClassInheritorsSearcher.java | 4 +-- .../search/JavaDirectInheritorsSearcher.java | 5 ++- .../impl/analysis/JavaGenericsUtil.java | 21 ++++++------- .../java/language/psi/LambdaUtil.java | 7 ++--- .../impl/psi/impl/source/JavaVarTypeUtil.java | 4 +-- .../impl/source/resolve/JavaResolveUtil.java | 3 +- .../JavaMethodsConflictResolver.java | 12 +++---- .../psi/augment/JavaEnumAugmentProvider.java | 10 +++--- .../JavaClassNameCompletionContributor.java | 3 +- .../completion/JavaCompletionSorting.java | 9 +++--- .../completion/JavaCompletionUtil.java | 3 +- .../JavaDocCompletionContributor.java | 5 ++- .../completion/JavaInheritorsGetter.java | 3 +- .../completion/JavaKeywordCompletion.java | 5 ++- .../JavaMemberNameCompletionContributor.java | 5 ++- .../JavaSmartCompletionContributor.java | 7 ++--- .../daemon/impl/JavaLineMarkerProvider.java | 2 +- .../codeInsight/daemon/impl/MarkerType.java | 3 +- .../wordSelection/LiteralSelectioner.java | 12 +++---- .../JavaWithTryCatchSurrounder.java | 3 +- .../javadoc/JavaDocInfoGenerator.java | 11 +++---- .../util/JavaPostfixTemplatesUtils.java | 5 ++- .../ig/abstraction/MagicNumberInspection.java | 9 ++++-- .../bugs/MathRandomCastToIntInspection.java | 3 +- .../java/impl/ig/fixes/MakeCloneableFix.java | 4 +-- .../impl/ig/fixes/MakeSerializableFix.java | 5 +-- ...tatedMethodInJUnit3TestCaseInspection.java | 3 +- ...ySetIterationMayUseEntrySetInspection.java | 3 +- .../LengthOneStringInIndexOfInspection.java | 3 +- ...thOneStringsInConcatenationInspection.java | 5 ++- ...ManualArrayToCollectionCopyInspection.java | 8 ++--- .../MapReplaceableByEnumMapInspection.java | 12 +++---- ...xecuteWithNonConstantStringInspection.java | 3 +- ...tementWithNonConstantStringInspection.java | 3 +- ...ibraryWithNonConstantStringInspection.java | 6 ++-- ...ndexOfReplaceableByContainsInspection.java | 5 +-- .../lang/java/JavaDocumentationProvider.java | 3 +- .../psi/filters/getters/MembersGetter.java | 7 ++--- .../codeStyle/JavaCodeStyleManagerImpl.java | 31 +++++++++---------- .../JavaReflectionCompletionContributor.java | 6 ++-- .../impl/ide/JavaIconDescriptorUpdater.java | 3 +- 50 files changed, 142 insertions(+), 195 deletions(-) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java index 6f3925ab54..9ad9df39f8 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java @@ -20,13 +20,12 @@ import com.intellij.java.language.psi.util.PsiFormatUtilBase; import com.intellij.java.language.psi.util.TypeConversionUtil; import com.intellij.java.language.util.JavaPsiConstructorUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiManager; import consulo.util.lang.ObjectUtil; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -35,7 +34,7 @@ public class JavaHighlightUtil { public static boolean isSerializable(@Nonnull PsiClass aClass) { PsiManager manager = aClass.getManager(); PsiClass serializableClass = JavaPsiFacade.getInstance(manager.getProject()) - .findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, aClass.getResolveScope()); + .findClass(CommonClassNames.JAVA_IO_SERIALIZABLE, aClass.getResolveScope()); return serializableClass != null && aClass.isInheritor(serializableClass, true); } @@ -61,20 +60,20 @@ public static boolean isSerializationRelatedMethod(PsiMethod method, PsiClass co if ("readResolve".equals(name)) { return parameters.length == 0 && returnType != null - && returnType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) - && (containingClass.hasModifierProperty(PsiModifier.ABSTRACT) || isSerializable(containingClass)); + && returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) + && (containingClass.isAbstract() || isSerializable(containingClass)); } if ("writeReplace".equals(name)) { return parameters.length == 0 && returnType != null - && returnType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) - && (containingClass.hasModifierProperty(PsiModifier.ABSTRACT) || isSerializable(containingClass)); + && returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) + && (containingClass.isAbstract() || isSerializable(containingClass)); } if ("writeObject".equals(name)) { return parameters.length == 1 && TypeConversionUtil.isVoidType(returnType) && parameters[0].getType().equalsToText("java.io.ObjectOutputStream") - && method.hasModifierProperty(PsiModifier.PRIVATE) + && method.isPrivate() && isSerializable(containingClass); } return false; diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/JavaSuppressionUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/JavaSuppressionUtil.java index fd9a948588..4ed81648b6 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/JavaSuppressionUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/JavaSuppressionUtil.java @@ -27,7 +27,6 @@ import consulo.application.util.function.Computable; import consulo.content.bundle.Sdk; import consulo.java.language.module.extension.JavaModuleExtension; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.DaemonCodeAnalyzerSettings; import consulo.language.editor.inspection.SuppressionUtil; import consulo.language.psi.PsiComment; @@ -40,9 +39,9 @@ import consulo.module.Module; import consulo.project.Project; import consulo.util.lang.StringUtil; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -128,7 +127,7 @@ public static PsiElement getElementMemberSuppressedIn(@Nonnull PsiDocCommentOwne } public static PsiElement getAnnotationMemberSuppressedIn(@Nonnull PsiModifierListOwner owner, String inspectionToolID) { - final PsiAnnotation generatedAnnotation = AnnotationUtil.findAnnotation(owner, JavaClassNames.JAVAX_ANNOTATION_GENERATED); + final PsiAnnotation generatedAnnotation = AnnotationUtil.findAnnotation(owner, CommonClassNames.JAVAX_ANNOTATION_GENERATED); if (generatedAnnotation != null) return generatedAnnotation; PsiModifierList modifierList = owner.getModifierList(); Collection suppressedIds = getInspectionIdsSuppressedInAnnotation(modifierList); diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/MapUpdateInliner.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/MapUpdateInliner.java index 05756b4b5f..a2aede87c7 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/MapUpdateInliner.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/MapUpdateInliner.java @@ -7,22 +7,22 @@ import com.intellij.java.analysis.impl.codeInspection.dataFlow.SpecialField; import com.intellij.java.analysis.impl.codeInspection.dataFlow.types.DfTypes; import com.intellij.java.language.codeInsight.Nullability; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiExpression; import com.intellij.java.language.psi.PsiMethodCallExpression; import com.intellij.java.language.psi.PsiType; import com.siyeh.ig.callMatcher.CallMatcher; import com.siyeh.ig.psiutils.ExpectedTypeUtils; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import java.util.Objects; public class MapUpdateInliner implements CallInliner { private static final CallMatcher MAP_COMPUTE = - CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "computeIfAbsent", "computeIfPresent", "compute") + CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "computeIfAbsent", "computeIfPresent", "compute") .parameterCount(2); private static final CallMatcher MAP_MERGE = - CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "merge").parameterCount(3); + CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "merge").parameterCount(3); @Override public boolean tryInlineCall(@Nonnull CFGBuilder builder, @Nonnull PsiMethodCallExpression call) { diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceUtil.java index c0b1b20152..90c6431d3f 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceUtil.java @@ -14,7 +14,6 @@ import consulo.application.util.RecursionGuard; import consulo.application.util.RecursionManager; import consulo.component.util.Iconable; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.completion.lookup.*; import consulo.language.icon.IconDescriptorUpdaters; import consulo.language.psi.PsiElement; @@ -29,10 +28,9 @@ import consulo.util.collection.ContainerUtil; import consulo.util.lang.ObjectUtil; import consulo.util.lang.Pair; -import org.jetbrains.annotations.Contract; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.Contract; import java.util.*; import java.util.function.Function; @@ -202,14 +200,14 @@ private static ReflectiveType getClassInstanceType(@Nullable PsiExpression expre PsiMethod method = methodCall.resolveMethod(); if (method != null) { PsiExpression[] arguments = methodCall.getArgumentList().getExpressions(); - if (arguments.length == 0 && isClassWithName(method.getContainingClass(), JavaClassNames.JAVA_LANG_CLASS)) { + if (arguments.length == 0 && isClassWithName(method.getContainingClass(), CommonClassNames.JAVA_LANG_CLASS)) { PsiExpression qualifier = methodCall.getMethodExpression().getQualifierExpression(); if (qualifier != null) { return ourGuard.doPreventingRecursion(qualifier, false, () -> getReflectiveType(qualifier)); } } else if (arguments.length > 1 - && isClassWithName(method.getContainingClass(), JavaClassNames.JAVA_LANG_REFLECT_ARRAY)) { + && isClassWithName(method.getContainingClass(), CommonClassNames.JAVA_LANG_REFLECT_ARRAY)) { PsiExpression typeExpression = arguments[0]; if (typeExpression != null) { ReflectiveType itemType = @@ -324,12 +322,12 @@ private static PsiClass findClass(@Nonnull String qualifiedName, @Nonnull PsiEle @Contract("null -> false") public static boolean isJavaLangClass(@Nullable PsiClass aClass) { - return isClassWithName(aClass, JavaClassNames.JAVA_LANG_CLASS); + return isClassWithName(aClass, CommonClassNames.JAVA_LANG_CLASS); } @Contract("null -> false") public static boolean isJavaLangObject(@Nullable PsiClass aClass) { - return isClassWithName(aClass, JavaClassNames.JAVA_LANG_OBJECT); + return isClassWithName(aClass, CommonClassNames.JAVA_LANG_OBJECT); } @Contract("null, _ -> false") @@ -575,13 +573,13 @@ private static ReflectiveSignature composeGenericMethodSignature(@Nonnull PsiExp boolean finalArray = signature.getSecond(); List typeNames = new ArrayList<>(); - typeNames.add(JavaClassNames.JAVA_LANG_OBJECT); // return type + typeNames.add(CommonClassNames.JAVA_LANG_OBJECT); // return type for (int i = 0; i < objectArgCount; i++) { - typeNames.add(JavaClassNames.JAVA_LANG_OBJECT); + typeNames.add(CommonClassNames.JAVA_LANG_OBJECT); } if (finalArray) { - typeNames.add(JavaClassNames.JAVA_LANG_OBJECT + "[]"); + typeNames.add(CommonClassNames.JAVA_LANG_OBJECT + "[]"); } return ReflectiveSignature.create(typeNames); } diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/JavaDeprecationUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/JavaDeprecationUtils.java index ac9dc0148c..2105134a52 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/JavaDeprecationUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/JavaDeprecationUtils.java @@ -20,7 +20,7 @@ public final class JavaDeprecationUtils { @Nonnull @RequiredReadAction private static ThreeState isDeprecatedByAnnotation(@Nonnull PsiModifierListOwner owner, @Nullable PsiElement context) { - PsiAnnotation annotation = AnnotationUtil.findAnnotation(owner, JavaClassNames.JAVA_LANG_DEPRECATED); + PsiAnnotation annotation = AnnotationUtil.findAnnotation(owner, CommonClassNames.JAVA_LANG_DEPRECATED); if (annotation == null) { return ThreeState.UNSURE; } diff --git a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java index 951742b26c..e3c9c6db53 100644 --- a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java +++ b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java @@ -28,7 +28,6 @@ import consulo.application.ApplicationManager; import consulo.application.util.function.Computable; import consulo.compiler.CacheCorruptedException; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiManager; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.util.IncorrectOperationException; @@ -104,7 +103,7 @@ public JavaDependencyProcessor(Project project, JavaDependencyCache javaDependen newClassesCache.getGenericSignature(qName)); boolean superclassesDiffer = cache.getSuperQualifiedName(qName) != newClassesCache.getSuperQualifiedName(qName); - boolean wasDerivedFromObject = JavaClassNames.JAVA_LANG_OBJECT.equals(javaDependencyCache.resolve(cache.getSuperQualifiedName(qName))); + boolean wasDerivedFromObject = CommonClassNames.JAVA_LANG_OBJECT.equals(javaDependencyCache.resolve(cache.getSuperQualifiedName(qName))); mySuperClassChanged = !wasDerivedFromObject && superclassesDiffer; mySuperClassAdded = wasDerivedFromObject && superclassesDiffer; } @@ -482,8 +481,8 @@ private boolean hasAnnotationSemanticsChanged(final Cache oldCache, final Cache final IntObjectMap oldAnnotations = fetchAllAnnotations(oldCache); final IntObjectMap newAnnotations = fetchAllAnnotations(newCache); // filter certain known annotation which are processed separately - final int retentionAnnotation = myJavaDependencyCache.getSymbolTable().getId(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION); - final int targetAnnotation = myJavaDependencyCache.getSymbolTable().getId(JavaClassNames.JAVA_LANG_ANNOTATION_TARGET); + final int retentionAnnotation = myJavaDependencyCache.getSymbolTable().getId(CommonClassNames.JAVA_LANG_ANNOTATION_RETENTION); + final int targetAnnotation = myJavaDependencyCache.getSymbolTable().getId(CommonClassNames.JAVA_LANG_ANNOTATION_TARGET); oldAnnotations.remove(retentionAnnotation); oldAnnotations.remove(targetAnnotation); newAnnotations.remove(retentionAnnotation); @@ -968,7 +967,7 @@ private boolean hasUnimplementedAbstractMethods(int superQName, final Set method hasBaseAbstractMethodsInHierarchy(superQName, methodsToCheck); } else { final String qName = myJavaDependencyCache.resolve(superQName); - if (!JavaClassNames.JAVA_LANG_OBJECT.equals(qName)) { + if (!CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) { if (hasBaseAbstractMethods2(qName, methodsToCheck)) { return true; } diff --git a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java index 9a969c4181..655fb13cad 100644 --- a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java +++ b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java @@ -23,12 +23,12 @@ import com.intellij.java.compiler.impl.classParsing.*; import com.intellij.java.compiler.impl.util.cls.ClsUtil; +import com.intellij.java.language.psi.CommonClassNames; import consulo.application.util.function.Computable; import consulo.compiler.CacheCorruptedException; import consulo.compiler.ModuleCompilerPathsManager; import consulo.compiler.util.MakeUtil; import consulo.internal.org.objectweb.asm.Opcodes; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.content.ProductionContentFolderTypeProvider; import consulo.logging.Logger; import consulo.module.Module; @@ -178,7 +178,7 @@ public static int getAnnotationTargets(final Cache cache, final int annotationQName, final SymbolTable symbolTable) throws CacheCorruptedException { final AnnotationConstantValue - targetAnnotation = findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_TARGET, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable); + targetAnnotation = findAnnotation(CommonClassNames.JAVA_LANG_ANNOTATION_TARGET, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable); if (targetAnnotation == null) { return AnnotationTargets.ALL; // all program elements are annotation targets by default } @@ -224,7 +224,7 @@ public static int getAnnotationRetentionPolicy( final SymbolTable symbolTable ) throws CacheCorruptedException { final AnnotationConstantValue retentionPolicyAnnotation = - findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable); + findAnnotation(CommonClassNames.JAVA_LANG_ANNOTATION_RETENTION, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable); if (retentionPolicyAnnotation == null) { return RetentionPolicies.CLASS; // default retention policy } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValue.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValue.java index c0e17dc33e..0f767161cb 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValue.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValue.java @@ -35,6 +35,7 @@ import com.intellij.java.debugger.impl.ui.tree.ValueDescriptor; import com.intellij.java.debugger.impl.ui.tree.render.*; import com.intellij.java.debugger.ui.tree.NodeDescriptor; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.application.Application; import consulo.application.ApplicationManager; @@ -50,7 +51,6 @@ import consulo.internal.com.sun.jdi.ArrayReference; import consulo.internal.com.sun.jdi.ArrayType; import consulo.internal.com.sun.jdi.Value; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.logging.Logger; import consulo.project.Project; @@ -302,9 +302,9 @@ public void renderValue(@Nonnull XValuePresentation.XValueTextRenderer renderer, final ArrayType type = (ArrayType) container.getDescriptor().getType(); if (type != null) { final String typeName = type.componentTypeName(); - if (TypeConversionUtil.isPrimitive(typeName) || JavaClassNames.JAVA_LANG_STRING.equals(typeName)) { + if (TypeConversionUtil.isPrimitive(typeName) || CommonClassNames.JAVA_LANG_STRING.equals(typeName)) { int size = value.length(); - int max = Math.min(size, JavaClassNames.JAVA_LANG_STRING.equals(typeName) ? 5 : 10); + int max = Math.min(size, CommonClassNames.JAVA_LANG_STRING.equals(typeName) ? 5 : 10); //TODO [eu]: this is a quick fix for IDEA-136606, need to move this away from EDT!!! final List values = value.getValues(0, max); int i = 0; diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java index fcab26fc13..05085f70b3 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java @@ -19,6 +19,7 @@ import com.intellij.java.debugger.impl.HelpID; import com.intellij.java.debugger.impl.breakpoints.properties.JavaExceptionBreakpointProperties; import com.intellij.java.debugger.impl.engine.JVMNameUtil; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.JavaPsiFacade; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiClassOwner; @@ -30,7 +31,6 @@ import consulo.execution.debug.breakpoint.XBreakpoint; import consulo.execution.debug.breakpoint.ui.XBreakpointCustomPropertiesPanel; import consulo.execution.debug.icon.ExecutionDebugIconGroup; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.scope.GlobalSearchScope; import consulo.project.Project; import consulo.ui.image.Image; @@ -111,7 +111,7 @@ public XBreakpoint createDefaultBreakpoint(@N @Override public XBreakpoint addBreakpoint(final Project project, JComponent parentComponent) { final PsiClass throwableClass = - JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_THROWABLE, GlobalSearchScope.allScope(project)); + JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_THROWABLE, GlobalSearchScope.allScope(project)); TreeClassChooser chooser = TreeClassChooserFactory.getInstance(project).createInheritanceClassChooser( DebuggerBundle.message("add.exception.breakpoint.classchooser.title"), diff --git a/java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaClassInheritorsSearcher.java b/java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaClassInheritorsSearcher.java index 2046382fce..15a5e12d26 100644 --- a/java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaClassInheritorsSearcher.java +++ b/java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaClassInheritorsSearcher.java @@ -19,6 +19,7 @@ import com.intellij.java.indexing.search.searches.ClassInheritorsSearch; import com.intellij.java.indexing.search.searches.ClassInheritorsSearchExecutor; import com.intellij.java.indexing.search.searches.DirectClassInheritorsSearch; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiAnonymousClass; import com.intellij.java.language.psi.PsiClass; import consulo.annotation.access.RequiredReadAction; @@ -29,7 +30,6 @@ import consulo.application.progress.ProgressManager; import consulo.application.util.ReadActionProcessor; import consulo.content.scope.SearchScope; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.impl.psi.PsiAnchor; import consulo.language.psi.PsiBundle; import consulo.language.psi.PsiUtilCore; @@ -164,7 +164,7 @@ public boolean processInReadAction(PsiClass candidate) { private static boolean isJavaLangObject(Application application, @Nonnull PsiClass baseClass) { return application.runReadAction( - (Supplier)() -> baseClass.isValid() && JavaClassNames.JAVA_LANG_OBJECT.equals(baseClass.getQualifiedName()) + (Supplier)() -> baseClass.isValid() && CommonClassNames.JAVA_LANG_OBJECT.equals(baseClass.getQualifiedName()) ); } diff --git a/java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaDirectInheritorsSearcher.java b/java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaDirectInheritorsSearcher.java index 8454b6a674..2eb1068f2a 100644 --- a/java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaDirectInheritorsSearcher.java +++ b/java-indexing-impl/src/main/java/com/intellij/java/indexing/impl/search/JavaDirectInheritorsSearcher.java @@ -26,7 +26,6 @@ import consulo.application.Application; import consulo.application.progress.ProgressManager; import consulo.content.scope.SearchScope; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiUtilCore; import consulo.language.psi.scope.EverythingGlobalScope; @@ -59,7 +58,7 @@ public boolean execute( String qualifiedName = app.runReadAction((Supplier)aClass::getQualifiedName); Project project = PsiUtilCore.getProjectInReadAction(aClass); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(qualifiedName)) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(qualifiedName)) { //[pasynkov]: WTF? //SearchScope scope = useScope.intersectWith(GlobalSearchScope.notScope(GlobalSearchScope.getScopeRestrictedByFileTypes( // GlobalSearchScope.allScope(psiManager.getProject()), StdFileTypes.JSP, StdFileTypes.JSPX))); @@ -71,7 +70,7 @@ public boolean execute( } PsiClass superClass = psiClass.getSuperClass(); return !(superClass != null - && JavaClassNames.JAVA_LANG_OBJECT.equals(app.runReadAction((Supplier)superClass::getQualifiedName))) + && CommonClassNames.JAVA_LANG_OBJECT.equals(app.runReadAction((Supplier)superClass::getQualifiedName))) || consumer.test(psiClass); }); } diff --git a/java-language-api/src/main/java/com/intellij/java/language/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java b/java-language-api/src/main/java/com/intellij/java/language/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java index 676abfbcbc..406ae2d2fe 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java @@ -1,23 +1,22 @@ // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.java.language.codeInsight.daemon.impl.analysis; -import static com.intellij.java.language.codeInsight.AnnotationUtil.CHECK_EXTERNAL; - -import java.util.Iterator; - -import jakarta.annotation.Nullable; -import com.intellij.java.language.codeInsight.AnnotationUtil; import com.intellij.java.language.LanguageLevel; +import com.intellij.java.language.codeInsight.AnnotationUtil; 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.language.psi.PsiElement; import consulo.language.psi.PsiManager; import consulo.language.psi.scope.GlobalSearchScope; -import com.intellij.java.language.psi.util.InheritanceUtil; import consulo.language.psi.util.PsiTreeUtil; -import com.intellij.java.language.psi.util.PsiUtil; -import com.intellij.java.language.psi.util.TypeConversionUtil; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + +import java.util.Iterator; + +import static com.intellij.java.language.codeInsight.AnnotationUtil.CHECK_EXTERNAL; public class JavaGenericsUtil { @@ -120,7 +119,7 @@ public static boolean isUncheckedWarning(@Nonnull PsiJavaCodeReferenceElement ex return false; } - if(AnnotationUtil.isAnnotated(psiMethod, JavaClassNames.JAVA_LANG_SAFE_VARARGS, CHECK_EXTERNAL)) + if(AnnotationUtil.isAnnotated(psiMethod, CommonClassNames.JAVA_LANG_SAFE_VARARGS, CHECK_EXTERNAL)) { return false; } diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/LambdaUtil.java b/java-language-api/src/main/java/com/intellij/java/language/psi/LambdaUtil.java index e7052b10dd..3a29f81ac1 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/LambdaUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/LambdaUtil.java @@ -26,7 +26,6 @@ import consulo.application.util.RecursionManager; import consulo.application.util.function.Computable; import consulo.application.util.function.Processor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiModificationTracker; import consulo.language.psi.util.LanguageCachedValueUtil; @@ -35,10 +34,10 @@ import consulo.logging.Logger; import consulo.util.collection.ContainerUtil; import consulo.util.lang.SystemProperties; -import org.jetbrains.annotations.Contract; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.Contract; + import java.util.*; import java.util.function.Consumer; import java.util.function.Supplier; @@ -258,7 +257,7 @@ private static boolean overridesPublicObjectMethod(HierarchicalMethodSignature p if (signatures.isEmpty()) { final PsiMethod method = psiMethod.getMethod(); final PsiClass containingClass = method.getContainingClass(); - if (containingClass != null && JavaClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { + if (containingClass != null && CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { if (method.hasModifierProperty(PsiModifier.PUBLIC)) { return true; } diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/JavaVarTypeUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/JavaVarTypeUtil.java index 7375ca4733..fce6e811b3 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/JavaVarTypeUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/JavaVarTypeUtil.java @@ -20,10 +20,8 @@ import com.intellij.java.language.psi.impl.source.resolve.graphInference.PsiPolyExpressionUtil; import com.intellij.java.language.psi.util.PsiUtil; import consulo.application.util.RecursionManager; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiManager; import consulo.util.collection.ArrayUtil; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -113,7 +111,7 @@ public PsiType visitClassType(PsiClassType classType) { PsiType U = RecursionManager.doPreventingRecursion(ai, true, () -> ai.accept(this)); if (U == null) { targetSubstitutor = targetSubstitutor.put(parameter, PsiWildcardType.createUnbounded(manager)); - } else if (!U.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) && tryUpperBound(aClass, parameter, U)) { + } else if (!U.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && tryUpperBound(aClass, parameter, U)) { targetSubstitutor = targetSubstitutor.put(parameter, PsiWildcardType.createExtends(manager, U)); } else { targetSubstitutor = targetSubstitutor.put(parameter, createDownwardProjection(manager, ai)); diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/JavaResolveUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/JavaResolveUtil.java index e920edc381..eeb9be9b14 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/JavaResolveUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/JavaResolveUtil.java @@ -31,7 +31,6 @@ import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PsiTypesUtil; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.impl.ast.FileElement; import consulo.language.impl.ast.TreeElement; import consulo.language.impl.psi.DummyHolder; @@ -273,7 +272,7 @@ public static boolean processImplicitlyImportedPackages(final PsiScopeProcessor } } - PsiPackage langPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(JavaClassNames.DEFAULT_PACKAGE); + PsiPackage langPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(CommonClassNames.DEFAULT_PACKAGE); if (langPackage != null) { if (!langPackage.processDeclarations(processor, state, null, place)) { return false; diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java index 6cdb28e381..7328472a3a 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java @@ -30,7 +30,6 @@ import com.intellij.java.language.psi.util.*; import consulo.application.progress.ProgressManager; import consulo.application.util.function.Computable; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.psi.util.PsiTreeUtil; @@ -40,9 +39,9 @@ import consulo.util.collection.primitive.ints.IntLists; import consulo.util.lang.Comparing; import consulo.util.lang.ThreeState; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.*; /** @@ -258,7 +257,7 @@ protected void checkSameSignatures(@Nonnull List conflicts, Map conflicts, Map List getAugments(@Nonnull PsiElement elemen valueOfMethod.setContainingClass((PsiClass) element); valueOfMethod.setMethodReturnType(new PsiImmediateClassType((PsiClass) element, PsiSubstitutor.EMPTY)); valueOfMethod.addModifiers(PsiModifier.PUBLIC, PsiModifier.STATIC); - valueOfMethod.addParameter("name", JavaClassNames.JAVA_LANG_STRING); - valueOfMethod.addException(JavaClassNames.JAVA_LANG_ILLEGAL_ARGUMENT_EXCEPTION); + valueOfMethod.addParameter("name", CommonClassNames.JAVA_LANG_STRING); + valueOfMethod.addException(CommonClassNames.JAVA_LANG_ILLEGAL_ARGUMENT_EXCEPTION); list.add((Psi) valueOfMethod); return list; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaClassNameCompletionContributor.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaClassNameCompletionContributor.java index e272c4a081..b0db03a243 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaClassNameCompletionContributor.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaClassNameCompletionContributor.java @@ -28,7 +28,6 @@ import consulo.annotation.component.ExtensionImpl; import consulo.application.util.matcher.PrefixMatcher; import consulo.codeEditor.Editor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.Language; import consulo.language.custom.CustomSyntaxTableFileType; import consulo.language.editor.completion.*; @@ -229,7 +228,7 @@ private static MultiMap getAllAnnotationClasses(PsiElement con MultiMap map = new MultiMap<>(); GlobalSearchScope scope = context.getResolveScope(); PsiClass annotation = - JavaPsiFacade.getInstance(context.getProject()).findClass(JavaClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope); + JavaPsiFacade.getInstance(context.getProject()).findClass(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope); if (annotation != null) { DirectClassInheritorsSearch.search(annotation, scope, false).forEach(psiClass -> { if (!psiClass.isAnnotationType() || psiClass.getQualifiedName() == null) { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaCompletionSorting.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaCompletionSorting.java index 64fde7c6ac..669260ffda 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaCompletionSorting.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaCompletionSorting.java @@ -28,7 +28,6 @@ import consulo.ide.impl.idea.codeInsight.completion.impl.CompletionSorterImpl; import consulo.ide.impl.idea.codeInsight.completion.impl.LiftShorterItemsClassifier; import consulo.ide.impl.idea.codeInsight.lookup.ClassifierFactory; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.completion.*; import consulo.language.editor.completion.lookup.Classifier; import consulo.language.editor.completion.lookup.LookupElement; @@ -42,9 +41,9 @@ import consulo.util.collection.SmartList; import consulo.util.lang.Pair; import consulo.virtualFileSystem.VirtualFile; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.*; import static com.intellij.java.language.patterns.PsiJavaPatterns.psiElement; @@ -393,10 +392,10 @@ public MyResult weigh(@Nonnull LookupElement item) { private static PsiType removeClassWildcard(PsiType type) { if (type instanceof PsiClassType) { final PsiClass psiClass = ((PsiClassType) type).resolve(); - if (psiClass != null && JavaClassNames.JAVA_LANG_CLASS.equals(psiClass.getQualifiedName())) { + if (psiClass != null && CommonClassNames.JAVA_LANG_CLASS.equals(psiClass.getQualifiedName())) { PsiClassType erased = (PsiClassType) GenericsUtil.eliminateWildcards(type); PsiType[] parameters = erased.getParameters(); - if (parameters.length == 1 && !parameters[0].equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (parameters.length == 1 && !parameters[0].equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return erased; } } @@ -506,7 +505,7 @@ public PreferExpected(boolean constructorPossible, ExpectedTypeInfo[] expectedTy myConstructorPossible = constructorPossible; myExpectedTypes = expectedTypes; for (ExpectedTypeInfo info : expectedTypes) { - ContainerUtil.addIfNotNull(myExpectedClasses, PsiUtil.substituteTypeParameter(info.getDefaultType(), JavaClassNames.JAVA_LANG_CLASS, 0, false)); + ContainerUtil.addIfNotNull(myExpectedClasses, PsiUtil.substituteTypeParameter(info.getDefaultType(), CommonClassNames.JAVA_LANG_CLASS, 0, false)); } myExpectedMemberName = calcExpectedMemberNameByParentCall(position); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaCompletionUtil.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaCompletionUtil.java index 3a378ea180..936facb1b8 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaCompletionUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaCompletionUtil.java @@ -31,7 +31,6 @@ import consulo.document.Document; import consulo.document.FileDocumentManager; import consulo.document.RangeMarker; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CommonCodeStyleSettings; import consulo.language.codeStyle.PostprocessReformattingAspect; import consulo.language.editor.AutoPopupController; @@ -570,7 +569,7 @@ public void renderElement(LookupElementDecorator element, LookupE -1 ); } - if (containsMember(qualifierType, object, false) && !qualifierType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (containsMember(qualifierType, object, false) && !qualifierType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { LookupElementDecorator bold = LookupElementDecorator.withRenderer( item, new LookupElementRenderer<>() { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaDocCompletionContributor.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaDocCompletionContributor.java index bb846948ee..3aa47cf82b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaDocCompletionContributor.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaDocCompletionContributor.java @@ -36,7 +36,6 @@ import consulo.codeEditor.ScrollType; import consulo.document.Document; import consulo.ide.impl.idea.openapi.editor.EditorModificationUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.Language; import consulo.language.codeStyle.CodeStyleSettings; import consulo.language.codeStyle.CodeStyleSettingsManager; @@ -62,9 +61,9 @@ import consulo.util.lang.StringUtil; import consulo.util.lang.SystemProperties; import consulo.util.lang.function.Conditions; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nonnull; import java.util.*; import static consulo.language.pattern.PlatformPatterns.psiElement; @@ -379,7 +378,7 @@ private static void addSpecialTags(final List result, PsiDocComment comm InheritanceUtil.processSupers((PsiClass) member, false, psiClass -> { String name = psiClass.getQualifiedName(); - if (StringUtil.isNotEmpty(name) && !JavaClassNames.JAVA_LANG_OBJECT.equals(name)) { + if (StringUtil.isNotEmpty(name) && !CommonClassNames.JAVA_LANG_OBJECT.equals(name)) { result.add("see " + name); } return true; diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaInheritorsGetter.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaInheritorsGetter.java index 8a4dbcf554..0c3f46ec80 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaInheritorsGetter.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaInheritorsGetter.java @@ -32,7 +32,6 @@ import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.application.util.function.Processor; import consulo.application.util.matcher.PrefixMatcher; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.completion.AutoCompletionPolicy; import consulo.language.editor.completion.CompletionParameters; import consulo.language.editor.completion.CompletionProvider; @@ -100,7 +99,7 @@ private void generateVariants(final CompletionParameters parameters, final Prefi addArrayTypes(parameters.getPosition(), infos, consumer); List classTypes = extractClassTypes(infos); - boolean arraysWelcome = ContainerUtil.exists(ExpectedTypesGetter.extractTypes(infos, true), t -> t.getDeepComponentType().equalsToText(JavaClassNames.JAVA_LANG_OBJECT)); + boolean arraysWelcome = ContainerUtil.exists(ExpectedTypesGetter.extractTypes(infos, true), t -> t.getDeepComponentType().equalsToText(CommonClassNames.JAVA_LANG_OBJECT)); processInheritors(parameters, classTypes, prefixMatcher, type -> { final LookupElement element = addExpectedType(type, parameters); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaKeywordCompletion.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaKeywordCompletion.java index 7769ac58a5..ac5a3443e9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaKeywordCompletion.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaKeywordCompletion.java @@ -31,7 +31,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import consulo.annotation.access.RequiredReadAction; import consulo.document.Document; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.completion.CompletionParameters; import consulo.language.editor.completion.CompletionResultSet; @@ -863,7 +862,7 @@ static void addPrimitiveTypes(Consumer result, PsiElement Set expected = ContainerUtil.map2Set(JavaSmartCompletionContributor.getExpectedTypes(position, false), ExpectedTypeInfo::getDefaultType); boolean addAll = expected.isEmpty() || ContainerUtil.exists(expected, t -> - t.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) || t.equalsToText(JavaClassNames.JAVA_IO_SERIALIZABLE)); + t.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) || t.equalsToText(CommonClassNames.JAVA_IO_SERIALIZABLE)); PsiElementFactory factory = JavaPsiFacade.getElementFactory(position.getProject()); for (String primitiveType : PRIMITIVE_TYPES) { PsiType array = factory.createTypeFromText(primitiveType + "[]", null); @@ -908,7 +907,7 @@ else if (typeFragment && ((PsiTypeCodeFragment)position.getContainingFile()).isV private static boolean expectsClassLiteral(PsiElement position) { return ContainerUtil.find(JavaSmartCompletionContributor.getExpectedTypes(position, false), - info -> InheritanceUtil.isInheritor(info.getType(), JavaClassNames.JAVA_LANG_CLASS)) != null; + info -> InheritanceUtil.isInheritor(info.getType(), CommonClassNames.JAVA_LANG_CLASS)) != null; } private static boolean isAtResourceVariableStart(PsiElement position) { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaMemberNameCompletionContributor.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaMemberNameCompletionContributor.java index e64dd99d71..97a254c185 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaMemberNameCompletionContributor.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaMemberNameCompletionContributor.java @@ -31,7 +31,6 @@ import consulo.application.AllIcons; import consulo.application.util.matcher.PrefixMatcher; import consulo.externalService.statistic.FeatureUsageTracker; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.Language; import consulo.language.editor.completion.*; import consulo.language.editor.completion.lookup.*; @@ -147,10 +146,10 @@ private static void completeLocalVariableName(Set set, PrefixMatc final String[] suggestedNames = suggestedNameInfo.names; addLookupItems(set, suggestedNameInfo, matcher, project, suggestedNames); if (!hasStartMatches(set, matcher)) { - if (type.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) && matcher.prefixMatches("object")) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && matcher.prefixMatches("object")) { set.add(withInsertHandler(suggestedNameInfo, LookupElementBuilder.create("object"))); } - if (type.equalsToText(JavaClassNames.JAVA_LANG_STRING) && matcher.prefixMatches("string")) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_STRING) && matcher.prefixMatches("string")) { set.add(withInsertHandler(suggestedNameInfo, LookupElementBuilder.create("string"))); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaSmartCompletionContributor.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaSmartCompletionContributor.java index eeff6e72ca..5a92cb808f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaSmartCompletionContributor.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/JavaSmartCompletionContributor.java @@ -30,7 +30,6 @@ import com.intellij.java.language.psi.infos.CandidateInfo; import consulo.annotation.component.ExtensionImpl; import consulo.application.util.matcher.PrefixMatcher; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.Language; import consulo.language.editor.completion.*; import consulo.language.editor.completion.lookup.LookupElement; @@ -49,9 +48,9 @@ import consulo.util.collection.Sets; import consulo.util.collection.SmartList; import consulo.util.lang.reflect.ReflectionUtil; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.*; import java.util.function.Consumer; import java.util.function.Function; @@ -76,7 +75,7 @@ public boolean equals(final ExpectedTypeInfo o1, final ExpectedTypeInfo o2) { } }; - private static final ElementExtractorFilter THROWABLES_FILTER = new ElementExtractorFilter(new AssignableFromFilter(JavaClassNames.JAVA_LANG_THROWABLE)); + private static final ElementExtractorFilter THROWABLES_FILTER = new ElementExtractorFilter(new AssignableFromFilter(CommonClassNames.JAVA_LANG_THROWABLE)); public static final ElementPattern AFTER_NEW = psiElement().afterLeaf(psiElement().withText(PsiKeyword.NEW).andNot(psiElement().afterLeaf(psiElement().withText(PsiKeyword.THROW)))); static final ElementPattern AFTER_THROW_NEW = psiElement().afterLeaf(psiElement().withText(PsiKeyword.NEW).afterLeaf(PsiKeyword.THROW)); public static final ElementPattern INSIDE_EXPRESSION = or(psiElement().withParent(PsiExpression.class).andNot(psiElement().withParent(PsiLiteralExpression.class)).andNot(psiElement() @@ -260,7 +259,7 @@ public static ExpectedTypeInfo[] getExpectedTypes(final CompletionParameters par public static ExpectedTypeInfo[] getExpectedTypes(PsiElement position, boolean voidable) { if (psiElement().withParent(psiElement(PsiReferenceExpression.class).withParent(PsiThrowStatement.class)).accepts(position)) { final PsiElementFactory factory = JavaPsiFacade.getInstance(position.getProject()).getElementFactory(); - final PsiClassType classType = factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, position.getResolveScope()); + final PsiClassType classType = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, position.getResolveScope()); final List result = new SmartList<>(); result.add(new ExpectedTypeInfoImpl(classType, ExpectedTypeInfo.TYPE_OR_SUBTYPE, classType, TailType.SEMICOLON, null, ExpectedTypeInfoImpl.NULL)); final PsiMethod method = PsiTreeUtil.getContextOfType(position, PsiMethod.class, true); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/JavaLineMarkerProvider.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/JavaLineMarkerProvider.java index 8f595b58db..df38369fec 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/JavaLineMarkerProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/JavaLineMarkerProvider.java @@ -330,7 +330,7 @@ protected List> collectInheritingClasses(@Nonnull Psi if (aClass.isFinal()) { return Collections.emptyList(); } - if (JavaClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) { return Collections.emptyList(); // It's useless to have overridden markers for object. } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/MarkerType.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/MarkerType.java index 2440d86eb8..00ff8f167d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/MarkerType.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/MarkerType.java @@ -19,7 +19,6 @@ import consulo.application.progress.ProgressIndicator; import consulo.application.progress.ProgressManager; import consulo.application.util.function.CommonProcessors; -import consulo.java.language.module.util.JavaClassNames; import consulo.java.localize.JavaLocalize; import consulo.language.editor.CodeInsightBundle; import consulo.language.editor.DaemonBundle; @@ -255,7 +254,7 @@ public void browse(MouseEvent e, PsiElement element) { private static String getOverriddenMethodTooltip(@Nonnull PsiMethod method) { PsiClass aClass = method.getContainingClass(); - if (aClass != null && JavaClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) { + if (aClass != null && CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) { return getImplementationTooltip("Is implemented in several subclasses"); } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/wordSelection/LiteralSelectioner.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/wordSelection/LiteralSelectioner.java index c617a4283d..345c78d171 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/wordSelection/LiteralSelectioner.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/wordSelection/LiteralSelectioner.java @@ -15,15 +15,15 @@ */ package com.intellij.java.impl.codeInsight.editorActions.wordSelection; +import com.intellij.java.language.psi.CommonClassNames; +import com.intellij.java.language.psi.JavaTokenType; +import com.intellij.java.language.psi.PsiLiteralExpression; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; -import consulo.language.editor.action.SelectWordUtil; -import consulo.language.lexer.StringLiteralLexer; import consulo.codeEditor.Editor; import consulo.document.util.TextRange; -import com.intellij.java.language.psi.JavaTokenType; +import consulo.language.editor.action.SelectWordUtil; +import consulo.language.lexer.StringLiteralLexer; import consulo.language.psi.PsiElement; -import com.intellij.java.language.psi.PsiLiteralExpression; import java.util.List; @@ -38,7 +38,7 @@ public boolean canSelect(PsiElement e) { private static boolean isStringLiteral(PsiElement element) { return element instanceof PsiLiteralExpression && - ((PsiLiteralExpression)element).getType().equalsToText(JavaClassNames.JAVA_LANG_STRING) && element.getText().startsWith("\"") && element.getText().endsWith("\""); + ((PsiLiteralExpression)element).getType().equalsToText(CommonClassNames.JAVA_LANG_STRING) && element.getText().startsWith("\"") && element.getText().endsWith("\""); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java index 60a35debaf..cf8bdd9b11 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java @@ -21,7 +21,6 @@ import com.intellij.java.language.psi.codeStyle.VariableKind; import consulo.codeEditor.Editor; import consulo.document.util.TextRange; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.localize.CodeInsightLocalize; import consulo.language.psi.PsiElement; @@ -58,7 +57,7 @@ public TextRange surroundStatements(Project project, Editor editor, PsiElement c if (exceptions.isEmpty()) { exceptions = ExceptionUtil.getThrownExceptions(statements); if (exceptions.isEmpty()) { - exceptions = Collections.singletonList(factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_EXCEPTION, container.getResolveScope())); + exceptions = Collections.singletonList(factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_EXCEPTION, container.getResolveScope())); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java index ea7b85c7df..76d3443117 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java @@ -38,7 +38,6 @@ import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore; import consulo.ide.impl.idea.util.ArrayUtilRt; import consulo.java.language.bundle.JavaSdkTypeUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.LangBundle; import consulo.language.ast.ASTNode; import consulo.language.editor.documentation.DocumentationManagerProtocol; @@ -547,10 +546,10 @@ private static boolean generateClassSignature(StringBuilder buffer, PsiClass aCl String qName = aClass.getQualifiedName(); - if (refs.length > 0 || !aClass.isInterface() && (qName == null || !qName.equals(JavaClassNames.JAVA_LANG_OBJECT))) { + if (refs.length > 0 || !aClass.isInterface() && (qName == null || !qName.equals(CommonClassNames.JAVA_LANG_OBJECT))) { buffer.append("extends "); if (refs.length == 0) { - generateLink(buffer, JavaClassNames.JAVA_LANG_OBJECT, null, aClass, false); + generateLink(buffer, CommonClassNames.JAVA_LANG_OBJECT, null, aClass, false); } else { for (int i = 0; i < refs.length; i++) { generateType(buffer, refs[i], aClass, generateLink); @@ -888,7 +887,7 @@ PsiExpression calcInitializerExpression(PsiVariable variable) { if (o != null) { String text = o.toString(); PsiType type = variable.getType(); - if (type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { text = "\"" + StringUtil.escapeStringCharacters(StringUtil.shortenPathWithEllipsis(text, 120)) + "\""; } else if (type.equalsToText("char")) { text = "'" + text + "'"; @@ -1113,7 +1112,7 @@ public static boolean isDocumentedAnnotationType(@Nullable PsiElement annotation public static boolean isRepeatableAnnotationType(@Nullable PsiElement annotationType) { return annotationType instanceof PsiClass psiClass - && AnnotationUtil.isAnnotated(psiClass, JavaClassNames.JAVA_LANG_ANNOTATION_REPEATABLE, false, true); + && AnnotationUtil.isAnnotated(psiClass, CommonClassNames.JAVA_LANG_ANNOTATION_REPEATABLE, false, true); } @RequiredReadAction @@ -1289,7 +1288,7 @@ private PsiDocComment getMethodDocComment(PsiMethod method) { if (method.getName().equals("values") && parameterList.getParametersCount() == 0) { return loadSyntheticDocComment(method, "/javadoc/EnumValues.java.template"); } - if (method.getName().equals("valueOf") && parameterList.getParametersCount() == 1 && parameterList.getParameters()[0].getType().equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (method.getName().equals("valueOf") && parameterList.getParametersCount() == 1 && parameterList.getParameters()[0].getType().equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return loadSyntheticDocComment(method, "/javadoc/EnumValueOf.java.template"); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/util/JavaPostfixTemplatesUtils.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/util/JavaPostfixTemplatesUtils.java index c5803cf830..b8df6cf1f6 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/util/JavaPostfixTemplatesUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/util/JavaPostfixTemplatesUtils.java @@ -23,7 +23,6 @@ import consulo.codeEditor.Editor; import consulo.document.Document; import consulo.document.util.TextRange; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.CodeInsightUtilCore; import consulo.language.editor.postfixTemplate.PostfixTemplatePsiInfo; @@ -101,12 +100,12 @@ public static boolean isNotPrimitiveTypeExpression(@Nullable PsiExpression expre @Contract("null -> false") public static boolean isIterable(@Nullable PsiType type) { - return type != null && InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_LANG_ITERABLE); + return type != null && InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_LANG_ITERABLE); } @Contract("null -> false") public static boolean isThrowable(@Nullable PsiType type) { - return type != null && InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_LANG_THROWABLE); + return type != null && InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_LANG_THROWABLE); } @Contract("null -> false") diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/MagicNumberInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/MagicNumberInspection.java index 87a6e7e579..ba81bb46d6 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/MagicNumberInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/MagicNumberInspection.java @@ -26,7 +26,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.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; import jakarta.annotation.Nonnull; @@ -118,8 +117,12 @@ public void visitLiteralExpression(@Nonnull PsiLiteralExpression expression) { final PsiElement parent = expressionList.getParent(); if (parent instanceof PsiNewExpression) { final PsiNewExpression newExpression = (PsiNewExpression)parent; - if (TypeUtils.expressionHasTypeOrSubtype(newExpression, JavaClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER, - JavaClassNames.JAVA_UTIL_MAP, JavaClassNames.JAVA_UTIL_COLLECTION) != null) { + if (TypeUtils.expressionHasTypeOrSubtype( + newExpression, + CommonClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER, + CommonClassNames.JAVA_UTIL_MAP, + CommonClassNames.JAVA_UTIL_COLLECTION + ) != null) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java index 03eda18aa5..87d4f63ae1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.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.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -148,7 +147,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression expression) { return; } final String qualifiedName = containingClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_MATH.equals(qualifiedName) && !JavaClassNames.JAVA_LANG_STRICT_MATH.equals(qualifiedName)) { + if (!CommonClassNames.JAVA_LANG_MATH.equals(qualifiedName) && !CommonClassNames.JAVA_LANG_STRICT_MATH.equals(qualifiedName)) { return; } registerError(methodCallExpression, expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeCloneableFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeCloneableFix.java index 9149b1e480..fd6e688699 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeCloneableFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeCloneableFix.java @@ -19,7 +19,6 @@ import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ClassUtils; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; @@ -59,8 +58,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) JavaPsiFacade.getElementFactory(project); final GlobalSearchScope scope = GlobalSearchScope.allScope(project); final PsiJavaCodeReferenceElement ref = - elementFactory.createReferenceElementByFQClassName( - JavaClassNames.JAVA_LANG_CLONEABLE, scope); + elementFactory.createReferenceElementByFQClassName(CommonClassNames.JAVA_LANG_CLONEABLE, scope); final PsiReferenceList extendsImplementsList; if (containingClass.isInterface()) { extendsImplementsList = containingClass.getExtendsList(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeSerializableFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeSerializableFix.java index 02f911f4be..7456f32cf2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeSerializableFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeSerializableFix.java @@ -19,13 +19,11 @@ import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ClassUtils; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; - import jakarta.annotation.Nonnull; public class MakeSerializableFix extends InspectionGadgetsFix { @@ -47,8 +45,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) JavaPsiFacade.getElementFactory(project); final GlobalSearchScope scope = GlobalSearchScope.allScope(project); final PsiJavaCodeReferenceElement referenceElement = - elementFactory.createReferenceElementByFQClassName( - JavaClassNames.JAVA_IO_SERIALIZABLE, scope); + elementFactory.createReferenceElementByFQClassName(CommonClassNames.JAVA_IO_SERIALIZABLE, scope); final PsiReferenceList implementsList = containingClass.getImplementsList(); assert implementsList != null; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java index 739c07f4d8..34fd104065 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java @@ -25,7 +25,6 @@ import com.siyeh.ig.psiutils.TestUtils; 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; @@ -194,7 +193,7 @@ private static void transformSetUpOrTearDownMethod(PsiMethod method) { if (!modifierList.hasModifierProperty(PsiModifier.PUBLIC)) { modifierList.setModifierProperty(PsiModifier.PUBLIC, true); } - final PsiAnnotation overrideAnnotation = modifierList.findAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); + final PsiAnnotation overrideAnnotation = modifierList.findAnnotation(CommonClassNames.JAVA_LANG_OVERRIDE); if (overrideAnnotation != null) { overrideAnnotation.delete(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/KeySetIterationMayUseEntrySetInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/KeySetIterationMayUseEntrySetInspection.java index 7b7feeb356..d8df583fd1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/KeySetIterationMayUseEntrySetInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/KeySetIterationMayUseEntrySetInspection.java @@ -25,7 +25,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.editor.refactoring.rename.SuggestedNameInfo; import consulo.language.psi.PsiElement; @@ -368,7 +367,7 @@ private static boolean isMapKeySetIteration(PsiExpression iteratedExpression, Ps return false; } final String className = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_UTIL_MAP.equals(className)) { + if (!CommonClassNames.JAVA_UTIL_MAP.equals(className)) { return false; } final GetValueFromMapChecker checker = new GetValueFromMapChecker(targetVariable, key); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/LengthOneStringInIndexOfInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/LengthOneStringInIndexOfInspection.java index b6b416382f..09c8b089a9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/LengthOneStringInIndexOfInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/LengthOneStringInIndexOfInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -143,7 +142,7 @@ static boolean isArgumentOfIndexOf(PsiExpression expression) { return false; } final String className = methodClass.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/performance/LengthOneStringsInConcatenationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/LengthOneStringsInConcatenationInspection.java index 367822c921..c890d02e98 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/LengthOneStringsInConcatenationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/LengthOneStringsInConcatenationInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -140,8 +139,8 @@ static boolean isArgumentOfStringAppend(PsiExpression expression) { return false; } final String className = methodClass.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/ManualArrayToCollectionCopyInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayToCollectionCopyInspection.java index ce0a798dcd..3cb0307930 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayToCollectionCopyInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayToCollectionCopyInspection.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 com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; @@ -28,16 +27,14 @@ 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.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; @ExtensionImpl public class ManualArrayToCollectionCopyInspection extends BaseInspection { @@ -605,8 +602,7 @@ else if (!VariableAccessUtils.evaluatesToVariable(argument, return false; } final PsiClass containingClass = method.getContainingClass(); - return InheritanceUtil.isInheritor(containingClass, - JavaClassNames.JAVA_UTIL_COLLECTION); + return InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_UTIL_COLLECTION); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java index 165d56ca48..ccba6f71d4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java @@ -16,15 +16,13 @@ package com.intellij.java.impl.ig.performance; import com.intellij.java.language.psi.*; -import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.psi.util.PsiTreeUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ExpectedTypeUtils; import com.siyeh.ig.psiutils.TypeUtils; -import consulo.java.language.module.util.JavaClassNames; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.psi.util.PsiTreeUtil; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -73,7 +71,7 @@ public void visitNewExpression(@Nonnull PsiNewExpression expression) { if (!(argumentType instanceof PsiClassType)) { return; } - if (!TypeUtils.expressionHasTypeOrSubtype(expression, JavaClassNames.JAVA_UTIL_MAP)) { + if (!TypeUtils.expressionHasTypeOrSubtype(expression, CommonClassNames.JAVA_UTIL_MAP)) { return; } if (null != TypeUtils.expressionHasTypeOrSubtype(expression, "java.util.EnumMap", "java.util.concurrent.ConcurrentMap")) { @@ -94,7 +92,7 @@ public void visitNewExpression(@Nonnull PsiNewExpression expression) { final PsiExpressionList argumentList = expression.getArgumentList(); if (argumentList != null) { final PsiExpression[] arguments = argumentList.getExpressions(); - if (arguments.length > 0 && TypeUtils.expressionHasTypeOrSubtype(arguments[0], JavaClassNames.JAVA_UTIL_COMPARATOR)) { + if (arguments.length > 0 && TypeUtils.expressionHasTypeOrSubtype(arguments[0], CommonClassNames.JAVA_UTIL_COMPARATOR)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/JDBCExecuteWithNonConstantStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/JDBCExecuteWithNonConstantStringInspection.java index 2a13e0496b..b18d5258de 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/JDBCExecuteWithNonConstantStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/JDBCExecuteWithNonConstantStringInspection.java @@ -22,7 +22,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -98,7 +97,7 @@ public void visitMethodCallExpression( return; } final String typeText = type.getCanonicalText(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(typeText)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(typeText)) { return; } final String stringValue = diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/JDBCPrepareStatementWithNonConstantStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/JDBCPrepareStatementWithNonConstantStringInspection.java index 0fcf1dc303..e288cbf23d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/JDBCPrepareStatementWithNonConstantStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/JDBCPrepareStatementWithNonConstantStringInspection.java @@ -22,7 +22,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -96,7 +95,7 @@ public void visitMethodCallExpression( return; } final String typeText = type.getCanonicalText(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(typeText)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(typeText)) { return; } final String stringValue = diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/LoadLibraryWithNonConstantStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/LoadLibraryWithNonConstantStringInspection.java index 88cdc60160..bbb8631be0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/LoadLibraryWithNonConstantStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/LoadLibraryWithNonConstantStringInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -84,11 +83,10 @@ public void visitMethodCallExpression( return; } final String typeText = type.getCanonicalText(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(typeText)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(typeText)) { return; } - final String stringValue = - (String)ConstantExpressionUtil.computeCastTo(arg, type); + final String stringValue = (String)ConstantExpressionUtil.computeCastTo(arg, type); if (stringValue != null) { return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/ListIndexOfReplaceableByContainsInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/ListIndexOfReplaceableByContainsInspection.java index 4132170ee7..c13b04745a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/ListIndexOfReplaceableByContainsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/ListIndexOfReplaceableByContainsInspection.java @@ -24,7 +24,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.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.scope.GlobalSearchScope; @@ -243,9 +242,7 @@ private static boolean isIndexOfCall( final GlobalSearchScope projectScope = GlobalSearchScope.allScope(project); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); - final PsiClass javaUtilListClass = - psiFacade.findClass(JavaClassNames.JAVA_UTIL_LIST, - projectScope); + final PsiClass javaUtilListClass = psiFacade.findClass(CommonClassNames.JAVA_UTIL_LIST, projectScope); if (javaUtilListClass == null) { return false; } diff --git a/plugin/src/main/java/com/intellij/java/impl/lang/java/JavaDocumentationProvider.java b/plugin/src/main/java/com/intellij/java/impl/lang/java/JavaDocumentationProvider.java index 6cb8a0562b..33b3df3d33 100644 --- a/plugin/src/main/java/com/intellij/java/impl/lang/java/JavaDocumentationProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/lang/java/JavaDocumentationProvider.java @@ -35,7 +35,6 @@ import consulo.codeEditor.Editor; import consulo.component.ProcessCanceledException; import consulo.content.base.DocumentationOrderRootType; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.CodeDocumentationAwareCommenter; import consulo.language.Commenter; import consulo.language.LangBundle; @@ -209,7 +208,7 @@ public static void writeImplements(PsiClass aClass, StringBuilder buffer, PsiCla } public static void writeExtends(PsiClass aClass, StringBuilder buffer, PsiClassType[] refs) { - if (refs.length > 0 || !aClass.isInterface() && !JavaClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) { + if (refs.length > 0 || !aClass.isInterface() && !CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) { buffer.append(" extends "); if (refs.length == 0) { buffer.append("Object"); diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/filters/getters/MembersGetter.java b/plugin/src/main/java/com/intellij/java/impl/psi/filters/getters/MembersGetter.java index 1220be2ef1..3f5f816e9a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/filters/getters/MembersGetter.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/filters/getters/MembersGetter.java @@ -24,7 +24,6 @@ import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PsiUtil; import consulo.application.util.matcher.PrefixMatcher; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.completion.AutoCompletionPolicy; import consulo.language.editor.completion.CompletionUtilCore; import consulo.language.editor.completion.lookup.LookupElement; @@ -90,7 +89,7 @@ public void processMembers(final Consumer results, @Nullable fina return; } - final boolean searchFactoryMethods = searchInheritors && !JavaClassNames.JAVA_LANG_OBJECT.equals(where.getQualifiedName()) && !isPrimitiveClass(where); + final boolean searchFactoryMethods = searchInheritors && !CommonClassNames.JAVA_LANG_OBJECT.equals(where.getQualifiedName()) && !isPrimitiveClass(where); final Project project = myPlace.getProject(); final GlobalSearchScope scope = myPlace.getResolveScope(); @@ -116,7 +115,7 @@ public void processMembers(final Consumer results, @Nullable fina } }; consumer.accept(baseType); - if (searchInheritors && !JavaClassNames.JAVA_LANG_OBJECT.equals(where.getQualifiedName())) { + if (searchInheritors && !CommonClassNames.JAVA_LANG_OBJECT.equals(where.getQualifiedName())) { CodeInsightUtil.processSubTypes(baseType, myPlace, true, PrefixMatcher.ALWAYS_TRUE, consumer); } } @@ -126,7 +125,7 @@ private static boolean isPrimitiveClass(PsiClass where) { if (qname == null || !qname.startsWith("java.lang.")) { return false; } - return JavaClassNames.JAVA_LANG_STRING.equals(qname) || InheritanceUtil.isInheritor(where, JavaClassNames.JAVA_LANG_NUMBER); + return CommonClassNames.JAVA_LANG_STRING.equals(qname) || InheritanceUtil.isInheritor(where, CommonClassNames.JAVA_LANG_NUMBER); } private void doProcessMembers(boolean acceptMethods, Consumer results, boolean isExpectedTypeMember, Collection declarations) { diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java index cd7aeed52f..fcdfce7823 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java @@ -32,7 +32,6 @@ import consulo.annotation.component.ServiceImpl; import consulo.application.util.matcher.NameUtil; import consulo.application.util.matcher.NameUtilCore; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.codeStyle.CodeStyle; import consulo.language.codeStyle.CodeStyleSettings; @@ -368,7 +367,7 @@ private static String getWordByPreposition(@Nonnull String name, String prefix, private String suggestNameFromTypeMap(@Nonnull PsiType type, @Nonnull VariableKind variableKind, @Nullable String longTypeName) { if (longTypeName != null) { if (type.equals(PsiTypes.nullType())) { - longTypeName = JavaClassNames.JAVA_LANG_OBJECT; + longTypeName = CommonClassNames.JAVA_LANG_OBJECT; } String name = nameByType(longTypeName, variableKind); if (name != null && isIdentifier(name)) { @@ -385,23 +384,23 @@ private static String nameByType(@Nonnull String longTypeName, @Nonnull Variable case "int", "boolean", "byte", "char", "long" -> longTypeName.substring(0, 1); case "double", "float" -> "v"; case "short" -> "i"; - case JavaClassNames.JAVA_LANG_OBJECT -> "o"; - case JavaClassNames.JAVA_LANG_STRING -> "s"; - case JavaClassNames.JAVA_LANG_VOID -> "unused"; + case CommonClassNames.JAVA_LANG_OBJECT -> "o"; + case CommonClassNames.JAVA_LANG_STRING -> "s"; + case CommonClassNames.JAVA_LANG_VOID -> "unused"; default -> null; }; } if (kind == VariableKind.LOCAL_VARIABLE) { return switch (longTypeName) { case "int", "boolean", "byte", "char", "long" -> longTypeName.substring(0, 1); - case "double", "float", JavaClassNames.JAVA_LANG_DOUBLE, JavaClassNames.JAVA_LANG_FLOAT -> "v"; - case "short", JavaClassNames.JAVA_LANG_SHORT, JavaClassNames.JAVA_LANG_INTEGER -> "i"; - case JavaClassNames.JAVA_LANG_LONG -> "l"; - case JavaClassNames.JAVA_LANG_BOOLEAN, JavaClassNames.JAVA_LANG_BYTE -> "b"; - case JavaClassNames.JAVA_LANG_CHARACTER -> "c"; - case JavaClassNames.JAVA_LANG_OBJECT -> "o"; - case JavaClassNames.JAVA_LANG_STRING -> "s"; - case JavaClassNames.JAVA_LANG_VOID -> "unused"; + case "double", "float", CommonClassNames.JAVA_LANG_DOUBLE, CommonClassNames.JAVA_LANG_FLOAT -> "v"; + case "short", CommonClassNames.JAVA_LANG_SHORT, CommonClassNames.JAVA_LANG_INTEGER -> "i"; + case CommonClassNames.JAVA_LANG_LONG -> "l"; + case CommonClassNames.JAVA_LANG_BOOLEAN, CommonClassNames.JAVA_LANG_BYTE -> "b"; + case CommonClassNames.JAVA_LANG_CHARACTER -> "c"; + case CommonClassNames.JAVA_LANG_OBJECT -> "o"; + case CommonClassNames.JAVA_LANG_STRING -> "s"; + case CommonClassNames.JAVA_LANG_VOID -> "unused"; default -> null; }; } @@ -623,11 +622,11 @@ else if (type instanceof PsiPrimitiveType) { } else if (type instanceof PsiWildcardType wildcardType) { PsiType bound = wildcardType.getBound(); - return bound != null ? getLongTypeName(bound) : JavaClassNames.JAVA_LANG_OBJECT; + return bound != null ? getLongTypeName(bound) : CommonClassNames.JAVA_LANG_OBJECT; } else if (type instanceof PsiCapturedWildcardType capturedWildcardType) { PsiType bound = capturedWildcardType.getWildcard().getBound(); - return bound != null ? getLongTypeName(bound) : JavaClassNames.JAVA_LANG_OBJECT; + return bound != null ? getLongTypeName(bound) : CommonClassNames.JAVA_LANG_OBJECT; } else if (type instanceof PsiIntersectionType intersectionType) { return getLongTypeName(intersectionType.getRepresentative()); @@ -770,7 +769,7 @@ private void suggestFromOptionalContent( @Nullable private static PsiType extractOptionalContent(@Nonnull PsiClassType classType) { PsiClass resolved = classType.resolve(); - if (resolved != null && JavaClassNames.JAVA_UTIL_OPTIONAL.equals(resolved.getQualifiedName())) { + if (resolved != null && CommonClassNames.JAVA_UTIL_OPTIONAL.equals(resolved.getQualifiedName())) { if (classType.getParameterCount() == 1) { return classType.getParameters()[0]; } diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/JavaReflectionCompletionContributor.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/JavaReflectionCompletionContributor.java index 5b04f662dc..9be7ca076c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/JavaReflectionCompletionContributor.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/JavaReflectionCompletionContributor.java @@ -23,7 +23,6 @@ import com.intellij.java.language.psi.util.InheritanceUtil; import consulo.annotation.component.ExtensionImpl; import consulo.document.util.TextRange; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.Language; import consulo.language.editor.completion.CompletionContributor; import consulo.language.editor.completion.CompletionParameters; @@ -38,8 +37,8 @@ import consulo.language.psi.PsiUtilCore; import consulo.language.psi.util.PsiTreeUtil; import consulo.language.util.ProcessingContext; - import jakarta.annotation.Nonnull; + import java.util.Set; import java.util.function.BiConsumer; @@ -62,8 +61,7 @@ public class JavaReflectionCompletionContributor extends CompletionContributor { private static final String ANNOTATED_ELEMENT = "java.lang.reflect.AnnotatedElement"; private static final Set DECLARED_NAMES = Set.of(DECLARED_CONSTRUCTOR, DECLARED_ANNOTATION, DECLARED_ANNOTATIONS_BY_TYPE); - private static final ElementPattern CONSTRUCTOR_ARGUMENTS = psiElement(PsiExpressionList.class).withParent(psiExpression().methodCall(psiMethod().withName(CONSTRUCTOR, - DECLARED_CONSTRUCTOR).definedInClass(JavaClassNames.JAVA_LANG_CLASS))); + private static final ElementPattern CONSTRUCTOR_ARGUMENTS = psiElement(PsiExpressionList.class).withParent(psiExpression().methodCall(psiMethod().withName(CONSTRUCTOR, DECLARED_CONSTRUCTOR).definedInClass(CommonClassNames.JAVA_LANG_CLASS))); private static final ElementPattern ANNOTATION_ARGUMENTS = psiElement(PsiExpressionList.class).withParent(psiExpression().methodCall(psiMethod().withName(ANNOTATION, DECLARED_ANNOTATION, ANNOTATIONS_BY_TYPE, DECLARED_ANNOTATIONS_BY_TYPE).with(new MethodDefinedInInterfacePatternCondition(ANNOTATED_ELEMENT)))); diff --git a/plugin/src/main/java/consulo/java/impl/ide/JavaIconDescriptorUpdater.java b/plugin/src/main/java/consulo/java/impl/ide/JavaIconDescriptorUpdater.java index 993e1e2ba6..8cf8c57862 100644 --- a/plugin/src/main/java/consulo/java/impl/ide/JavaIconDescriptorUpdater.java +++ b/plugin/src/main/java/consulo/java/impl/ide/JavaIconDescriptorUpdater.java @@ -27,7 +27,6 @@ import consulo.component.util.Iconable; import consulo.java.impl.util.JavaProjectRootsUtil; import consulo.java.language.impl.icon.JavaPsiImplIconGroup; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.icon.IconDescriptor; import consulo.language.icon.IconDescriptorUpdater; import consulo.language.icon.IconDescriptorUpdaters; @@ -75,7 +74,7 @@ public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiEleme if (!DumbService.getInstance(element.getProject()).isDumb()) { final PsiManager manager = psiClass.getManager(); - final PsiClass javaLangTrowable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_LANG_THROWABLE, psiClass.getResolveScope()); + final PsiClass javaLangTrowable = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_THROWABLE, psiClass.getResolveScope()); final boolean isException = javaLangTrowable != null && InheritanceUtil.isInheritorOrSelf(psiClass, javaLangTrowable, true); if (isException) { iconDescriptor.setMainIcon(abst ? AllIcons.Nodes.AbstractException : AllIcons.Nodes.ExceptionClass);