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

Fix regression with empty namefilter (obvious).

Browse Source
This commit is contained in:
Dmitry Cheryasov
2010-04-08 18:44:27 +03:00
parent 97873ffa69
commit 7d19bef359
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/resolve/VariantsProcessor.java
+7 -3
View File
@@ -73,14 +73,14 @@ public class VariantsProcessor implements PsiScopeProcessor {
if (element instanceof PsiNamedElement) {
final PsiNamedElement psiNamedElement = (PsiNamedElement)element;
final String name = psiNamedElement.getName();
if (name != null && !myVariants.containsKey(name) && myNameFilter != null && myNameFilter.value(name)) {
if (nameIsAcceptable(name)) {
myVariants.put(name, setupItem(LookupElementBuilder.create(psiNamedElement).setIcon(element.getIcon(0))));
}
}
else if (element instanceof PyReferenceExpression) {
PyReferenceExpression expr = (PyReferenceExpression)element;
String referencedName = expr.getReferencedName();
if (referencedName != null && !myVariants.containsKey(referencedName) && myNameFilter != null && myNameFilter.value(referencedName)) {
if (nameIsAcceptable(referencedName)) {
myVariants.put(referencedName, setupItem(LookupElementBuilder.create(referencedName)));
}
}
@@ -92,7 +92,7 @@ public class VariantsProcessor implements PsiScopeProcessor {
Icon icon = element.getIcon(0);
// things like PyTargetExpression cannot have a general icon, but here we only have variables
if (icon == null) icon = Icons.VARIABLE_ICON;
if (referencedName != null && !myVariants.containsKey(referencedName) && myNameFilter != null && myNameFilter.value(referencedName)) {
if (nameIsAcceptable(referencedName)) {
LookupElementBuilder lookup_item = setupItem(LookupElementBuilder.create(referencedName).setIcon(icon));
if (definer instanceof PyImportElement) { // set notice to imported module name if needed
PsiElement maybe_from_import = definer.getParent();
@@ -113,6 +113,10 @@ public class VariantsProcessor implements PsiScopeProcessor {
return true;
}
private boolean nameIsAcceptable(String name) {
return name != null && !myVariants.containsKey(name) && (myNameFilter == null || myNameFilter.value(name));
}
@Nullable
public <T> T getHint(Key<T> hintKey) {
return null;