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

improve Alt-F8 behaviour: instanceof expressions, constructors & etc.

Browse Source
This commit is contained in:
Gregory.Shrago
2013-01-15 19:05:09 +04:00
parent bc7c60cf57
commit c7008c5ec8
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/JavaEditorTextProviderImpl.java
+19 -12
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.Nullable;
@@ -59,21 +60,27 @@ public class JavaEditorTextProviderImpl implements EditorTextProvider {
@Nullable
private static PsiElement findExpression(PsiElement element) {
if (!(element instanceof PsiIdentifier || element instanceof PsiKeyword)) {
return null;
PsiElement e = PsiTreeUtil.getParentOfType(element, PsiVariable.class, PsiExpression.class);
if (e instanceof PsiVariable) {
e = ((PsiVariable)e).getNameIdentifier();
}
PsiElement parent = element.getParent();
if (parent instanceof PsiVariable) {
return element;
else if (e instanceof PsiReferenceExpression) {
if (e.getParent() instanceof PsiCallExpression) {
e = e.getParent();
}
else if (e.getParent() instanceof PsiReferenceExpression) {
// <caret>System.out case should not return plain class name
PsiElement resolve = ((PsiReferenceExpression)e).resolve();
if (resolve instanceof PsiClass) {
e = e.getParent();
}
}
}
if (parent instanceof PsiReferenceExpression) {
if (parent.getParent() instanceof PsiCallExpression) return parent.getParent();
return parent;
if (e instanceof PsiNewExpression) {
// skip new Runnable() { ... }
if (((PsiNewExpression)e).getAnonymousClass() != null) return null;
}
if (parent instanceof PsiThisExpression) {
return parent;
}
return null;
return e;
}
@Nullable