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

cs gestures: do not suggest to change signature for new method (without body)

Browse Source
This commit is contained in:
anna
2010-09-09 21:04:58 +04:00
parent d53280e7d2
commit 6307798cb8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDetector.java
+7 -3
View File
@@ -45,7 +45,7 @@ public class JavaChangeSignatureDetector implements LanguageChangeSignatureDetec
public ChangeInfo createCurrentChangeSignature(final @NotNull PsiElement element,
final @Nullable ChangeInfo changeInfo) {
PsiMethod method = PsiTreeUtil.getParentOfType(element, PsiMethod.class);
if (method != null && isInsideMethodSignature(element, method.getBody())) {
if (method != null && isInsideMethodSignature(element, method)) {
final String newVisibility = VisibilityUtil.getVisibilityModifier(method.getModifierList());
final PsiType returnType = method.getReturnType();
final CanonicalTypes.Type newReturnType = returnType != null ? CanonicalTypes.createTypeWrapper(returnType) : null;
@@ -208,7 +208,11 @@ public class JavaChangeSignatureDetector implements LanguageChangeSignatureDetec
return Comparing.equal(PsiTreeUtil.getParentOfType(element, PsiMethod.class), bannedInfo.getMethod());
}
private static boolean isInsideMethodSignature(PsiElement element, PsiCodeBlock body) {
return body == null || element.getTextOffset() < body.getTextOffset();
private static boolean isInsideMethodSignature(PsiElement element, @NotNull PsiMethod method) {
final PsiCodeBlock body = method.getBody();
if (body != null) {
return element.getTextOffset() < body.getTextOffset() && element.getTextOffset() > method.getModifierList().getTextRange().getEndOffset();
}
return method.hasModifierProperty(PsiModifier.ABSTRACT);
}
}