odinfmt: change return formatting and fix binary expression issues.

4 files changed, 55 insertions, 0 deletions

diff --git a/tools/odinfmt/tests/.snapshots/assignments.odin b/tools/odinfmt/tests/.snapshots/assignments.odin
index 983087e..54bfbe3 100644
--- a/tools/odinfmt/tests/.snapshots/assignments.odin
+++ b/tools/odinfmt/tests/.snapshots/assignments.odin
@@ -10,6 +10,17 @@ assignments :: proc() {
 		&big.Int{},
 		&big.Int{}
 
+	value +=
+		b4 *
+		grad(
+			seed,
+			[3]i64{rbp.x, rbp.y - i_sign.y * PRIME_Y, rbp.z},
+			[3]f32{ri.x, ri.y + f_sign.y, ri.z},
+		)
+
+	a :=
+		(GRADIENTS_4D[gi] * delta.x + GRADIENTS_4D[gi | 1] * delta.y) +
+		(GRADIENTS_4D[gi | 2] * delta.z + GRADIENTS_4D[gi | 3] * delta.w)
 }
 
 ternary_when_assignment :: proc() {
diff --git a/tools/odinfmt/tests/.snapshots/returns.odin b/tools/odinfmt/tests/.snapshots/returns.odin
new file mode 100644
index 0000000..85996b7
--- /dev/null
+++ b/tools/odinfmt/tests/.snapshots/returns.odin
@@ -0,0 +1,19 @@
+package odinfmt_test
+
+return_with_paren_1 :: proc() {
+	return(
+		GRADIENTS_4D[gi] * delta.x +
+		GRADIENTS_4D[gi | 1] * delta.y +
+		GRADIENTS_4D[gi | 2] * delta.z +
+		GRADIENTS_4D[gi | 3] * delta.w \
+	)
+}
+
+return_without_paren_1 :: proc() {
+	return(
+		GRADIENTS_4D[gi] * delta.x +
+		GRADIENTS_4D[gi | 1] * delta.y +
+		GRADIENTS_4D[gi | 2] * delta.z +
+		GRADIENTS_4D[gi | 3] * delta.w \
+	)
+}
diff --git a/tools/odinfmt/tests/assignments.odin b/tools/odinfmt/tests/assignments.odin
index 53cc9aa..326c0ba 100644
--- a/tools/odinfmt/tests/assignments.odin
+++ b/tools/odinfmt/tests/assignments.odin
@@ -3,6 +3,15 @@ package odinfmt_test
 assignments :: proc() {
 	a, b, c, d, e, f, res := &big.Int{}, &big.Int{}, &big.Int{}, &big.Int{}, &big.Int{}, &big.Int{}, &big.Int{}
 
+	value += b4 * grad(
+            seed,
+            [3]i64{rbp.x, rbp.y - i_sign.y * PRIME_Y, rbp.z},
+            [3]f32{ri.x, ri.y + f_sign.y, ri.z},
+        )
+
+		a := (GRADIENTS_4D[gi] * delta.x +
+			GRADIENTS_4D[gi | 1] *
+			delta.y) + (GRADIENTS_4D[gi | 2] * delta.z + GRADIENTS_4D[gi | 3] * delta.w)
 }
 
 ternary_when_assignment :: proc() {
diff --git a/tools/odinfmt/tests/returns.odin b/tools/odinfmt/tests/returns.odin
new file mode 100644
index 0000000..f4ff400
--- /dev/null
+++ b/tools/odinfmt/tests/returns.odin
@@ -0,0 +1,16 @@
+package odinfmt_test
+
+return_with_paren_1 :: proc() {
+	return(
+        GRADIENTS_4D[gi] * delta.x +
+        GRADIENTS_4D[gi | 1] * delta.y +
+        GRADIENTS_4D[gi | 2] * delta.z +
+        GRADIENTS_4D[gi | 3] * delta.w \
+    )
+}
+
+return_without_paren_1 :: proc() {
+	return GRADIENTS_4D[gi] * delta.x +
+        GRADIENTS_4D[gi | 1] * delta.y +
+        GRADIENTS_4D[gi | 2] * delta.z + GRADIENTS_4D[gi | 3] * delta.w    
+}
\ No newline at end of file