autopopup shouldn't prevent from entering qualified names

This commit is contained in:
peter
2012-02-29 17:22:53 +01:00
parent 8f6eed481f
commit 2044c1d46a
3 changed files with 16 additions and 3 deletions
@@ -42,7 +42,7 @@ public class JavaCharFilter extends CharFilter {
return psiElement != null && psiElement.getParent() instanceof PsiLiteralExpression;
}
public static boolean isNonImportedClassEntered(LookupImpl lookup) {
public static boolean isNonImportedClassEntered(LookupImpl lookup, boolean orPackage) {
if (lookup.isSelectionTouched() || !lookup.isCompletion()) return false;
CompletionProcess process = CompletionService.getCompletionService().getCurrentCompletion();
@@ -66,6 +66,10 @@ public class JavaCharFilter extends CharFilter {
}
}
if (orPackage && prefix.length() > 1 && JavaPsiFacade.getInstance(file.getProject()).findPackage(prefix) != null) {
return true;
}
return false;
}
@@ -117,7 +121,8 @@ public class JavaCharFilter extends CharFilter {
return Result.HIDE_LOOKUP;
}
if ((c == '[' || c == '<' || c == '.' || c == ' ' || c == '(') && isNonImportedClassEntered((LookupImpl)lookup)) {
if ((c == '[' || c == '<' || c == '.' || c == ' ' || c == '(') &&
isNonImportedClassEntered((LookupImpl)lookup, c == '.')) {
return Result.HIDE_LOOKUP;
}