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

If interface method has generic parameters, interface is not functional.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-21 21:22:38 +04:00
parent 91282b992d
commit dea7ef77ec
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
+7 -2
View File
@@ -42,7 +42,13 @@ public class SingleAbstractMethodUtils {
}
List<CallableMemberDescriptor> abstractMembers = getAbstractMembers(klass);
return abstractMembers.size() == 1 && abstractMembers.get(0) instanceof SimpleFunctionDescriptor;
if (abstractMembers.size() == 1) {
CallableMemberDescriptor member = abstractMembers.get(0);
if (member instanceof SimpleFunctionDescriptor) {
return member.getTypeParameters().isEmpty();
}
}
return false;
}
@NotNull
@@ -58,7 +64,6 @@ public class SingleAbstractMethodUtils {
@NotNull
private static JetType getFunctionalTypeForFunction(@NotNull FunctionDescriptor function) {
// TODO substitute type parameters of function with star projections
JetType returnType = function.getReturnType();
assert returnType != null : "function is not initialized: " + function;
List<JetType> parameterTypes = Lists.newArrayList();