From dcfcced72c29262f079c9a48a51bd9a67ccf9d89 Mon Sep 17 00:00:00 2001 From: Gregory Shrago Date: Wed, 10 Nov 2010 19:11:28 +0300 Subject: [PATCH] IDEA-60793 Language Injection on annotation parameter --- .../intelliLang/inject/java/JavaLanguageInjectionSupport.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java index 2d91d1a81caf..dbb1063450fe 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java @@ -274,7 +274,8 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo if (referenceElement != null) { PsiElement resolved = referenceElement.resolve(); if (resolved != null) { - PsiMethod[] methods = ((PsiClass)resolved).findMethodsByName(((PsiNameValuePair)parent).getName(), false); + final String name = ((PsiNameValuePair)parent).getName(); + PsiMethod[] methods = ((PsiClass)resolved).findMethodsByName(name == null? PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME : name, false); if (methods.length == 1) { return methods[0]; }