MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not try to generify according to failed diamond inference

Browse Source
This commit is contained in:
anna
2011-03-08 11:27:13 +01:00
parent b5303937f9
commit 7a2f03d06b
6 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java
+11 -8
View File
@@ -203,8 +203,10 @@ public class BindingFactory {
return null;
}
b3.myBindings.put(i, type);
b3.myCyclic = type instanceof PsiTypeVariable;
if (type != PsiType.NULL) {
b3.myBindings.put(i, type);
b3.myCyclic = type instanceof PsiTypeVariable;
}
}
break;
@@ -216,8 +218,10 @@ public class BindingFactory {
return null;
}
b3.myBindings.put(i, type);
b3.myCyclic = type instanceof PsiTypeVariable;
if (type != PsiType.NULL) {
b3.myBindings.put(i, type);
b3.myCyclic = type instanceof PsiTypeVariable;
}
}
break;
@@ -234,12 +238,11 @@ public class BindingFactory {
return null;
}
if (type == null) {
return null;
if (type != PsiType.NULL) {
b3.myBindings.put(i, type);
b3.myCyclic = type instanceof PsiTypeVariable;
}
b3.myBindings.put(i, type);
b3.myCyclic = type instanceof PsiTypeVariable;
}
}
}