From 18aaca2a551b0c3b8d85ed7265dbaa3f2a0190d1 Mon Sep 17 00:00:00 2001 From: NebelNidas Date: Mon, 10 Jul 2023 14:28:55 +0200 Subject: [PATCH] Simplify casts with instanceof pattern matching --- .../cuchaz/enigma/source/jadx/JadxSource.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/enigma/src/main/java/cuchaz/enigma/source/jadx/JadxSource.java b/enigma/src/main/java/cuchaz/enigma/source/jadx/JadxSource.java index 7c891abf..b9de2266 100644 --- a/enigma/src/main/java/cuchaz/enigma/source/jadx/JadxSource.java +++ b/enigma/src/main/java/cuchaz/enigma/source/jadx/JadxSource.java @@ -250,19 +250,13 @@ private List getMethodArgs(MethodNode mth, ICodeInfo codeInfo) { return Boolean.TRUE; } - if (ann instanceof NodeDeclareRef) { - ICodeNodeRef declRef = ((NodeDeclareRef) ann).getNode(); - - if (declRef instanceof VarNode) { - VarNode varNode = (VarNode) declRef; - - if (!varNode.getMth().equals(mth)) { - // Stop if we've gone too far and have entered a different method - return Boolean.TRUE; - } - - args.add(varNode); + if (ann instanceof NodeDeclareRef ref && ref.getNode() instanceof VarNode varNode) { + if (!varNode.getMth().equals(mth)) { + // Stop if we've gone too far and have entered a different method + return Boolean.TRUE; } + + args.add(varNode); } return null;