diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/UnusedSymbolUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/UnusedSymbolUtil.java index a98ba95f19..1c7e4cf986 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/UnusedSymbolUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/UnusedSymbolUtil.java @@ -245,9 +245,10 @@ public static boolean processUsages( } // if we've resolved all references, find usages will be fast - PsiSearchHelper.SearchCostResult cheapEnough = RefResolveService.ENABLED && RefResolveService.getInstance - (project).isUpToDate() ? PsiSearchHelper.SearchCostResult.FEW_OCCURRENCES : searchHelper - .isCheapEnoughToSearch(name, (GlobalSearchScope)useScope, ignoreFile, progress); + PsiSearchHelper.SearchCostResult cheapEnough = + RefResolveService.ENABLED && RefResolveService.getInstance(project).isUpToDate() + ? PsiSearchHelper.SearchCostResult.FEW_OCCURRENCES + : searchHelper.isCheapEnoughToSearch(name, globalSearchScope, ignoreFile, progress); if (cheapEnough == TOO_MANY_OCCURRENCES) { log("* " + member.getName() + " too many usages; false"); return false; @@ -263,18 +264,11 @@ public static boolean processUsages( if (member instanceof PsiMethod) { String propertyName = PropertyUtil.getPropertyName(member); - if (propertyName != null) { - SearchScope fileScope = containingFile.getUseScope(); - if (fileScope instanceof GlobalSearchScope - && searchHelper.isCheapEnoughToSearch( - propertyName, - (GlobalSearchScope)fileScope, - ignoreFile, - progress - ) == TOO_MANY_OCCURRENCES) { - log("* " + member.getName() + " too many prop usages; false"); - return false; - } + if (propertyName != null + && containingFile.getUseScope() instanceof GlobalSearchScope fileScope + && searchHelper.isCheapEnoughToSearch(propertyName, fileScope, ignoreFile, progress) == TOO_MANY_OCCURRENCES) { + log("* " + member.getName() + " too many prop usages; false"); + return false; } } } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java index da9219588a..2b6fd679dd 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -1984,17 +1984,16 @@ else if (resolved != null) { return HighlightClassUtil.reportIllegalEnclosingUsage(expr, null, aClass, expr); } - if (expr instanceof PsiSuperExpression) { - PsiElement resolved = ((PsiReferenceExpression)expr.getParent()).resolve(); - //15.11.2 - //The form T.super.Identifier refers to the field named Identifier of the lexically enclosing instance corresponding to T, - //but with that instance viewed as an instance of the superclass of T. - if (resolved instanceof PsiField) { - return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) - .range(expr) - .descriptionAndTooltip(JavaErrorLocalize.isNotAnEnclosingClass(formatClass(aClass))) - .create(); - } + //15.11.2 + //The form T.super.Identifier refers to the field named Identifier of the lexically enclosing instance corresponding to T, + //but with that instance viewed as an instance of the superclass of T. + if (expr instanceof PsiSuperExpression + && expr.getParent() instanceof PsiReferenceExpression refExpr + && refExpr.resolve() instanceof PsiField) { + return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) + .range(expr) + .descriptionAndTooltip(JavaErrorLocalize.isNotAnEnclosingClass(formatClass(aClass))) + .create(); } } @@ -2157,7 +2156,7 @@ private static boolean isInstanceReference(@Nonnull PsiJavaCodeReferenceElement if (q != null) { return true; } - String qname = ((PsiJavaCodeReferenceElement)qualifier).getQualifiedName(); + String qname = codeReferenceElement.getQualifiedName(); return qname == null || !Character.isLowerCase(qname.charAt(0)); } @@ -2527,18 +2526,15 @@ public static Collection checkSwitchLabelValues(@Nonnull PsiSwitc LocalizeValue message = values.isEmpty() ? JavaErrorLocalize.switchExprEmpty() : JavaErrorLocalize.switchExprIncomplete(); - HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) + QuickFixFactory factory = QuickFixFactory.getInstance(); + HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(ObjectUtil.notNull(selectorExpression, switchBlock)) - .descriptionAndTooltip(message) - .create(); + .descriptionAndTooltip(message); if (!missingConstants.isEmpty()) { - QuickFixAction.registerQuickFixAction( - info, - QuickFixFactory.getInstance().createAddMissingEnumBranchesFix(switchBlock, missingConstants) - ); + hlBuilder.registerFix(factory.createAddMissingEnumBranchesFix(switchBlock, missingConstants)); } - QuickFixAction.registerQuickFixAction(info, QuickFixFactory.getInstance().createAddSwitchDefaultFix(switchBlock, null)); - results.add(info); + hlBuilder.registerFix(factory.createAddSwitchDefaultFix(switchBlock, null)); + results.add(hlBuilder.create()); } } @@ -3764,19 +3760,11 @@ private static IntentionAction getChangeParameterClassFix(PsiType lType, PsiType PsiClass lClass = PsiUtil.resolveClassInClassTypeOnly(lType); PsiClass rClass = PsiUtil.resolveClassInClassTypeOnly(rType); - if (rClass == null || lClass == null) { - return null; - } - if (rClass instanceof PsiAnonymousClass) { - return null; - } - if (rClass.isInheritor(lClass, true)) { - return null; - } - if (lClass.isInheritor(rClass, true)) { - return null; - } - if (lClass == rClass) { + if (rClass == null || lClass == null + || rClass instanceof PsiAnonymousClass + || rClass.isInheritor(lClass, true) + || lClass.isInheritor(rClass, true) + || lClass == rClass) { return null; } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/find/findUsages/JavaFindUsagesHelper.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/find/findUsages/JavaFindUsagesHelper.java index afc23669b9..8d76eaea4a 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/find/findUsages/JavaFindUsagesHelper.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/find/findUsages/JavaFindUsagesHelper.java @@ -611,12 +611,12 @@ private static boolean addResult( @RequiredReadAction private static boolean filterUsage(PsiElement usage, @Nonnull FindUsagesOptions options) { - if (!(usage instanceof PsiJavaCodeReferenceElement)) { + if (!(usage instanceof PsiJavaCodeReferenceElement javaCodeRef)) { return true; } if (options instanceof JavaPackageFindUsagesOptions packageOptions && !packageOptions.isIncludeSubpackages - && ((PsiReference)usage).resolve() instanceof PsiPackage + && javaCodeRef.resolve() instanceof PsiPackage && usage.getParent() instanceof PsiJavaCodeReferenceElement codeRef && codeRef.resolve() instanceof PsiPackage) { return false; diff --git a/java-coverage-impl/src/main/java/com/intellij/java/coverage/JavaCoverageEngine.java b/java-coverage-impl/src/main/java/com/intellij/java/coverage/JavaCoverageEngine.java index eafd06172a..2f9b82f60f 100644 --- a/java-coverage-impl/src/main/java/com/intellij/java/coverage/JavaCoverageEngine.java +++ b/java-coverage-impl/src/main/java/com/intellij/java/coverage/JavaCoverageEngine.java @@ -29,7 +29,6 @@ import consulo.language.psi.PsiPackage; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.psi.util.PsiTreeUtil; -import consulo.language.util.ModuleUtilCore; import consulo.logging.Logger; import consulo.module.Module; import consulo.module.content.ModuleRootManager; @@ -155,7 +154,7 @@ public boolean coverageEditorHighlightingApplicableTo(@Nonnull PsiFile psiFile) return false; } // let's show coverage only for module files - Module module = psiFile.getApplication().runReadAction((Supplier)() -> ModuleUtilCore.findModuleForPsiElement(psiFile)); + Module module = psiFile.getApplication().runReadAction((Supplier)psiFile::getModule); return module != null; } diff --git a/java-debugger-api/src/main/java/com/intellij/java/debugger/engine/DebuggerUtils.java b/java-debugger-api/src/main/java/com/intellij/java/debugger/engine/DebuggerUtils.java index 9156797e2f..8d884bcfed 100644 --- a/java-debugger-api/src/main/java/com/intellij/java/debugger/engine/DebuggerUtils.java +++ b/java-debugger-api/src/main/java/com/intellij/java/debugger/engine/DebuggerUtils.java @@ -72,8 +72,8 @@ public static String getValueAsString(EvaluationContext evaluationContext, Value if (value == null) { return "null"; } - if (value instanceof StringReference) { - return ((StringReference)value).value(); + if (value instanceof StringReference stringRef) { + return stringRef.value(); } if (isInteger(value)) { long v = ((PrimitiveValue)value).longValue(); @@ -83,19 +83,19 @@ public static String getValueAsString(EvaluationContext evaluationContext, Value double v = ((PrimitiveValue)value).doubleValue(); return String.valueOf(v); } - if (value instanceof BooleanValue) { - boolean v = ((PrimitiveValue)value).booleanValue(); + if (value instanceof BooleanValue booleanValue) { + boolean v = booleanValue.booleanValue(); return String.valueOf(v); } - if (value instanceof CharValue) { - char v = ((PrimitiveValue)value).charValue(); + if (value instanceof CharValue charValue) { + char v = charValue.charValue(); return String.valueOf(v); } - if (value instanceof ObjectReference) { - if (value instanceof ArrayReference) { + if (value instanceof ObjectReference objRef) { + if (objRef instanceof ArrayReference arrayRef) { StringBuilder builder = new StringBuilder(); builder.append("["); - for (Iterator iterator = ((ArrayReference)value).getValues().iterator(); iterator.hasNext(); ) { + for (Iterator iterator = arrayRef.getValues().iterator(); iterator.hasNext(); ) { Value element = iterator.next(); builder.append(getValueAsString(evaluationContext, element)); if (iterator.hasNext()) { @@ -106,7 +106,6 @@ public static String getValueAsString(EvaluationContext evaluationContext, Value return builder.toString(); } - ObjectReference objRef = (ObjectReference)value; DebugProcess debugProcess = evaluationContext.getDebugProcess(); Method toStringMethod = debugProcess.getUserData(TO_STRING_METHOD_KEY); if (toStringMethod == null) { @@ -133,7 +132,7 @@ public static String getValueAsString(EvaluationContext evaluationContext, Value if (result == null) { return "null"; } - return result instanceof StringReference ? ((StringReference)result).value() : result.toString(); + return result instanceof StringReference stringRef ? stringRef.value() : result.toString(); } throw EvaluateExceptionUtil.createEvaluateException(JavaDebuggerLocalize.evaluationErrorUnsupportedExpressionType()); } @@ -170,8 +169,8 @@ public static Method findMethod(@Nonnull ReferenceType refType, String methodNam Method method = null; if (methodSignature != null) { - if (refType instanceof ClassType) { - method = ((ClassType)refType).concreteMethodByName(methodName, methodSignature); + if (refType instanceof ClassType classType) { + method = classType.concreteMethodByName(methodName, methodSignature); } if (method == null) { List methods = refType.methodsByName(methodName, methodSignature); @@ -193,16 +192,12 @@ public static Method findMethod(@Nonnull ReferenceType refType, String methodNam } public static boolean isNumeric(Value value) { - return value != null && (isInteger(value) || - value instanceof FloatValue || - value instanceof DoubleValue); + return value != null && (isInteger(value) || value instanceof FloatValue || value instanceof DoubleValue); } public static boolean isInteger(Value value) { - return value != null && (value instanceof ByteValue || - value instanceof ShortValue || - value instanceof LongValue || - value instanceof IntegerValue); + return value != null + && (value instanceof ByteValue || value instanceof ShortValue || value instanceof LongValue || value instanceof IntegerValue); } public static String translateStringValue(String str) { diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java index 215e8b5b7b..c001dc9a8f 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java @@ -657,8 +657,8 @@ public void contextAction() throws Exception { boolean sourceMissing = foundFile instanceof PsiCompiledElement; for (Pair eventDescriptor : eventDescriptors) { Breakpoint breakpoint = eventDescriptor.getFirst(); - if (breakpoint instanceof LineBreakpoint) { - SourcePosition breakpointPosition = ((BreakpointWithHighlighter)breakpoint).getSourcePosition(); + if (breakpoint instanceof LineBreakpoint lineBreakpoint) { + SourcePosition breakpointPosition = lineBreakpoint.getSourcePosition(); if (breakpointPosition == null || (!sourceMissing && breakpointPosition.getLine() != position.getLine())) { requestsManager.deleteRequest(breakpoint); requestsManager.setInvalid(breakpoint, JavaDebuggerLocalize.errorInvalidBreakpointSourceChanged().get()); diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java index 27bfcc0114..c17c679f10 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java @@ -1088,15 +1088,15 @@ private E invokeMethodAndFork(SuspendContextImpl context) if (lastIndex >= 0 && myArgs.size() > lastIndex) { // at least one varargs param Object firstVararg = myArgs.get(lastIndex); if (myArgs.size() == lastIndex + 1) { // only one vararg param - if (firstVararg instanceof ArrayReference arrayRef) { - if (((ArrayType)arrayRef.referenceType()).componentType() instanceof InterfaceType) { - List argTypes = myMethod.argumentTypeNames(); - if (argTypes.size() > lastIndex - && argTypes.get(lastIndex).startsWith(JavaClassNames.JAVA_LANG_OBJECT)) { - // unwrap array of interfaces for vararg param - myArgs.remove(lastIndex); - myArgs.addAll(arrayRef.getValues()); - } + if (firstVararg instanceof ArrayReference arrayRef + && arrayRef.referenceType() instanceof ArrayType arrayType + && arrayType.componentType() instanceof InterfaceType) { + List argTypes = myMethod.argumentTypeNames(); + if (argTypes.size() > lastIndex + && argTypes.get(lastIndex).startsWith(JavaClassNames.JAVA_LANG_OBJECT)) { + // unwrap array of interfaces for vararg param + myArgs.remove(lastIndex); + myArgs.addAll(arrayRef.getValues()); } } } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaStackFrame.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaStackFrame.java index 32a4747432..2f27784d35 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaStackFrame.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaStackFrame.java @@ -240,8 +240,8 @@ else if (location != null) { Set exceptions = new HashSet<>(); for (Pair pair : DebuggerUtilsEx.getEventDescriptors(debuggerContext.getSuspendContext())) { Event debugEvent = pair.getSecond(); - if (debugEvent instanceof ExceptionEvent) { - ObjectReference exception = ((ExceptionEvent)debugEvent).exception(); + if (debugEvent instanceof ExceptionEvent exceptionEvent) { + ObjectReference exception = exceptionEvent.exception(); if (exception != null) { exceptions.add(exception); } @@ -523,8 +523,8 @@ public void visitReferenceExpression(PsiReferenceExpression reference) { if (var instanceof PsiField field) { if (myCollectExpressions && !DebuggerUtils.hasSideEffectsOrReferencesMissingVars(reference, myVisibleLocals)) { /* - if (var instanceof PsiEnumConstant && reference.getQualifier() == null) { - PsiClass enumClass = ((PsiEnumConstant)var).getContainingClass(); + if (var instanceof PsiEnumConstant enumConst && reference.getQualifier() == null) { + PsiClass enumClass = enumConst.getContainingClass(); if (enumClass != null) { PsiExpression expression = JavaPsiFacade.getInstance(var.getProject()).getParserFacade() .createExpressionFromText(enumClass.getName() + "." + var.getName(), var); diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java index 5ff26441ff..898ca71e29 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java @@ -564,7 +564,7 @@ public ListObjectRenderer(NodeRendererSettings rendererSettings) { @Override public PsiElement getChildValueExpression(DebuggerTreeNode node, DebuggerContext context) throws EvaluateException { - LOG.assertTrue(node.getDescriptor() instanceof ArrayElementDescriptorImpl); + LOG.assertTrue(node.getDescriptor() instanceof ArrayElementDescriptorImpl arrayElementDescriptor); try { return getChildValueExpression( "this.get(" + ((ArrayElementDescriptorImpl)node.getDescriptor()).getIndex() + ")", diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateMembersUtil.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateMembersUtil.java index 45f2e7700f..ba2dff8c6f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateMembersUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateMembersUtil.java @@ -489,16 +489,12 @@ public void visitReferenceElement(@Nonnull PsiJavaCodeReferenceElement reference } private static PsiClassType toClassType(PsiType type) { - if (type instanceof PsiClassType) { - return (PsiClassType)type; - } - if (type instanceof PsiCapturedWildcardType) { - return toClassType(((PsiCapturedWildcardType)type).getUpperBound()); - } - if (type instanceof PsiWildcardType) { - return toClassType(((PsiWildcardType)type).getBound()); - } - return null; + return switch (type) { + case PsiClassType classType -> classType; + case PsiCapturedWildcardType capturedWildcardType -> toClassType(capturedWildcardType.getUpperBound()); + case PsiWildcardType wildcardType -> toClassType(wildcardType.getBound()); + default -> null; + }; } @RequiredWriteAction @@ -534,8 +530,8 @@ public static PsiParameter[] overriddenParameters( PsiParameter parameter = parameters[i]; PsiType parameterType = parameter.getType(); PsiElement declarationScope = parameter.getDeclarationScope(); - PsiType substituted = declarationScope instanceof PsiTypeParameterListOwner - ? substituteType(substitutor, parameterType, (PsiTypeParameterListOwner)declarationScope, parameter.getModifierList()) + PsiType substituted = declarationScope instanceof PsiTypeParameterListOwner typeParameterListOwner + ? substituteType(substitutor, parameterType, typeParameterListOwner, parameter.getModifierList()) : parameterType; String paramName = parameter.getName(); boolean isBaseNameGenerated = true; @@ -585,8 +581,8 @@ private static void substituteThrows( @RequiredReadAction private static void copyDocComment(PsiMethod source, PsiMethod target, JVMElementFactory factory) { PsiElement navigationElement = source.getNavigationElement(); - if (navigationElement instanceof PsiDocCommentOwner) { - PsiDocComment docComment = ((PsiDocCommentOwner)navigationElement).getDocComment(); + if (navigationElement instanceof PsiDocCommentOwner docCommentOwner) { + PsiDocComment docComment = docCommentOwner.getDocComment(); if (docComment != null) { target.addAfter(factory.createDocCommentFromText(docComment.getText()), null); } @@ -787,7 +783,7 @@ public static String suggestGetterName(PsiField field) { public static String suggestGetterName(String name, PsiType type, Project project) { return suggestGetterName(JavaPsiFacade.getElementFactory(project).createField( name, - type instanceof PsiEllipsisType ? ((PsiEllipsisType)type).toArrayType() : type + type instanceof PsiEllipsisType ellipsisType ? ellipsisType.toArrayType() : type )); } @@ -799,7 +795,7 @@ public static String suggestSetterName(PsiField field) { public static String suggestSetterName(String name, PsiType type, Project project) { return suggestSetterName(JavaPsiFacade.getElementFactory(project).createField( name, - type instanceof PsiEllipsisType ? ((PsiEllipsisType)type).toArrayType() : type + type instanceof PsiEllipsisType ellipsisType ? ellipsisType.toArrayType() : type )); } @@ -889,7 +885,7 @@ public static PsiMethod setVisibility(PsiMember member, PsiMethod prototype) { @PsiModifier.ModifierConstant String newVisibility; if (VisibilityUtil.ESCALATE_VISIBILITY.equals(visibility)) { - PsiClass aClass = member instanceof PsiClass ? (PsiClass)member : member.getContainingClass(); + PsiClass aClass = member instanceof PsiClass psiClass ? psiClass : member.getContainingClass(); newVisibility = PsiUtil.getMaximumModifierForMember(aClass, false); } else { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceParameter/IntroduceParameterProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceParameter/IntroduceParameterProcessor.java index c57f963228..6daaab0353 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceParameter/IntroduceParameterProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceParameter/IntroduceParameterProcessor.java @@ -176,13 +176,13 @@ protected UsageInfo[] findUsages() { for (PsiReference ref1 : refs) { PsiElement ref = ref1.getElement(); - if (ref instanceof PsiMethod && ((PsiMethod)ref).isConstructor()) { + if (ref instanceof PsiMethod method && method.isConstructor()) { DefaultConstructorImplicitUsageInfo implicitUsageInfo = - new DefaultConstructorImplicitUsageInfo((PsiMethod)ref, ((PsiMethod)ref).getContainingClass(), myMethodToSearchFor); + new DefaultConstructorImplicitUsageInfo(method, method.getContainingClass(), myMethodToSearchFor); result.add(implicitUsageInfo); } - else if (ref instanceof PsiClass) { - result.add(new NoConstructorClassUsageInfo((PsiClass)ref)); + else if (ref instanceof PsiClass psiClass) { + result.add(new NoConstructorClassUsageInfo(psiClass)); } else if (!IntroduceParameterUtil.insideMethodToBeReplaced(ref, myMethodToReplaceIn)) { result.add(new ExternalUsageInfo(ref)); @@ -288,6 +288,7 @@ protected boolean preprocessUsages(SimpleReference refUsages) { return showConflicts(conflicts, usagesIn); } + @RequiredReadAction private void detectAccessibilityConflicts(UsageInfo[] usageArray, MultiMap conflicts) { if (myParameterInitializer != null) { ReferencedElementsCollector collector = new ReferencedElementsCollector(); @@ -311,10 +312,11 @@ private void detectAccessibilityConflicts(UsageInfo[] usageArray, MultiMap { - if (element instanceof PsiMember) { - PsiMember member = (PsiMember)element; - if (VisibilityUtil.getVisibilityModifier(member.getModifierList()) == PsiModifier.PACKAGE_LOCAL) { - return true; - } - } - return false; - } + element -> element instanceof PsiMember member + && VisibilityUtil.getVisibilityModifier(member.getModifierList()) == PsiModifier.PACKAGE_LOCAL ); } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java index 7ebdd5f268..d5c5880631 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java @@ -154,11 +154,11 @@ else if (element instanceof PsiClass aClass) { return null; } if (isClassInnerOrLocal(aClass)) { - String message = - RefactoringBundle.getCannotRefactorMessage(RefactoringLocalize.movingLocalClassesIsNotSupported().get()); CommonRefactoringUtil.showErrorMessage( RefactoringLocalize.moveTitle().get(), - message, + RefactoringLocalize.cannotPerformRefactoringWithReason( + RefactoringLocalize.movingLocalClassesIsNotSupported() + ).get(), HelpID.getMoveHelpID(element), project ); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java index cc66ed8148..999c064c52 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java @@ -107,19 +107,15 @@ public static void findNonCodeUsages( } private static String getStringToSearch(PsiElement element) { - if (element instanceof PsiJavaPackage) { - return ((PsiJavaPackage)element).getQualifiedName(); - } - else if (element instanceof PsiClass) { - return ((PsiClass)element).getQualifiedName(); - } - else if (element instanceof PsiDirectory) { - return getStringToSearch(JavaDirectoryService.getInstance().getPackage((PsiDirectory)element)); - } - else { - LOG.error("Unknown element type"); - return null; - } + return switch (element) { + case PsiJavaPackage javaPackage -> javaPackage.getQualifiedName(); + case PsiClass psiClass -> psiClass.getQualifiedName(); + case PsiDirectory directory -> getStringToSearch(JavaDirectoryService.getInstance().getPackage(directory)); + default -> { + LOG.error("Unknown element type"); + yield null; + } + }; } // Does not process non-code usages! diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenameAliasingPomTargetProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenameAliasingPomTargetProcessor.java index 4136b61e4b..738e02981d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenameAliasingPomTargetProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenameAliasingPomTargetProcessor.java @@ -18,7 +18,6 @@ import com.intellij.java.language.psi.targets.AliasingPsiTarget; import com.intellij.java.language.psi.targets.AliasingPsiTargetMapper; import consulo.annotation.component.ExtensionImpl; -import consulo.component.extension.Extensions; import consulo.language.editor.refactoring.rename.RenamePsiElementProcessor; import consulo.language.pom.PomService; import consulo.language.pom.PomTarget; @@ -30,7 +29,6 @@ @ExtensionImpl public class RenameAliasingPomTargetProcessor extends RenamePsiElementProcessor { - @Override public boolean canProcessElement(@Nonnull PsiElement element) { return element instanceof PomTarget || element instanceof PomTargetPsiElement; @@ -39,15 +37,15 @@ public boolean canProcessElement(@Nonnull PsiElement element) { @Override public void prepareRenaming(PsiElement element, String newName, Map allRenames) { PomTarget target = null; - if (element instanceof PomTargetPsiElement) { - target = ((PomTargetPsiElement)element).getTarget(); + if (element instanceof PomTargetPsiElement targetPsiElement) { + target = targetPsiElement.getTarget(); } - else if (element instanceof PomTarget) { - target = (PomTarget)element; + else if (element instanceof PomTarget pomTarget) { + target = pomTarget; } if (target != null) { - for (AliasingPsiTargetMapper mapper : Extensions.getExtensions(AliasingPsiTargetMapper.EP_NAME)) { + for (AliasingPsiTargetMapper mapper : AliasingPsiTargetMapper.EP_NAME.getExtensions()) { for (AliasingPsiTarget psiTarget : mapper.getTargets(target)) { PsiElement psiElement = PomService.convertToPsi(psiTarget); String name = psiTarget.getNameAlias(newName);