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

injection in enum constants (IDEA-169875)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-03-21 12:18:45 +01:00
parent e75f2f7860
commit cf10709f77
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/ConcatenationInjector.java
+5 -1
View File
@@ -140,7 +140,7 @@ public class ConcatenationInjector implements ConcatenationAwareInjector {
final LinkedList<PsiElement> places = new LinkedList<>();
places.add(firstOperand);
class MyAnnoVisitor implements AnnotationUtilEx.AnnotatedElementVisitor {
public boolean visitMethodParameter(PsiExpression expression, PsiCallExpression psiCallExpression) {
public boolean visitMethodParameter(PsiExpression expression, PsiCall psiCallExpression) {
final PsiExpressionList list = psiCallExpression.getArgumentList();
assert list != null;
final int index = ArrayUtil.indexOf(list.getExpressions(), expression);
@@ -160,6 +160,10 @@ public class ConcatenationInjector implements ConcatenationAwareInjector {
final PsiJavaCodeReferenceElement classRef = ((PsiNewExpression)psiCallExpression).getClassOrAnonymousClassReference();
methodName = classRef == null ? null : classRef.getReferenceName();
}
else if (psiCallExpression instanceof PsiEnumConstant) {
PsiMethod method = psiCallExpression.resolveMethod();
methodName = method != null ? method.getName() : null;
}
else {
methodName = null;
}
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
+3 -4
View File
@@ -18,7 +18,6 @@ package org.intellij.plugins.intelliLang.inject.java;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.lang.Language;
import com.intellij.lang.injection.MultiHostRegistrar;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.application.Result;
@@ -194,7 +193,7 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo
parent instanceof PsiNameValuePair) {
return doInjectInJavaMethod(project, findPsiMethod(parent), -1, host, languageId);
}
else if (parent instanceof PsiExpressionList && parent.getParent() instanceof PsiCallExpression) {
else if (parent instanceof PsiExpressionList && parent.getParent() instanceof PsiCall) {
return doInjectInJavaMethod(project, findPsiMethod(parent), findParameterIndex(target, (PsiExpressionList)parent), host, languageId);
}
else if (parent instanceof PsiAssignmentExpression) {
@@ -341,8 +340,8 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo
}
}
final PsiMethod first;
if (parent.getParent() instanceof PsiCallExpression) {
first = ((PsiCallExpression)parent.getParent()).resolveMethod();
if (parent.getParent() instanceof PsiCall) {
first = ((PsiCall)parent.getParent()).resolveMethod();
}
else {
first = PsiTreeUtil.getParentOfType(parent, PsiMethod.class, false);
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java
+3 -3
View File
@@ -119,7 +119,7 @@ public class AnnotationUtilEx {
}
public interface AnnotatedElementVisitor {
boolean visitMethodParameter(PsiExpression expression, PsiCallExpression psiCallExpression);
boolean visitMethodParameter(PsiExpression expression, PsiCall psiCallExpression);
boolean visitMethodReturnStatement(PsiElement source, PsiMethod method);
boolean visitVariable(PsiVariable variable);
boolean visitAnnotationParameter(PsiNameValuePair nameValuePair, PsiAnnotation psiAnnotation);
@@ -178,8 +178,8 @@ public class AnnotationUtilEx {
else if (parent instanceof PsiArrayInitializerMemberValue || parent instanceof PsiNameValuePair) {
return true;
}
else if (parent instanceof PsiExpressionList && parent.getParent() instanceof PsiCallExpression) {
return visitor.visitMethodParameter((PsiExpression)element, (PsiCallExpression)parent.getParent());
else if (parent instanceof PsiExpressionList && parent.getParent() instanceof PsiCall) {
return visitor.visitMethodParameter((PsiExpression)element, (PsiCall)parent.getParent());
}
return true;
}