azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-04 22:34:13 +04:00
parent 35f28e7684
commit 02c28943a0
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+1 -6
View File
@@ -86,18 +86,13 @@ public final class JavaPropertyResolver {
@NotNull ResolverScopeData scopeData, @NotNull ResolverScopeData scopeData,
@NotNull ClassOrNamespaceDescriptor ownerDescriptor @NotNull ClassOrNamespaceDescriptor ownerDescriptor
) { ) {
PsiClass psiClass = scopeData.getPsiClass();
NamedMembers namedMembers = scopeData.getMembersCache().get(fieldName); NamedMembers namedMembers = scopeData.getMembersCache().get(fieldName);
if (namedMembers == null) { if (namedMembers == null) {
return Collections.emptySet(); return Collections.emptySet();
} }
//noinspection ConstantConditions
String qualifiedName = psiClass == null ? scopeData.getPsiPackage().getQualifiedName() : psiClass.getQualifiedName();
return resolveNamedGroupProperties(ownerDescriptor, scopeData, namedMembers, fieldName, return resolveNamedGroupProperties(ownerDescriptor, scopeData, namedMembers, fieldName,
"class or namespace " + qualifiedName); "class or namespace " + DescriptorUtils.getFQName(ownerDescriptor));
} }
@NotNull @NotNull