From 857b7490ada572b07c7e1606a4b4903e1541de8f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 Oct 2012 10:20:10 +0200 Subject: [PATCH] Drop obsolete methods from PsiUtil --- .../daemon/impl/analysis/HighlightMethodUtil.java | 2 +- .../daemon/impl/analysis/HighlightUtil.java | 4 ++-- .../generation/OverrideImplementUtil.java | 4 ++-- .../refactoring/memberPullUp/PullUpHelper.java | 2 +- .../memberPushDown/PushDownProcessor.java | 3 ++- .../intellij/refactoring/util/RefactoringUtil.java | 3 +-- .../src/com/intellij/psi/LambdaUtil.java | 2 +- .../src/com/intellij/psi/util/PsiUtil.java | 13 ------------- .../psi/impl/source/PsiModifierListImpl.java | 3 +-- .../ConvertInterfaceToClassIntention.java | 4 ++-- 10 files changed, 13 insertions(+), 27 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java index 1632dbc5f8cd..f4ec240b7f2d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java @@ -851,7 +851,7 @@ public class HighlightMethodUtil { if (method.getBody() == null) return null; PsiClass aClass = method.getContainingClass(); boolean isInterface = aClass != null && aClass.isInterface(); - boolean isExtension = PsiUtil.isExtensionMethod(method); + boolean isExtension = method.isExtensionMethod(); String message = null; if (isInterface) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 174b2b4d9efb..81eb619e0d43 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -237,7 +237,7 @@ public class HighlightUtil { } else if (PsiModifier.ABSTRACT.equals(incompatible)) { final PsiElement owner = modifierList.getParent(); - if (owner instanceof PsiMethod && PsiUtil.isExtensionMethod((PsiMethod)owner)) { + if (owner instanceof PsiMethod && ((PsiMethod)owner).isExtensionMethod()) { return incompatible; } } @@ -1363,7 +1363,7 @@ public class HighlightUtil { if (PsiUtil.isLanguageLevel8OrHigher(expr)) { final PsiMethod method = PsiTreeUtil.getParentOfType(expr, PsiMethod.class); - if (PsiUtil.isExtensionMethod(method) && qualifier == null) { + if (method != null && method.isExtensionMethod() && qualifier == null) { //todo[r.sh] "Add qualifier" quick fix return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, parent, JavaErrorMessages.message("unqualified.super.disallowed")); } diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java index 7225079c2220..cdc2879e4a24 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java @@ -452,7 +452,7 @@ public class OverrideImplementUtil { } public static void setupMethodBody(PsiMethod result, PsiMethod originalMethod, PsiClass targetClass) throws IncorrectOperationException { - boolean isAbstract = originalMethod.hasModifierProperty(PsiModifier.ABSTRACT) || PsiUtil.isExtensionMethod(originalMethod); + boolean isAbstract = originalMethod.hasModifierProperty(PsiModifier.ABSTRACT) || originalMethod.isExtensionMethod(); String templateName = isAbstract ? JavaTemplateUtil.TEMPLATE_IMPLEMENTED_METHOD_BODY : JavaTemplateUtil.TEMPLATE_OVERRIDDEN_METHOD_BODY; FileTemplate template = FileTemplateManager.getInstance().getCodeTemplate(templateName); setupMethodBody(result, originalMethod, targetClass, template); @@ -535,7 +535,7 @@ public class OverrideImplementUtil { for (Iterator iterator = candidates.iterator(); iterator.hasNext(); ) { CandidateInfo candidate = iterator.next(); PsiElement element = candidate.getElement(); - if (element instanceof PsiMethod && PsiUtil.isExtensionMethod((PsiMethod)element)) { + if (element instanceof PsiMethod && ((PsiMethod)element).isExtensionMethod()) { iterator.remove(); secondary.add(candidate); } diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java index 00bb80e15cd1..9e31634f3014 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java @@ -222,7 +222,7 @@ public class PullUpHelper extends BaseRefactoringProcessor{ if (method.findDeepestSuperMethods().length == 0) { deleteOverrideAnnotationIfFound(methodCopy); } - final boolean isOriginalMethodAbstract = method.hasModifierProperty(PsiModifier.ABSTRACT) || PsiUtil.isExtensionMethod(method); + final boolean isOriginalMethodAbstract = method.hasModifierProperty(PsiModifier.ABSTRACT) || method.isExtensionMethod(); if (myIsTargetInterface || info.isToAbstract()) { ChangeContextUtil.clearContextInfo(method); RefactoringUtil.makeMethodAbstract(myTargetSuperClass, methodCopy); diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java index 35f87a9f8fc1..3caccc89dfbb 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java @@ -27,6 +27,7 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Ref; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; +import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.psi.search.searches.ReferencesSearch; @@ -365,7 +366,7 @@ public class PushDownProcessor extends BaseRefactoringProcessor { if (wasInterface) { if (!targetClass.isInterface()) { PsiUtil.setModifierProperty(newMember, PsiModifier.PUBLIC, true); - final PsiJavaToken extMethodMarker = PsiUtil.findExtensionMethodMarker((PsiMethod)newMember); + final PsiJavaToken extMethodMarker = PsiImplUtil.findExtensionMethodMarker((PsiMethod)newMember); if (extMethodMarker == null) { PsiUtil.setModifierProperty(newMember, PsiModifier.ABSTRACT, true); } diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java index 21c0dc3a5ff6..eeb10f3164e3 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java @@ -803,8 +803,7 @@ public class RefactoringUtil { } public static void makeMethodAbstract(@NotNull PsiClass targetClass, @NotNull PsiMethod method) throws IncorrectOperationException { - final boolean isExtension = PsiUtil.isExtensionMethod(method); - if (!isExtension) { + if (!method.isExtensionMethod()) { PsiCodeBlock body = method.getBody(); if (body != null) { body.delete(); diff --git a/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java b/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java index fd9475f58df1..390fb0e63b83 100644 --- a/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java @@ -302,7 +302,7 @@ public class LambdaUtil { for (HierarchicalMethodSignature signature : visibleSignatures) { final PsiMethod psiMethod = signature.getMethod(); if (!psiMethod.hasModifierProperty(PsiModifier.ABSTRACT)) continue; - if (!overridesPublicObjectMethod(psiMethod) && !PsiUtil.isExtensionMethod(psiMethod)) { + if (!overridesPublicObjectMethod(psiMethod) && !psiMethod.isExtensionMethod()) { methods.add(signature); } } diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java index 4c613bb09245..0dea69d836d0 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java @@ -964,17 +964,4 @@ public final class PsiUtil extends PsiUtilCore { public static boolean isIgnoredName(@Nullable final String name) { return "ignore".equals(name) || "ignored".equals(name); } - - public static boolean isExtensionMethod(@Nullable final PsiMethod method) { - return findExtensionMethodMarker(method) != null; - } - - @Nullable - public static PsiJavaToken findExtensionMethodMarker(@Nullable final PsiMethod method) { - if (method == null) return null; - final PsiCodeBlock body = method.getBody(); - if (body == null) return null; - final PsiElement previous = PsiTreeUtil.skipSiblingsBackward(body, PsiComment.class, PsiWhiteSpace.class); - return previous instanceof PsiJavaToken && isJavaToken(previous, JavaTokenType.DEFAULT_KEYWORD) ? (PsiJavaToken)previous : null; - } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java index f2ecc6853e3b..e4ec85eb2b2f 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java @@ -31,7 +31,6 @@ import com.intellij.psi.impl.source.tree.JavaElementType; import com.intellij.psi.impl.source.tree.TreeElement; import com.intellij.psi.impl.source.tree.java.PsiAnnotationImpl; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.PsiUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; @@ -152,7 +151,7 @@ public class PsiModifierListImpl extends JavaStubPsiElement return false; } if (type == JavaTokenType.ABSTRACT_KEYWORD) { - return !PsiUtil.isExtensionMethod((PsiMethod)parent); + return !((PsiMethod)parent).isExtensionMethod(); } } } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java index af41fd25990d..8d2cdd838dd9 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java @@ -19,9 +19,9 @@ import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.ClassInheritorsSearch; -import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.ui.ConflictsDialog; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringUIUtil; @@ -66,7 +66,7 @@ public class ConvertInterfaceToClassIntention extends Intention { final PsiMethod[] methods = anInterface.getMethods(); for (final PsiMethod method : methods) { - final PsiJavaToken marker = PsiUtil.findExtensionMethodMarker(method); + final PsiJavaToken marker = PsiImplUtil.findExtensionMethodMarker(method); final PsiModifierList modifierList = method.getModifierList(); modifierList.setModifierProperty(PsiModifier.PUBLIC, true); if (marker != null) {