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

Simplified code.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-21 22:58:22 +04:00
parent 7a136eae5b
commit 81381a206c
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+6 -9
View File
@@ -355,17 +355,14 @@ public final class JavaFunctionResolver {
@NotNull PackagePsiDeclarationProvider scopeData, @NotNull PackagePsiDeclarationProvider scopeData,
@NotNull NamespaceDescriptor ownerDescriptor @NotNull NamespaceDescriptor ownerDescriptor
) { ) {
NamedMembers namedMembers = scopeData.getMembersCache().get(functionName); NamedMembers namedMembers = scopeData.getMembersCache().get(functionName);
if (namedMembers == null) { if (namedMembers != null) {
return Collections.emptySet(); SimpleFunctionDescriptor samConstructor = resolveSamConstructor(ownerDescriptor, namedMembers);
if (samConstructor != null) {
return Collections.<FunctionDescriptor>singleton(samConstructor);
}
} }
return Collections.emptySet();
SimpleFunctionDescriptor samConstructor = resolveSamConstructor(ownerDescriptor, namedMembers);
return samConstructor == null
? Collections.<FunctionDescriptor>emptySet()
: Collections.<FunctionDescriptor>singleton(samConstructor);
} }
@NotNull @NotNull