Merge branch 'bulgakovalexander-feature/var'

20 files changed, 210 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/ValNullInit.java b/test/transform/resource/after-delombok/ValNullInit.java
new file mode 100644
index 00000000..f0834a63
--- /dev/null
+++ b/test/transform/resource/after-delombok/ValNullInit.java
@@ -0,0 +1,5 @@
+class ValNullInit {
+	void method() {
+		final java.lang.Object x = null;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/VarComplex.java b/test/transform/resource/after-delombok/VarComplex.java
new file mode 100644
index 00000000..10b33943
--- /dev/null
+++ b/test/transform/resource/after-delombok/VarComplex.java
@@ -0,0 +1,20 @@
+public class VarComplex {
+	private String field = "";
+	private static final int CONSTANT = 20;
+	public void testComplex() {
+		char[] shouldBeCharArray = field.toCharArray();
+		int shouldBeInt = CONSTANT;
+		java.lang.Object lock = new Object();
+		synchronized (lock) {
+			int field = 20; //Shadowing
+			int inner = 10;
+			switch (field) {
+			case 5: 
+				char[] shouldBeCharArray2 = shouldBeCharArray;
+				int innerInner = inner;
+			
+			}
+		}
+		java.lang.String shouldBeString = field; //Unshadowing
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/VarInFor.java b/test/transform/resource/after-delombok/VarInFor.java
new file mode 100644
index 00000000..363aeeff
--- /dev/null
+++ b/test/transform/resource/after-delombok/VarInFor.java
@@ -0,0 +1,9 @@
+public class VarInFor {
+	public void enhancedFor() {
+		int[] list = new int[] {1, 2};
+		for (int shouldBeInt : list) {
+			System.out.println(shouldBeInt);
+			int shouldBeInt2 = shouldBeInt;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/VarInForOld.java b/test/transform/resource/after-delombok/VarInForOld.java
new file mode 100644
index 00000000..bb510c0b
--- /dev/null
+++ b/test/transform/resource/after-delombok/VarInForOld.java
@@ -0,0 +1,7 @@
+public class VarInForOld {
+	public void oldFor() {
+		for (int i = 0; i < 100; ++i) {
+			System.out.println(i);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/VarModifier.java b/test/transform/resource/after-delombok/VarModifier.java
new file mode 100644
index 00000000..9838cdf7
--- /dev/null
+++ b/test/transform/resource/after-delombok/VarModifier.java
@@ -0,0 +1,7 @@
+public class VarModifier {
+	private String field = "";
+	public void testComplex() {
+		final char[] shouldBeFinalCharArray = field.toCharArray();
+		char[] shouldBeCharArray = field.toCharArray();
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/VarNullInit.java b/test/transform/resource/after-delombok/VarNullInit.java
new file mode 100644
index 00000000..8ec2ea73
--- /dev/null
+++ b/test/transform/resource/after-delombok/VarNullInit.java
@@ -0,0 +1,6 @@
+
+public class VarNullInit {
+	void method() {
+		java.lang.Object x = null;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValNullInit.java b/test/transform/resource/after-ecj/ValNullInit.java
new file mode 100644
index 00000000..bd89c023
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValNullInit.java
@@ -0,0 +1,10 @@
+import lombok.val;
+
+class ValNullInit {
+  ValNullInit() {
+    super();
+  }
+  void method() {
+    final @val java.lang.Object x = null;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarComplex.java b/test/transform/resource/after-ecj/VarComplex.java
new file mode 100644
index 00000000..10c456eb
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarComplex.java
@@ -0,0 +1,26 @@
+import lombok.experimental.var;
+public class VarComplex {
+  private String field = "";
+  private static final int CONSTANT = 20;
+  <clinit>() {
+  }
+  public VarComplex() {
+    super();
+  }
+  public void testComplex() {
+    @var char[] shouldBeCharArray = field.toCharArray();
+    @var int shouldBeInt = CONSTANT;
+    @var java.lang.Object lock = new Object();
+    synchronized (lock)
+      {
+        @var int field = 20;
+        @var int inner = 10;
+        switch (field) {
+        case 5 :
+            @var char[] shouldBeCharArray2 = shouldBeCharArray;
+            @var int innerInner = inner;
+        }
+      }
+    @var java.lang.String shouldBeString = field;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarInFor.java b/test/transform/resource/after-ecj/VarInFor.java
new file mode 100644
index 00000000..0192aaed
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarInFor.java
@@ -0,0 +1,14 @@
+import lombok.experimental.var;
+public class VarInFor {
+  public VarInFor() {
+    super();
+  }
+  public void enhancedFor() {
+    int[] list = new int[]{1, 2};
+    for (@var int shouldBeInt : list)
+      {
+        System.out.println(shouldBeInt);
+        @var int shouldBeInt2 = shouldBeInt;
+      }
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarInForOld.java b/test/transform/resource/after-ecj/VarInForOld.java
new file mode 100644
index 00000000..98fedf03
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarInForOld.java
@@ -0,0 +1,12 @@
+import lombok.experimental.var;
+public class VarInForOld {
+  public VarInForOld() {
+    super();
+  }
+  public void oldFor() {
+    for (@var int i = 0;; (i < 100); ++ i)
+      {
+        System.out.println(i);
+      }
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarModifier.java b/test/transform/resource/after-ecj/VarModifier.java
new file mode 100644
index 00000000..d11142ca
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarModifier.java
@@ -0,0 +1,12 @@
+import lombok.experimental.var;
+public class VarModifier {
+  private String field = "";
+  public VarModifier() {
+    super();
+  }
+  public void testComplex() {
+    final @var char[] shouldBeFinalCharArray = field.toCharArray();
+    @var char[] shouldBeCharArray = field.toCharArray();
+
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarNullInit.java b/test/transform/resource/after-ecj/VarNullInit.java
new file mode 100644
index 00000000..3eb2d506
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarNullInit.java
@@ -0,0 +1,9 @@
+import lombok.experimental.var;
+public class VarNullInit {
+  public VarNullInit() {
+    super();
+  }
+  void method() {
+    @var java.lang.Object x = null;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValNullInit.java b/test/transform/resource/before/ValNullInit.java
new file mode 100644
index 00000000..649bc0cd
--- /dev/null
+++ b/test/transform/resource/before/ValNullInit.java
@@ -0,0 +1,7 @@
+import lombok.val;
+
+class ValNullInit {
+	void method() {
+		val x = null;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/VarComplex.java b/test/transform/resource/before/VarComplex.java
new file mode 100644
index 00000000..bfaa8804
--- /dev/null
+++ b/test/transform/resource/before/VarComplex.java
@@ -0,0 +1,23 @@
+//CONF: lombok.var.flagUsage = ALLOW
+import lombok.experimental.var;
+
+public class VarComplex {
+	private String field = "";
+	private static final int CONSTANT = 20;
+
+	public void testComplex() {
+		var shouldBeCharArray = field.toCharArray();
+		var shouldBeInt = CONSTANT;
+		var lock = new Object();
+		synchronized (lock) {
+			var field = 20; //Shadowing
+			var inner = 10;
+			switch (field) {
+				case 5:
+					var shouldBeCharArray2 = shouldBeCharArray;
+					var innerInner = inner;
+			}
+		}
+		var shouldBeString = field; //Unshadowing
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/VarInFor.java b/test/transform/resource/before/VarInFor.java
new file mode 100644
index 00000000..cc8c387e
--- /dev/null
+++ b/test/transform/resource/before/VarInFor.java
@@ -0,0 +1,12 @@
+//CONF: lombok.var.flagUsage = ALLOW
+import lombok.experimental.var;
+
+public class VarInFor {
+	public void enhancedFor() {
+		int[] list = new int[] {1, 2};
+		for (var shouldBeInt : list) {
+			System.out.println(shouldBeInt);
+			var shouldBeInt2 = shouldBeInt;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/VarInForOld.java b/test/transform/resource/before/VarInForOld.java
new file mode 100644
index 00000000..f90aba7f
--- /dev/null
+++ b/test/transform/resource/before/VarInForOld.java
@@ -0,0 +1,10 @@
+//CONF: lombok.var.flagUsage = ALLOW
+import lombok.experimental.var;
+
+public class VarInForOld {
+	public void oldFor() {
+		for (var i = 0; i < 100; ++i) {
+			System.out.println(i);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/VarModifier.java b/test/transform/resource/before/VarModifier.java
new file mode 100644
index 00000000..7250c1c5
--- /dev/null
+++ b/test/transform/resource/before/VarModifier.java
@@ -0,0 +1,11 @@
+//CONF: lombok.var.flagUsage = ALLOW
+import lombok.experimental.var;
+
+public class VarModifier {
+	private String field = "";
+
+	public void testComplex() {
+		final var shouldBeFinalCharArray = field.toCharArray();
+		var shouldBeCharArray = field.toCharArray();
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/VarNullInit.java b/test/transform/resource/before/VarNullInit.java
new file mode 100644
index 00000000..efdc9d9e
--- /dev/null
+++ b/test/transform/resource/before/VarNullInit.java
@@ -0,0 +1,8 @@
+//CONF: lombok.var.flagUsage = ALLOW
+import lombok.experimental.var;
+
+public class VarNullInit {
+	void method() {
+		var x = null;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/VarNullInit.java.messages b/test/transform/resource/messages-delombok/VarNullInit.java.messages
new file mode 100644
index 00000000..190ab7c4
--- /dev/null
+++ b/test/transform/resource/messages-delombok/VarNullInit.java.messages
@@ -0,0 +1 @@
+6 variable initializer is 'null'
\ No newline at end of file
diff --git a/test/transform/resource/messages-ecj/VarNullInit.java.messages b/test/transform/resource/messages-ecj/VarNullInit.java.messages
new file mode 100644
index 00000000..190ab7c4
--- /dev/null
+++ b/test/transform/resource/messages-ecj/VarNullInit.java.messages
@@ -0,0 +1 @@
+6 variable initializer is 'null'
\ No newline at end of file