Merge branch 'master' of git.labs.intellij.net:idea/community

This commit is contained in:
Dmitry Lomov
2012-06-07 14:41:02 +04:00
18 changed files with 149 additions and 41 deletions
@@ -253,10 +253,11 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo
@NotNull
public PsiElement[] getVariants(){
final List<PsiModifierListOwner> vars = new ArrayList<PsiModifierListOwner>();
final PsiElement scope = getScope();
if (scope != null) {
PsiClass scope = getScope();
while (scope != null) {
ContainerUtil.addAll(vars, getAllMethods(scope, PsiDocMethodOrFieldRef.this));
ContainerUtil.addAll(vars, getAllVariables(scope, PsiDocMethodOrFieldRef.this));
scope = scope.getContainingClass();
}
return vars.toArray(new PsiModifierListOwner[vars.size()]);
}