diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/intention/AddAnnotationPsiFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/intention/AddAnnotationPsiFix.java index f10cdef9f..4d961b20d 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/intention/AddAnnotationPsiFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/intention/AddAnnotationPsiFix.java @@ -13,7 +13,6 @@ import com.siyeh.ig.psiutils.CommentTracker; import consulo.annotation.access.RequiredReadAction; import consulo.java.analysis.localize.JavaAnalysisLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.WriteCommandAction; import consulo.language.editor.inspection.LocalQuickFixOnPsiElement; import consulo.language.editor.intention.BaseIntentionAction; 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 2105134a5..0932c29d1 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 @@ -8,7 +8,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import consulo.annotation.access.RequiredReadAction; import consulo.java.language.module.extension.JavaModuleExtension; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.util.ModuleUtilCore; import consulo.util.lang.ObjectUtil; diff --git a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java index 66831cd13..6e8e24a1c 100644 --- a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java +++ b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java @@ -19,7 +19,6 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.LocalInspectionToolSession; import consulo.language.editor.inspection.ProblemHighlightType; import consulo.language.editor.inspection.ProblemsHolder; diff --git a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java index c6f831122..794d72be7 100644 --- a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java +++ b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java @@ -18,16 +18,15 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PropertyUtil; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemHighlightType; import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; import org.jetbrains.java.generate.GenerateToStringContext; import org.jetbrains.java.generate.GenerateToStringUtils; -import jakarta.annotation.Nonnull; import java.util.Collections; import java.util.HashSet; import java.util.Set; diff --git a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/psi/PsiAdapter.java b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/psi/PsiAdapter.java index 8bd7ff4ac..6a49638ad 100644 --- a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/psi/PsiAdapter.java +++ b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/psi/PsiAdapter.java @@ -23,7 +23,7 @@ import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PropertyUtil; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.java.language.module.util.JavaClassNames; +import consulo.annotation.access.RequiredReadAction; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.psi.PsiComment; import consulo.language.psi.PsiElement; @@ -33,11 +33,9 @@ import consulo.util.collection.ArrayUtil; import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; - import jakarta.annotation.Nullable; -import java.util.*; -import static consulo.java.language.module.util.JavaClassNames.*; +import java.util.*; /** * Basic PSI Adapter with common function that works in all supported versions of IDEA. @@ -120,11 +118,7 @@ public static boolean isObjectArrayType(PsiType type) { * @return true if it's a String array type. */ public static boolean isStringArrayType(PsiType type) { - if (isPrimitiveType(type)) { - return false; - } - - return type.getCanonicalText().indexOf("String[]") > 0; + return !isPrimitiveType(type) && type.getCanonicalText().indexOf("String[]") > 0; } /** @@ -135,7 +129,7 @@ public static boolean isStringArrayType(PsiType type) { * @return true if it's a Collection type. */ public static boolean isCollectionType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, JAVA_UTIL_COLLECTION); + return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_COLLECTION); } /** @@ -146,7 +140,7 @@ public static boolean isCollectionType(PsiElementFactory factory, PsiType type) * @return true if it's a Map type. */ public static boolean isMapType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, JAVA_UTIL_MAP); + return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_MAP); } /** @@ -157,7 +151,7 @@ public static boolean isMapType(PsiElementFactory factory, PsiType type) { * @return true if it's a Map type. */ public static boolean isSetType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, JAVA_UTIL_SET); + return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_SET); } /** @@ -168,7 +162,7 @@ public static boolean isSetType(PsiElementFactory factory, PsiType type) { * @return true if it's a Map type. */ public static boolean isListType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, JAVA_UTIL_LIST); + return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_LIST); } /** @@ -179,7 +173,7 @@ public static boolean isListType(PsiElementFactory factory, PsiType type) { * @return true if it's a String type. */ public static boolean isStringType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, JAVA_LANG_STRING); + return isTypeOf(factory, type, CommonClassNames.JAVA_LANG_STRING); } /** @@ -190,7 +184,7 @@ public static boolean isStringType(PsiElementFactory factory, PsiType type) { * @return true if it's an Object type. */ public static boolean isObjectType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, JAVA_LANG_OBJECT); + return isTypeOf(factory, type, CommonClassNames.JAVA_LANG_OBJECT); } /** @@ -201,7 +195,7 @@ public static boolean isObjectType(PsiElementFactory factory, PsiType type) { * @return true if it's a Date type. */ public static boolean isDateType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, JAVA_UTIL_DATE); + return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_DATE); } /** @@ -212,7 +206,7 @@ public static boolean isDateType(PsiElementFactory factory, PsiType type) { * @return true if it's a Calendar type. */ public static boolean isCalendarType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, JAVA_UTIL_CALENDAR); + return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_CALENDAR); } /** @@ -229,7 +223,7 @@ public static boolean isBooleanType(PsiElementFactory factory, PsiType type) { return "boolean".equals(s); } else { // test for Object type of Boolean - return isTypeOf(factory, type, JAVA_LANG_BOOLEAN); + return isTypeOf(factory, type, CommonClassNames.JAVA_LANG_BOOLEAN); } } @@ -247,7 +241,7 @@ public static boolean isNumericType(PsiElementFactory factory, PsiType type) { return "byte".equals(s) || "double".equals(s) || "float".equals(s) || "int".equals(s) || "long".equals(s) || "short".equals(s); } else { // test for Object type of numeric - return isTypeOf(factory, type, JAVA_LANG_NUMBER); + return isTypeOf(factory, type, CommonClassNames.JAVA_LANG_NUMBER); } } @@ -258,6 +252,7 @@ public static boolean isNumericType(PsiElementFactory factory, PsiType type) { * @param importStatement import statement to test existing for. * @return true if the javafile has the import statement. */ + @RequiredReadAction public static boolean hasImportStatement(PsiJavaFile javaFile, String importStatement) { PsiImportList importList = javaFile.getImportList(); if (importList == null) { @@ -278,6 +273,7 @@ public static boolean hasImportStatement(PsiJavaFile javaFile, String importStat * @param importStatementOnDemand name of import statement, must be with a wildcard (etc. java.util.*). * @throws IncorrectOperationException is thrown if there is an error creating the import statement. */ + @RequiredReadAction public static void addImportStatement(PsiJavaFile javaFile, String importStatementOnDemand) { PsiElementFactory factory = JavaPsiFacade.getInstance(javaFile.getProject()).getElementFactory(); PsiImportStatement is = factory.createImportStatementOnDemand(fixImportStatement(importStatementOnDemand)); @@ -373,12 +369,12 @@ public static PsiMethod findPublicStaticVoidMainMethod(PsiClass clazz) { // is it public static void main(String[] args) for (PsiMethod method : methods) { // must be public - if (!method.hasModifierProperty(PsiModifier.PUBLIC)) { + if (!method.isPublic()) { continue; } // must be static - if (!method.hasModifierProperty(PsiModifier.STATIC)) { + if (!method.isStatic()) { continue; } @@ -417,8 +413,9 @@ public static PsiMethod findPublicStaticVoidMainMethod(PsiClass clazz) { * @throws IncorrectOperationException is thrown if error adding/replacing the javadoc comment. */ @Nullable + @RequiredReadAction public static PsiComment addOrReplaceJavadoc(PsiMethod method, String javadoc, boolean replace) { - final Project project = method.getProject(); + Project project = method.getProject(); PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory(); PsiComment comment = factory.createCommentFromText(javadoc, null); @@ -428,7 +425,7 @@ public static PsiComment addOrReplaceJavadoc(PsiMethod method, String javadoc, b if (replace) { // javadoc already exists, so replace doc.replace(comment); - final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project); + CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project); codeStyleManager.reformat(method); // to reformat javadoc return comment; } else { @@ -438,7 +435,7 @@ public static PsiComment addOrReplaceJavadoc(PsiMethod method, String javadoc, b } else { // add new javadoc method.addBefore(comment, method.getFirstChild()); - final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project); + CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project); codeStyleManager.reformat(method); // to reformat javadoc return comment; } @@ -468,11 +465,8 @@ public static boolean isGetterMethod(PsiMethod method) { if (isTypeOfVoid(method.getReturnType())) { return false; } - final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { - return false; - } - return true; + PsiParameterList parameterList = method.getParameterList(); + return parameterList.getParametersCount() == 0; } /** @@ -510,8 +504,8 @@ public static boolean isEnumField(PsiField field) { if (!(type instanceof PsiClassType)) { return false; } - final PsiClassType classType = (PsiClassType) type; - final PsiClass aClass = classType.resolve(); + PsiClassType classType = (PsiClassType) type; + PsiClass aClass = classType.resolve(); return (aClass != null) && aClass.isEnum(); } @@ -522,7 +516,7 @@ public static boolean isEnumField(PsiField field) { * @return true if class is an exception. */ public static boolean isExceptionClass(PsiClass clazz) { - return InheritanceUtil.isInheritor(clazz, JAVA_LANG_THROWABLE); + return InheritanceUtil.isInheritor(clazz, CommonClassNames.JAVA_LANG_THROWABLE); } /** @@ -538,12 +532,12 @@ public static PsiMethod findEqualsMethod(PsiClass clazz) { // is it public boolean equals(Object o) for (PsiMethod method : methods) { // must be public - if (!method.hasModifierProperty(PsiModifier.PUBLIC)) { + if (!method.isPublic()) { continue; } // must not be static - if (method.hasModifierProperty(PsiModifier.STATIC)) { + if (method.isStatic()) { continue; } @@ -560,7 +554,7 @@ public static PsiMethod findEqualsMethod(PsiClass clazz) { } // parameter must be Object - if (!(parameters[0].getType().getCanonicalText().equals(JAVA_LANG_OBJECT))) { + if (!(parameters[0].getType().getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT))) { continue; } @@ -585,12 +579,12 @@ public static PsiMethod findHashCodeMethod(PsiClass clazz) { // is it public int hashCode() for (PsiMethod method : methods) { // must be public - if (!method.hasModifierProperty(PsiModifier.PUBLIC)) { + if (!method.isPublic()) { continue; } // must not be static - if (method.hasModifierProperty(PsiModifier.STATIC)) { + if (method.isStatic()) { continue; } @@ -646,6 +640,7 @@ protected static boolean isTypeOf(PsiElementFactory factory, PsiType type, Strin * @param clazz the class * @return the names. */ + @RequiredReadAction public static String[] getImplementsClassnames(PsiClass clazz) { PsiClass[] interfaces = clazz.getInterfaces(); @@ -672,6 +667,7 @@ public static boolean isPrimitiveType(PsiType type) { return type instanceof PsiPrimitiveType; } + @RequiredReadAction public static int getJavaVersion(@Nonnull PsiElement element) { JavaSdkVersion sdkVersion = JavaVersionService.getInstance().getJavaSdkVersion(element); if (sdkVersion == null) { @@ -716,7 +712,7 @@ public static boolean isNestedArray(PsiType aType) { if (!(aType instanceof PsiArrayType)) { return false; } - final PsiType componentType = ((PsiArrayType) aType).getComponentType(); + PsiType componentType = ((PsiArrayType) aType).getComponentType(); return componentType instanceof PsiArrayType; } } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValueModifier.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValueModifier.java index cc574f668..11d9b8bd2 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValueModifier.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaValueModifier.java @@ -15,7 +15,6 @@ */ package com.intellij.java.debugger.impl.engine; -import com.intellij.java.debugger.DebuggerBundle; import com.intellij.java.debugger.SourcePosition; import com.intellij.java.debugger.engine.DebuggerUtils; import com.intellij.java.debugger.engine.evaluation.CodeFragmentKind; @@ -36,6 +35,7 @@ import com.intellij.java.debugger.impl.ui.impl.watch.NodeDescriptorImpl; import com.intellij.java.debugger.impl.ui.impl.watch.ValueDescriptorImpl; import com.intellij.java.debugger.localize.JavaDebuggerLocalize; +import com.intellij.java.language.psi.CommonClassNames; import consulo.application.progress.ProgressIndicator; import consulo.application.progress.ProgressManager; import consulo.application.progress.Task; @@ -47,8 +47,6 @@ import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; -import static consulo.java.language.module.util.JavaClassNames.JAVA_LANG_STRING; - /* * Class SetValueAction * @author Jeka @@ -91,13 +89,15 @@ public void contextAction() throws Exception { } protected static void update(final DebuggerContextImpl context) { - DebuggerInvocationUtil.swingInvokeLater(context.getProject(), () -> - { - final DebuggerSession session = context.getDebuggerSession(); - if (session != null) { - session.refresh(false); + DebuggerInvocationUtil.swingInvokeLater( + context.getProject(), + () -> { + DebuggerSession session = context.getDebuggerSession(); + if (session != null) { + session.refresh(false); + } } - }); + ); } protected abstract void setValueImpl(@Nonnull String expression, @Nonnull XModificationCallback callback); @@ -110,7 +110,7 @@ public void setValue(@Nonnull String expression, @Nonnull XModificationCallback } if (myJavaValue.getEvaluationContext().getSuspendContext().isResumed()) { - callback.errorOccurred(DebuggerBundle.message("error.context.has.changed")); + callback.errorOccurred(JavaDebuggerLocalize.errorContextHasChanged().get()); return; } @@ -118,14 +118,14 @@ public void setValue(@Nonnull String expression, @Nonnull XModificationCallback } protected static Value preprocessValue(EvaluationContextImpl context, Value value, Type varType) throws EvaluateException { - if (value != null && JAVA_LANG_STRING.equals(varType.name()) && !(value instanceof StringReference)) { + if (value != null && CommonClassNames.JAVA_LANG_STRING.equals(varType.name()) && !(value instanceof StringReference)) { String v = DebuggerUtils.getValueAsString(context, value); if (v != null) { value = context.getSuspendContext().getDebugProcess().getVirtualMachineProxy().mirrorOf(v); } } - if (value instanceof DoubleValue) { - double dValue = ((DoubleValue) value).doubleValue(); + if (value instanceof DoubleValue doubleValue) { + double dValue = doubleValue.doubleValue(); if (varType instanceof FloatType && Float.MIN_VALUE <= dValue && dValue <= Float.MAX_VALUE) { value = context.getSuspendContext().getDebugProcess().getVirtualMachineProxy().mirrorOf((float) dValue); } @@ -163,7 +163,7 @@ private static void setValue(String expressionToShow, ExpressionEvaluator evalua throw EvaluateExceptionUtil.createEvaluateException(ex.getMessage()); } catch (InvalidTypeException ex) { - throw EvaluateExceptionUtil.createEvaluateException(DebuggerBundle.message("evaluation.error.type.mismatch")); + throw EvaluateExceptionUtil.createEvaluateException(JavaDebuggerLocalize.evaluationErrorTypeMismatch().get()); } catch (IncompatibleThreadStateException e) { throw EvaluateExceptionUtil.createEvaluateException(e); @@ -172,7 +172,7 @@ private static void setValue(String expressionToShow, ExpressionEvaluator evalua if (!evaluationContext.isAutoLoadClasses()) { throw EvaluateExceptionUtil.createEvaluateException(ex); } - final ReferenceType refType; + ReferenceType refType; try { refType = setValueRunnable.loadClass(evaluationContext, ex.className()); if (refType != null) { diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ToStringRenderer.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ToStringRenderer.java index 7676e1663..dce03e1f8 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ToStringRenderer.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ToStringRenderer.java @@ -36,8 +36,6 @@ import org.jdom.Element; import org.jetbrains.annotations.NonNls; -import static consulo.java.language.module.util.JavaClassNames.JAVA_LANG_STRING; - public class ToStringRenderer extends NodeRendererImpl implements OnDemandRenderer { public static final @@ -149,7 +147,7 @@ public boolean isApplicable(Type type) return false; } - if(JAVA_LANG_STRING.equals(type.name())) + if(CommonClassNames.JAVA_LANG_STRING.equals(type.name())) { return false; // do not render 'String' objects for performance reasons } diff --git a/java-language-api/src/main/java/com/intellij/java/language/codeInsight/AnnotationUtil.java b/java-language-api/src/main/java/com/intellij/java/language/codeInsight/AnnotationUtil.java index 3c91ec144..d6b3d041e 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/codeInsight/AnnotationUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/codeInsight/AnnotationUtil.java @@ -11,7 +11,6 @@ import consulo.application.util.ConcurrentFactoryMap; import consulo.application.util.function.Processor; import consulo.application.util.function.Processors; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiModificationTracker; import consulo.language.psi.PsiReference; diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectConversion.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectConversion.java index b95dffd56..cbe4c6fd1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectConversion.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectConversion.java @@ -22,20 +22,19 @@ 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.application.AllIcons; +import consulo.annotation.access.RequiredReadAction; import consulo.language.editor.completion.lookup.InsertionContext; import consulo.language.editor.completion.lookup.LookupElement; import consulo.language.editor.completion.lookup.LookupElementPresentation; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.psi.util.PsiTreeUtil; +import consulo.platform.base.icon.PlatformIconGroup; import jakarta.annotation.Nonnull; import java.util.Collection; import java.util.Set; import java.util.function.Consumer; -import static consulo.java.language.module.util.JavaClassNames.*; - /** * @author peter */ @@ -44,18 +43,18 @@ class CollectConversion { static void addCollectConversion(PsiReferenceExpression ref, Collection expectedTypes, Consumer consumer) { - final PsiExpression qualifier = ref.getQualifierExpression(); + PsiExpression qualifier = ref.getQualifierExpression(); PsiType component = qualifier == null ? null : PsiUtil.substituteTypeParameter(qualifier.getType(), - JAVA_UTIL_STREAM_STREAM, 0, true); + CommonClassNames.JAVA_UTIL_STREAM_STREAM, 0, true); if (component == null) { return; } JavaPsiFacade facade = JavaPsiFacade.getInstance(ref.getProject()); GlobalSearchScope scope = ref.getResolveScope(); - PsiClass list = facade.findClass(JAVA_UTIL_LIST, scope); - PsiClass set = facade.findClass(JAVA_UTIL_SET, scope); - if (facade.findClass(JAVA_UTIL_STREAM_COLLECTORS, scope) == null || list == null || set == null) { + PsiClass list = facade.findClass(CommonClassNames.JAVA_UTIL_LIST, scope); + PsiClass set = facade.findClass(CommonClassNames.JAVA_UTIL_SET, scope); + if (facade.findClass(CommonClassNames.JAVA_UTIL_STREAM_COLLECTORS, scope) == null || list == null || set == null) { return; } @@ -110,10 +109,11 @@ public Set getAllLookupStrings() { public void renderElement(LookupElementPresentation presentation) { super.renderElement(presentation); presentation.setTypeText(myTypeText); - presentation.setIcon(AllIcons.Nodes.Method); + presentation.setIcon(PlatformIconGroup.nodesMethod()); } @Override + @RequiredReadAction public void handleInsert(InsertionContext context) { context.getDocument().replaceString(context.getStartOffset(), context.getTailOffset(), getInsertString()); context.commitDocument(); @@ -134,7 +134,7 @@ public void handleInsert(InsertionContext context) { @Nonnull private String getInsertString() { - return "collect(" + JAVA_UTIL_STREAM_COLLECTORS + "." + myMethodName + "())"; + return "collect(" + CommonClassNames.JAVA_UTIL_STREAM_COLLECTORS + "." + myMethodName + "())"; } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectionsUtilityMethodsProvider.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectionsUtilityMethodsProvider.java index e8ef4f2d5..48849bebf 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectionsUtilityMethodsProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectionsUtilityMethodsProvider.java @@ -21,12 +21,9 @@ import consulo.language.psi.PsiElement; import consulo.util.dataholder.Key; import jakarta.annotation.Nonnull; -import org.jetbrains.annotations.NonNls; import java.util.function.Consumer; -import static consulo.java.language.module.util.JavaClassNames.*; - /** * @author peter */ @@ -40,7 +37,7 @@ class CollectionsUtilityMethodsProvider { CollectionsUtilityMethodsProvider(PsiElement position, PsiType expectedType, - PsiType defaultType, @Nonnull final Consumer result) { + PsiType defaultType, @Nonnull Consumer result) { myResult = result; myElement = position; myExpectedType = expectedType; @@ -48,63 +45,63 @@ class CollectionsUtilityMethodsProvider { } public void addCompletions(boolean showAll) { - final PsiElement parent = myElement.getParent(); + PsiElement parent = myElement.getParent(); if (parent instanceof PsiReferenceExpression && ((PsiReferenceExpression)parent).getQualifierExpression() != null) return; - final PsiClass collectionsClass = - JavaPsiFacade.getInstance(myElement.getProject()).findClass(JAVA_UTIL_COLLECTIONS, myElement.getResolveScope()); + PsiClass collectionsClass = + JavaPsiFacade.getInstance(myElement.getProject()).findClass(CommonClassNames.JAVA_UTIL_COLLECTIONS, myElement.getResolveScope()); if (collectionsClass == null) return; - final PsiElement pparent = parent.getParent(); + PsiElement pparent = parent.getParent(); if (showAll || pparent instanceof PsiReturnStatement || pparent instanceof PsiConditionalExpression && pparent.getParent() instanceof PsiReturnStatement) { - addCollectionMethod(JAVA_UTIL_LIST, "emptyList", collectionsClass); - addCollectionMethod(JAVA_UTIL_SET, "emptySet", collectionsClass); - addCollectionMethod(JAVA_UTIL_MAP, "emptyMap", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_LIST, "emptyList", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_SET, "emptySet", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_MAP, "emptyMap", collectionsClass); } if (showAll) { - addCollectionMethod(JAVA_UTIL_LIST, "singletonList", collectionsClass); - addCollectionMethod(JAVA_UTIL_SET, "singleton", collectionsClass); - addCollectionMethod(JAVA_UTIL_MAP, "singletonMap", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_LIST, "singletonList", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_SET, "singleton", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_MAP, "singletonMap", collectionsClass); - addCollectionMethod(JAVA_UTIL_COLLECTION, "unmodifiableCollection", collectionsClass); - addCollectionMethod(JAVA_UTIL_LIST, "unmodifiableList", collectionsClass); - addCollectionMethod(JAVA_UTIL_SET, "unmodifiableSet", collectionsClass); - addCollectionMethod(JAVA_UTIL_MAP, "unmodifiableMap", collectionsClass); - addCollectionMethod(JAVA_UTIL_SORTED_SET, "unmodifiableSortedSet", collectionsClass); - addCollectionMethod(JAVA_UTIL_SORTED_MAP, "unmodifiableSortedMap", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_COLLECTION, "unmodifiableCollection", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_LIST, "unmodifiableList", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_SET, "unmodifiableSet", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_MAP, "unmodifiableMap", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_SORTED_SET, "unmodifiableSortedSet", collectionsClass); + addCollectionMethod(CommonClassNames.JAVA_UTIL_SORTED_MAP, "unmodifiableSortedMap", collectionsClass); } } - private void addCollectionMethod(final String baseClassName, - @NonNls final String method, @Nonnull final PsiClass collectionsClass) { - if (isClassType(myExpectedType, baseClassName) || isClassType(myExpectedType, JAVA_UTIL_COLLECTION)) { + private void addCollectionMethod(String baseClassName, + String method, @Nonnull PsiClass collectionsClass) { + if (isClassType(myExpectedType, baseClassName) || isClassType(myExpectedType, CommonClassNames.JAVA_UTIL_COLLECTION)) { addMethodItem(myExpectedType, method, collectionsClass); - } else if (isClassType(myDefaultType, baseClassName) || isClassType(myDefaultType, JAVA_UTIL_COLLECTION)) { + } else if (isClassType(myDefaultType, baseClassName) || isClassType(myDefaultType, CommonClassNames.JAVA_UTIL_COLLECTION)) { addMethodItem(myDefaultType, method, collectionsClass); } } private void addMethodItem(PsiType expectedType, String methodName, PsiClass containingClass) { - final PsiMethod[] methods = containingClass.findMethodsByName(methodName, false); + PsiMethod[] methods = containingClass.findMethodsByName(methodName, false); if (methods.length == 0) { return; } - final PsiMethod method = methods[0]; - final JavaMethodCallElement item = new JavaMethodCallElement(method, false, false); + PsiMethod method = methods[0]; + JavaMethodCallElement item = new JavaMethodCallElement(method, false, false); item.setAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE); item.setInferenceSubstitutor(SmartCompletionDecorator.calculateMethodReturnTypeSubstitutor(method, expectedType), myElement); item.putUserData(COLLECTION_FACTORY, true); myResult.accept(item); } - private static boolean isClassType(final PsiType type, final String className) { + private static boolean isClassType(PsiType type, String className) { if (type instanceof PsiClassType) { - final PsiClass psiClass = ((PsiClassType)type).resolve(); + PsiClass psiClass = ((PsiClassType)type).resolve(); return psiClass != null && className.equals(psiClass.getQualifiedName()); } return false; 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 df38369fe..401e5f59d 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 @@ -38,7 +38,6 @@ import consulo.document.Document; import consulo.document.util.TextRange; import consulo.java.language.impl.icon.JavaPsiImplIconGroup; -import consulo.java.language.module.util.JavaClassNames; import consulo.java.localize.JavaLocalize; import consulo.language.Language; import consulo.language.editor.DaemonCodeAnalyzerSettings; 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 171f768ec..bb1491a7d 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 @@ -15,24 +15,22 @@ */ package com.intellij.java.impl.codeInspection; -import consulo.language.editor.intention.HighPriorityAction; -import consulo.language.editor.inspection.LocalQuickFix; -import consulo.language.editor.inspection.ProblemDescriptor; import com.intellij.java.analysis.impl.codeInspection.LambdaCanBeMethodReferenceInspection; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; import com.intellij.java.language.psi.codeStyle.VariableKind; import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.project.Project; -import consulo.language.psi.PsiElement; +import com.siyeh.ig.psiutils.StreamApiUtil; +import consulo.java.analysis.impl.codeInsight.JavaInspectionsBundle; +import consulo.language.editor.inspection.LocalQuickFix; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.editor.intention.HighPriorityAction; import consulo.language.editor.refactoring.rename.SuggestedNameInfo; +import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; +import consulo.project.Project; import consulo.util.collection.ArrayUtil; -import com.siyeh.ig.psiutils.StreamApiUtil; -import consulo.java.analysis.impl.codeInsight.JavaInspectionsBundle; -import consulo.java.language.module.util.JavaClassNames; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java index 6e5b85753..3cda4e517 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java @@ -20,7 +20,6 @@ import com.intellij.java.impl.ig.psiutils.LibraryUtil; import com.intellij.java.language.codeInsight.AnnotationUtil; import com.intellij.java.language.psi.*; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; @@ -29,9 +28,8 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.CheckBox; -import consulo.java.language.module.util.JavaClassNames; - import jakarta.annotation.Nonnull; + import javax.swing.*; import java.awt.*; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java index 61e3b6d71..90f5e0081 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java @@ -29,7 +29,6 @@ import consulo.deadCodeNotWorking.impl.CheckBox; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java index 6cdad9b5b..a76284597 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java @@ -27,7 +27,6 @@ import consulo.annotation.component.ExtensionImpl; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; -import consulo.java.language.module.util.JavaClassNames; import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java index bc3eba58a..91c47f3f3 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; 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 b21ea7ddd..ea379c021 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 @@ -16,15 +16,12 @@ 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; import com.intellij.java.language.psi.PsiField; import com.intellij.java.language.psi.PsiType; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; - +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; import jakarta.annotation.Nonnull; @ExtensionImpl diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/BooleanConstructorInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/BooleanConstructorInspection.java index ca79bb0f6..e59c7d66a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/BooleanConstructorInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/BooleanConstructorInspection.java @@ -25,7 +25,6 @@ import com.siyeh.ig.psiutils.ParenthesesUtils; 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; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/BoxingBoxedValueInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/BoxingBoxedValueInspection.java index bc42b2a0a..b298b6687 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/BoxingBoxedValueInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/BoxingBoxedValueInspection.java @@ -15,23 +15,21 @@ */ package com.intellij.java.impl.ig.performance; -import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; import com.intellij.java.language.psi.*; -import consulo.project.Project; -import consulo.language.psi.*; -import consulo.language.psi.util.PsiTreeUtil; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.language.util.IncorrectOperationException; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import consulo.java.language.module.util.JavaClassNames; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nonnull; import java.util.HashMap; import java.util.Map; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionContainsUrlInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionContainsUrlInspection.java index a8a35619d..764f2e757 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionContainsUrlInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionContainsUrlInspection.java @@ -20,7 +20,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; import jakarta.annotation.Nonnull; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java index 3c82d42fc..21f26bea8 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java @@ -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.localize.LocalizeValue; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ComparatorNotSerializableInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ComparatorNotSerializableInspection.java index b3f80874b..9ee559b32 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ComparatorNotSerializableInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ComparatorNotSerializableInspection.java @@ -26,7 +26,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; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/EqualsCalledOnEnumConstantInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/EqualsCalledOnEnumConstantInspection.java index 837f5d1e7..bead2e877 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/EqualsCalledOnEnumConstantInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/EqualsCalledOnEnumConstantInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java index f9b7aa559..46d6b9876 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java @@ -24,7 +24,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/adapter/AdapterToListenerIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/adapter/AdapterToListenerIntention.java index 949118689..227fadb1b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/adapter/AdapterToListenerIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/adapter/AdapterToListenerIntention.java @@ -23,14 +23,13 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.IntentionPowerPackBundle; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleSettingsManager; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; - import jakarta.annotation.Nonnull; + import java.util.ArrayList; import java.util.List; diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java index 01c08f36b..1fad5f4aa 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java @@ -18,15 +18,14 @@ import com.intellij.java.impl.ipp.base.Intention; import com.intellij.java.impl.ipp.base.PsiElementPredicate; import com.intellij.java.impl.ipp.psiutils.ConcatenationUtils; -import com.intellij.java.language.psi.util.PsiConcatenationUtil; import com.intellij.java.language.psi.*; +import com.intellij.java.language.psi.util.PsiConcatenationUtil; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; - import jakarta.annotation.Nonnull; + import java.util.ArrayList; import java.util.List; diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java index 2f9f27b10..4507fd2d0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java @@ -18,10 +18,7 @@ import com.intellij.java.impl.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceProvider; import com.intellij.java.language.JavaLanguage; import com.intellij.java.language.patterns.PsiJavaElementPattern; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiLiteral; -import com.intellij.java.language.psi.PsiLiteralExpression; -import com.intellij.java.language.psi.PsiReferenceExpression; +import com.intellij.java.language.psi.*; import consulo.annotation.component.ExtensionImpl; import consulo.language.Language; import consulo.language.pattern.ElementPattern; @@ -30,14 +27,12 @@ import consulo.language.psi.PsiReferenceContributor; import consulo.language.psi.PsiReferenceRegistrar; import consulo.language.util.ProcessingContext; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import static com.intellij.java.analysis.impl.psi.impl.source.resolve.reference.impl.JavaReflectionReferenceUtil.*; import static com.intellij.java.language.patterns.PsiJavaPatterns.psiLiteral; import static com.intellij.java.language.patterns.PsiJavaPatterns.psiMethod; -import static consulo.java.language.module.util.JavaClassNames.JAVA_LANG_CLASS; import static consulo.language.pattern.StandardPatterns.or; /** @@ -46,9 +41,10 @@ @ExtensionImpl public class JavaReflectionReferenceContributor extends PsiReferenceContributor { public static final PsiJavaElementPattern.Capture PATTERN = psiLiteral().methodCallParameter(psiMethod().withName(GET_FIELD, GET_DECLARED_FIELD, GET_METHOD, GET_DECLARED_METHOD) - .definedInClass(JAVA_LANG_CLASS)); + .definedInClass(CommonClassNames.JAVA_LANG_CLASS)); - public static final PsiJavaElementPattern.Capture CLASS_PATTERN = psiLiteral().methodCallParameter(or(psiMethod().withName(FOR_NAME).definedInClass(JAVA_LANG_CLASS), psiMethod() + public static final PsiJavaElementPattern.Capture CLASS_PATTERN = psiLiteral().methodCallParameter(or(psiMethod().withName(FOR_NAME).definedInClass( + CommonClassNames.JAVA_LANG_CLASS), psiMethod() .withName(LOAD_CLASS).definedInClass(JAVA_LANG_CLASS_LOADER))); private static final ElementPattern METHOD_HANDLE_PATTERN = psiLiteral().methodCallParameter(1, psiMethod().withName(HANDLE_FACTORY_METHOD_NAMES).definedInClass diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/util/proximity/KnownElementWeigher.java b/plugin/src/main/java/com/intellij/java/impl/psi/util/proximity/KnownElementWeigher.java index 53a126c35..5ca54ff04 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/util/proximity/KnownElementWeigher.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/util/proximity/KnownElementWeigher.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.psi.util.proximity; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiField; import com.intellij.java.language.psi.PsiMethod; @@ -36,18 +37,26 @@ import java.util.List; import java.util.Set; -import static consulo.java.language.module.util.JavaClassNames.*; - /** * @author peter */ @ExtensionImpl(id = "knownElement", order = "after sameModule, before sdkOrLibrary") public class KnownElementWeigher extends ProximityWeigher { - private static final Set POPULAR_JDK_CLASSES = Set.of(JAVA_LANG_STRING, JAVA_LANG_CLASS, System.class.getName(), JAVA_LANG_RUNNABLE, JAVA_LANG_EXCEPTION, - JAVA_LANG_THROWABLE, JAVA_LANG_RUNTIME_EXCEPTION, JAVA_UTIL_ARRAY_LIST, JAVA_UTIL_HASH_MAP, JAVA_UTIL_HASH_SET); + private static final Set POPULAR_JDK_CLASSES = Set.of( + CommonClassNames.JAVA_LANG_STRING, + CommonClassNames.JAVA_LANG_CLASS, + System.class.getName(), + CommonClassNames.JAVA_LANG_RUNNABLE, + CommonClassNames.JAVA_LANG_EXCEPTION, + CommonClassNames.JAVA_LANG_THROWABLE, + CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, + CommonClassNames.JAVA_UTIL_ARRAY_LIST, + CommonClassNames.JAVA_UTIL_HASH_MAP, + CommonClassNames.JAVA_UTIL_HASH_SET + ); @Override - public Comparable weigh(@Nonnull final PsiElement element, @Nonnull final ProximityLocation location) { + public Comparable weigh(@Nonnull PsiElement element, @Nonnull ProximityLocation location) { Project project = location.getProject(); if (project == null) { return 0; @@ -66,15 +75,15 @@ public Comparable weigh(@Nonnull final PsiElement element, @Nonnull final Proxim return getJdkClassProximity((PsiClass) element); } if (element instanceof PsiMethod) { - final PsiMethod method = (PsiMethod) element; - final PsiClass containingClass = method.getContainingClass(); + PsiMethod method = (PsiMethod) element; + PsiClass containingClass = method.getContainingClass(); if (containingClass != null) { String methodName = method.getName(); if ("finalize".equals(methodName) || "registerNatives".equals(methodName) || methodName.startsWith("wait") || methodName.startsWith("notify")) { - if (JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { return -1; } } @@ -82,11 +91,11 @@ public Comparable weigh(@Nonnull final PsiElement element, @Nonnull final Proxim return -1; } if ("subSequence".equals(methodName)) { - if (JAVA_LANG_STRING.equals(containingClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_STRING.equals(containingClass.getQualifiedName())) { return -1; } } - if (JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { return 0; } return getJdkClassProximity(method.getContainingClass()); @@ -98,8 +107,8 @@ public Comparable weigh(@Nonnull final PsiElement element, @Nonnull final Proxim return 0; } - public static boolean isSdkElement(PsiElement element, @Nonnull final Project project) { - final VirtualFile file = PsiUtilCore.getVirtualFile(element); + public static boolean isSdkElement(PsiElement element, @Nonnull Project project) { + VirtualFile file = PsiUtilCore.getVirtualFile(element); if (file != null) { List orderEntries = ProjectRootManager.getInstance(project).getFileIndex().getOrderEntriesForFile(file); if (!orderEntries.isEmpty() && orderEntries.get(0) instanceof ModuleExtensionWithSdkOrderEntry) { @@ -112,7 +121,7 @@ public static boolean isSdkElement(PsiElement element, @Nonnull final Project pr @Nullable private static Integer getTestFrameworkWeight(@Nonnull PsiElement element, @Nonnull ProximityLocation location, @Nonnull Project project) { if (element instanceof PsiClass) { - final String qualifiedName = ((PsiClass) element).getQualifiedName(); + String qualifiedName = ((PsiClass) element).getQualifiedName(); if (qualifiedName != null) { if (qualifiedName.startsWith("org.testng.internal")) { return -1; @@ -135,10 +144,10 @@ private static Comparable getJdkClassProximity(@Nullable PsiClass element) { return 0; } - final String qname = element.getQualifiedName(); + String qname = element.getQualifiedName(); if (qname != null) { String pkg = StringUtil.getPackageName(qname); - if (qname.equals(JAVA_LANG_OBJECT)) { + if (qname.equals(CommonClassNames.JAVA_LANG_OBJECT)) { return 5; } if (POPULAR_JDK_CLASSES.contains(qname)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java index fe13f9719..2c767f2d1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java @@ -27,7 +27,6 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiManager; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.util.IncorrectOperationException; diff --git a/plugin/src/main/java/com/intellij/java/impl/util/xml/actions/CreateClassMappingAction.java b/plugin/src/main/java/com/intellij/java/impl/util/xml/actions/CreateClassMappingAction.java index d5f949eca..20a03e038 100644 --- a/plugin/src/main/java/com/intellij/java/impl/util/xml/actions/CreateClassMappingAction.java +++ b/plugin/src/main/java/com/intellij/java/impl/util/xml/actions/CreateClassMappingAction.java @@ -24,7 +24,6 @@ import com.intellij.java.language.util.TreeClassChooserFactory; import consulo.application.ApplicationManager; import consulo.codeEditor.Editor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.WriteCommandAction; import consulo.language.psi.PsiFile; import consulo.language.psi.scope.GlobalSearchScope; @@ -33,8 +32,8 @@ import consulo.xml.util.xml.DomElement; import consulo.xml.util.xml.actions.generate.DomTemplateRunner; import consulo.xml.util.xml.ui.actions.generate.CreateDomElementAction; - import jakarta.annotation.Nullable; + import java.util.HashMap; import java.util.Map; diff --git a/plugin/src/test/java_/com/intellij/codeInsight/template/MacroParserTest.java b/plugin/src/test/java_/com/intellij/codeInsight/template/MacroParserTest.java index b6ab42287..742b938a2 100644 --- a/plugin/src/test/java_/com/intellij/codeInsight/template/MacroParserTest.java +++ b/plugin/src/test/java_/com/intellij/codeInsight/template/MacroParserTest.java @@ -2,8 +2,8 @@ import com.intellij.codeInsight.template.impl.*; import com.intellij.java.impl.codeInsight.template.macro.VariableOfTypeMacro; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.testFramework.LightIdeaTestCase; -import consulo.java.language.module.util.JavaClassNames; /** * @author yole @@ -25,7 +25,7 @@ public void testFunction() { assertEquals(1, parameters.length); assertTrue(parameters [0] instanceof ConstantNode); ConstantNode cn = (ConstantNode) parameters [0]; - assertEquals(JavaClassNames.JAVA_UTIL_COLLECTION, cn.calculateResult(null).toString()); + assertEquals(CommonClassNames.JAVA_UTIL_COLLECTION, cn.calculateResult(null).toString()); } public void testVariable() { diff --git a/plugin/src/test/java_/com/intellij/psi/ConstantValuesTest.java b/plugin/src/test/java_/com/intellij/psi/ConstantValuesTest.java index b24698b92..31028cc36 100644 --- a/plugin/src/test/java_/com/intellij/psi/ConstantValuesTest.java +++ b/plugin/src/test/java_/com/intellij/psi/ConstantValuesTest.java @@ -1,23 +1,20 @@ package com.intellij.psi; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; - import com.intellij.JavaTestUtil; import com.intellij.java.language.impl.JavaFileType; +import com.intellij.java.language.impl.psi.impl.JavaConstantExpressionEvaluator; import com.intellij.java.language.psi.*; +import com.intellij.testFramework.PsiTestCase; +import com.intellij.testFramework.PsiTestUtil; import consulo.application.ApplicationManager; -import consulo.java.language.module.util.JavaClassNames; -import consulo.logging.Logger; import consulo.ide.impl.idea.openapi.roots.ModuleRootModificationUtil; -import consulo.virtualFileSystem.VirtualFile; -import com.intellij.java.language.impl.psi.impl.JavaConstantExpressionEvaluator; import consulo.language.psi.scope.GlobalSearchScope; -import com.intellij.testFramework.PsiTestCase; -import com.intellij.testFramework.PsiTestUtil; +import consulo.logging.Logger; +import consulo.virtualFileSystem.VirtualFile; + +import java.io.IOException; + +import static org.junit.Assert.*; public abstract class ConstantValuesTest extends PsiTestCase { diff --git a/plugin/src/test/java_/com/intellij/psi/Src15RepositoryUseTest.java b/plugin/src/test/java_/com/intellij/psi/Src15RepositoryUseTest.java index 9cd5ab870..ad0b017f9 100644 --- a/plugin/src/test/java_/com/intellij/psi/Src15RepositoryUseTest.java +++ b/plugin/src/test/java_/com/intellij/psi/Src15RepositoryUseTest.java @@ -15,32 +15,28 @@ */ package com.intellij.psi; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - -import com.intellij.java.language.psi.*; -import consulo.java.language.module.util.JavaClassNames; -import consulo.virtualFileSystem.VirtualFile; -import consulo.virtualFileSystem.VirtualFileFilter; -import consulo.language.psi.scope.GlobalSearchScope; -import com.intellij.java.indexing.search.searches.AnnotatedMembersSearch; import com.intellij.java.impl.psi.search.searches.AnnotatedPackagesSearch; +import com.intellij.java.indexing.search.searches.AnnotatedMembersSearch; import com.intellij.java.indexing.search.searches.ClassInheritorsSearch; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.TypeConversionUtil; import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PsiTestCase; import com.intellij.testFramework.PsiTestUtil; +import consulo.language.psi.scope.GlobalSearchScope; +import consulo.virtualFileSystem.VirtualFile; +import consulo.virtualFileSystem.VirtualFileFilter; import jakarta.annotation.Nonnull; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +import static org.junit.Assert.*; + /** * @author dsl */