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

cs: availability tweaks

Browse Source
This commit is contained in:
anna
2010-09-09 21:05:00 +04:00
parent e7bbca1093
commit 7d141865c7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDetector.java
+4 -2
View File
@@ -189,7 +189,7 @@ public class JavaChangeSignatureDetector implements LanguageChangeSignatureDetec
@Override
public boolean isChangeSignatureAvailable(PsiElement element, ChangeInfo currentInfo) {
if (currentInfo instanceof JavaChangeInfo) {
return Comparing.equal(currentInfo.getMethod(), element);
return element instanceof PsiIdentifier && Comparing.equal(currentInfo.getMethod(), element.getParent());
}
return false;
}
@@ -197,6 +197,7 @@ public class JavaChangeSignatureDetector implements LanguageChangeSignatureDetec
@Nullable
@Override
public TextRange getHighlightingRange(PsiElement element) {
element = element.getParent();
if (element instanceof PsiMethod) {
final PsiCodeBlock body = ((PsiMethod)element).getBody();
return new TextRange(element.getTextRange().getStartOffset(), body == null ? element.getTextRange().getEndOffset() : body.getTextRange().getStartOffset() - 1);
@@ -206,7 +207,8 @@ public class JavaChangeSignatureDetector implements LanguageChangeSignatureDetec
@Override
public boolean wasBanned(PsiElement element, @NotNull ChangeInfo bannedInfo) {
return Comparing.equal(PsiTreeUtil.getParentOfType(element, PsiMethod.class), bannedInfo.getMethod());
final PsiMethod method = PsiTreeUtil.getParentOfType(element, PsiMethod.class);
return method != null && isInsideMethodSignature(element, method) && Comparing.equal(method, bannedInfo.getMethod());
}
private static boolean isInsideMethodSignature(PsiElement element, @NotNull PsiMethod method) {