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

suggest SAM with same primitive return type (IDEA-174020)

Browse Source
This commit is contained in:
Anna Kozlova
2017-06-07 19:04:04 +03:00
parent a3beaf3620
commit cb1e34fe92
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/FunctionalInterfaceSuggester.java
+4 -4
View File
@@ -112,12 +112,12 @@ public class FunctionalInterfaceSuggester {
}
final PsiType returnType = method.getReturnType();
PsiType interfaceMethodReturnType = interfaceMethod.getReturnType();
if (returnType != null && !TypeConversionUtil.isAssignable(returnType, substitutor.substitute(interfaceMethodReturnType))) {
PsiType interfaceMethodReturnType = substitutor.substitute(interfaceMethod.getReturnType());
if (returnType != null && !TypeConversionUtil.isAssignable(returnType, interfaceMethodReturnType)) {
return null;
}
if (PsiType.VOID.equals(returnType) && !PsiType.VOID.equals(interfaceMethodReturnType)) {
if (returnType instanceof PsiPrimitiveType && !returnType.equals(interfaceMethodReturnType)) {
return null;
}