From 90c21d87cfa8d4559580ba7cfedaf116f004647c Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.dev>
Date: Thu, 6 Aug 2020 19:13:26 +0100
Subject: [PATCH] Replace nested ifs with &&

Signed-off-by: Graham <gpe@openrs2.dev>
---
 .../deob/ast/transform/IfElseTransformer.kt   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IfElseTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IfElseTransformer.kt
index beb710a7..73db9f04 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IfElseTransformer.kt
+++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IfElseTransformer.kt
@@ -2,6 +2,7 @@ package dev.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.expr.BinaryExpr
 import com.github.javaparser.ast.expr.ConditionalExpr
 import com.github.javaparser.ast.stmt.BlockStmt
 import com.github.javaparser.ast.stmt.IfStmt
@@ -208,6 +209,35 @@ class IfElseTransformer : Transformer() {
                 }
             }
         }
+
+        /*
+         * Rewrite:
+         *
+         * if (a) {
+         *     if (b) {
+         *         ...
+         *     }
+         * }
+         *
+         * to:
+         *
+         * if (a && b) {
+         *     ...
+         * }
+         */
+        unit.walk { outerStmt: IfStmt ->
+            if (outerStmt.elseStmt.isPresent) {
+                return@walk
+            }
+
+            val innerStmt = outerStmt.thenStmt.getIf() ?: return@walk
+            if (innerStmt.elseStmt.isPresent) {
+                return@walk
+            }
+
+            outerStmt.condition = BinaryExpr(outerStmt.condition, innerStmt.condition, BinaryExpr.Operator.AND)
+            outerStmt.thenStmt = innerStmt.thenStmt
+        }
     }
 
     private fun Statement.isIf(): Boolean {