MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Drop obsolete methods from PsiUtil

Browse Source
This commit is contained in:
Roman Shevchenko
2012-10-11 10:21:28 +02:00
parent 095644390a
commit 857b7490ad
10 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
+1 -1
View File
@@ -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) {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+2 -2
View File
@@ -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"));
}
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
+2 -2
View File
@@ -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<CandidateInfo> 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);
}
java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java
+1 -1
View File
@@ -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);
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
+2 -1
View File
@@ -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);
}
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+1 -2
View File
@@ -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();
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
+1 -1
View File
@@ -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);
}
}
java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
-13
View File
@@ -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;
}
}
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java
+1 -2
View File
@@ -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<PsiModifierListStub>
return false;
}
if (type == JavaTokenType.ABSTRACT_KEYWORD) {
return !PsiUtil.isExtensionMethod((PsiMethod)parent);
return !((PsiMethod)parent).isExtensionMethod();
}
}
}
plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java
+2 -2
View File
@@ -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) {