From 4684b8c13ee39fce9282f0306a5fc7c5c6db3d5c Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 17 Aug 2010 13:18:37 +0400 Subject: [PATCH] return non-null descriptive name for elements that don't have a name (PY-1552) --- .../python/findUsages/PythonFindUsagesProvider.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/src/com/jetbrains/python/findUsages/PythonFindUsagesProvider.java b/python/src/com/jetbrains/python/findUsages/PythonFindUsagesProvider.java index 44dbdab6b382..a7aa80b13b6a 100644 --- a/python/src/com/jetbrains/python/findUsages/PythonFindUsagesProvider.java +++ b/python/src/com/jetbrains/python/findUsages/PythonFindUsagesProvider.java @@ -46,12 +46,13 @@ public class PythonFindUsagesProvider implements FindUsagesProvider { @NotNull public String getDescriptiveName(@NotNull PsiElement element) { if (element instanceof PsiNamedElement) { - return ((PsiNamedElement)element).getName(); + final String name = ((PsiNamedElement)element).getName(); + return name == null ? "" : name; } if (element instanceof PyReferenceExpression) { String referencedName = ((PyReferenceExpression)element).getReferencedName(); if (referencedName == null) { - return ""; + return ""; } return referencedName; }