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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Konstantin Bulenkov
2015-09-24 20:26:02 +02:00
parent 204a4c184c 4a71dae409
commit acc8142d1b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
+6 -6
View File
@@ -317,12 +317,12 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
final Condition<String> nameCondition = processor.getHint(JavaCompletionHints.NAME_FILTER);
NameHint nameHint = processor.getHint(NameHint.KEY);
final String hintName = nameHint == null ? null : nameHint.getName(state);
NameHint providedNameHint = processor.getHint(NameHint.KEY);
final String providedName = providedNameHint == null ? null : providedNameHint.getName(state);
if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) {
if (hintName != null) {
final PsiClass[] classes = findClassByShortName(hintName, scope);
if (providedName != null) {
final PsiClass[] classes = findClassByShortName(providedName, scope);
if (!processClasses(processor, state, classes, Conditions.<String>alwaysTrue())) return false;
}
else {
@@ -331,8 +331,8 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
}
}
if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.PACKAGE)) {
if (hintName != null) {
PsiPackage aPackage = findSubPackageByName(hintName);
if (providedName != null) {
PsiPackage aPackage = findSubPackageByName(providedName);
if (aPackage != null) {
if (!processor.execute(aPackage, state)) return false;
}