do not try to generify according to failed diamond inference

java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java

@@ -203,8 +203,10 @@ public class BindingFactory {
                 return null;
               }
 
-              b3.myBindings.put(i, type);
+              if (type != PsiType.NULL) {
-              b3.myCyclic = type instanceof PsiTypeVariable;
+                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);
+              if (type != PsiType.NULL) {
-              b3.myCyclic = type instanceof PsiTypeVariable;
+                b3.myBindings.put(i, type);
+                b3.myCyclic = type instanceof PsiTypeVariable;
+              }
             }
             break;
 
@@ -234,12 +238,11 @@ public class BindingFactory {
               return null;
             }
 
-            if (type == null) {
+            if (type != PsiType.NULL) {
-              return null;
+              b3.myBindings.put(i, type);
+              b3.myCyclic = type instanceof PsiTypeVariable;
             }
 
-            b3.myBindings.put(i, type);
-            b3.myCyclic = type instanceof PsiTypeVariable;
           }
         }
       }

java/java-tests/testData/refactoring/typeCook/t152/after/Test.1.items

@@ -0,0 +1,2 @@
+java.util.ArrayList\nPsiField:l
+java.util.ArrayList\nnew

java/java-tests/testData/refactoring/typeCook/t152/after/Test.items

@@ -0,0 +1,2 @@
+java.util.ArrayList\nPsiField:l
+java.util.ArrayList\nnew

java/java-tests/testData/refactoring/typeCook/t152/after/test.java

@@ -0,0 +1,6 @@
+import java.util.ArrayList;
+
+class Test
+{
+  ArrayList l = new ArrayList<>(8);
+}

java/java-tests/testData/refactoring/typeCook/t152/before/test.java

@@ -0,0 +1,6 @@
+import java.util.ArrayList;
+
+class Test
+{
+  ArrayList l = new ArrayList<>(8);
+}

java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java

@@ -648,6 +648,10 @@ public class TypeCookTest extends MultiFileTestCase {
         start();
   }
 
+  public void testT152() throws Exception {
+        start();
+  }
+
   public void start() throws Exception {
     start(false);
   }