Merge branch 'bulgakovalexander-feature/typeInferenceImprovements'

2 files changed, 13 insertions, 6 deletions

diff --git a/test/transform/resource/before/ValLambda.java b/test/transform/resource/before/ValLambda.java
index 51c4fba1..35f83c3c 100644
--- a/test/transform/resource/before/ValLambda.java
+++ b/test/transform/resource/before/ValLambda.java
@@ -10,11 +10,10 @@ class ValLambda {
 	}
 	
 	public void easyLubLambda() {
-		lombok.val foo = (System.currentTimeMillis() > 0) ? (Runnable)()-> {} : (Runnable)System.out::println;
+		lombok.val foo = (System.currentTimeMillis() > 0) ? (Runnable)()-> {} : System.out::println;
+		lombok.val foo1 = (System.currentTimeMillis() > 0) ? (Runnable)System.out::println : System.out::println;
+		lombok.val foo2 = (System.currentTimeMillis() < 0) ? (java.util.function.Function) r -> "" : r -> System.currentTimeMillis();
+		java.util.function.Function foo3 = (System.currentTimeMillis() < 0) ? (java.util.function.Function) r -> "" : r -> System.currentTimeMillis();
+		lombok.val foo4 = (System.currentTimeMillis() < 0) ? (java.util.function.Function<String, String>) r -> "" : r -> String.valueOf(System.currentTimeMillis());
 	}
-	
-//	public void castLubLambda() {
-//		Runnable foo = (Runnable) ((System.currentTimeMillis() > 0) ? () -> {} : System.out::println);
-//		lombok.val foo = (Runnable) ((System.currentTimeMillis() > 0) ? () -> {} : System.out::println);
-//	}
 }
diff --git a/test/transform/resource/before/ValWeirdTypes.java b/test/transform/resource/before/ValWeirdTypes.java
index 4ea1b5d4..157ffc76 100644
--- a/test/transform/resource/before/ValWeirdTypes.java
+++ b/test/transform/resource/before/ValWeirdTypes.java
@@ -72,4 +72,12 @@ public class ValWeirdTypes<Z> {
 			
 		}
 	}
+	
+	@SuppressWarnings("all")
+	public void arraysAsList2() {
+		val x = Arrays.asList(String.class, BigDecimal.class, Comparable.class);
+		for (val y : x) {
+		
+		}
+	}
 }
\ No newline at end of file