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

IDEA-74182 Can't expand live templates in constructor

Browse Source
This commit is contained in:
peter
2011-09-13 10:17:47 +02:00
parent 90487ee303
commit d851643075
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java
+17 -5
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.patterns.ElementPattern;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.util.ProcessingContext;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -97,7 +98,12 @@ public abstract class JavaCodeContextType extends TemplateContextType {
}
private static boolean isStatementContext(PsiElement element) {
return Expression.isExpressionContext(element) && element.getParent().getParent() instanceof PsiExpressionStatement;
if (!Expression.isExpressionContext(element)) {
return false;
}
PsiElement parent = element.getParent().getParent();
return parent instanceof PsiExpressionStatement || parent instanceof PsiTypeElement && parent.getParent() instanceof PsiVariable;
}
}
public static class Expression extends JavaCodeContextType {
@@ -117,18 +123,24 @@ public abstract class JavaCodeContextType extends TemplateContextType {
private static boolean isExpressionContext(PsiElement element) {
final PsiElement parent = element.getParent();
if (!(parent instanceof PsiReferenceExpression)) {
if (!(parent instanceof PsiJavaCodeReferenceElement)) {
return false;
}
if (((PsiReferenceExpression)parent).isQualified()) {
if (((PsiJavaCodeReferenceElement)parent).isQualified()) {
return false;
}
if (parent.getParent() instanceof PsiMethodCallExpression) {
return false;
}
if (INFIX_OPERATOR.accepts(element)) {
return false;
ProcessingContext context = new ProcessingContext();
if (psiElement().inside(PsiExpression.class).afterLeaf(psiElement().inside(psiElement(PsiExpression.class).save("prevExpr"))).accepts(element, context)) {
PsiExpression prevExpr = (PsiExpression)context.get("prevExpr");
if (prevExpr.getTextRange().getEndOffset() <= element.getTextRange().getStartOffset()) {
return false;
}
}
return true;
}
}