From ba7a354efae7d49833c887cf147ac940c975a1fa Mon Sep 17 00:00:00 2001 From: Gegy Date: Wed, 30 Jan 2019 21:05:32 +0200 Subject: Remap sources (#106) * Source remapping beginnings * Fix navigation to remapped classes * Translate identifier info reference * Remap local variables with default names in source * Caching translator * Fix lack of highlighting for first opened class * Fix unicode variable names * Unicode checker shouldn't be checking just alphanumeric * Fix package tree being built from obf names * Don't index `this` as method call for method::reference * Apply proposed names * Fix source export issues * Replace unicode var names at bytecode level uniquely * Drop imports from editor source * Class selector fixes * Delta keep track of base mappings to enable lookup of old names * Optimize source remapping by remapping source with a StringBuffer instead of copying * Bump version --- src/test/java/cuchaz/enigma/TestDeobfed.java | 45 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestDeobfed.java') diff --git a/src/test/java/cuchaz/enigma/TestDeobfed.java b/src/test/java/cuchaz/enigma/TestDeobfed.java index 25cb60c..14b1418 100644 --- a/src/test/java/cuchaz/enigma/TestDeobfed.java +++ b/src/test/java/cuchaz/enigma/TestDeobfed.java @@ -68,27 +68,28 @@ public class TestDeobfed { public void decompile() throws Exception { Deobfuscator deobfuscator = new Deobfuscator(jar); - deobfuscator.getSourceTree("a"); - deobfuscator.getSourceTree("b"); - deobfuscator.getSourceTree("c"); - deobfuscator.getSourceTree("d"); - deobfuscator.getSourceTree("d$1"); - deobfuscator.getSourceTree("e"); - deobfuscator.getSourceTree("f"); - deobfuscator.getSourceTree("g"); - deobfuscator.getSourceTree("g$a"); - deobfuscator.getSourceTree("g$a$a"); - deobfuscator.getSourceTree("g$b"); - deobfuscator.getSourceTree("g$b$a"); - deobfuscator.getSourceTree("h"); - deobfuscator.getSourceTree("h$a"); - deobfuscator.getSourceTree("h$a$a"); - deobfuscator.getSourceTree("h$b"); - deobfuscator.getSourceTree("h$b$a"); - deobfuscator.getSourceTree("h$b$a$a"); - deobfuscator.getSourceTree("h$b$a$b"); - deobfuscator.getSourceTree("i"); - deobfuscator.getSourceTree("i$a"); - deobfuscator.getSourceTree("i$b"); + SourceProvider sourceProvider = deobfuscator.getObfSourceProvider(); + sourceProvider.getSources("a"); + sourceProvider.getSources("b"); + sourceProvider.getSources("c"); + sourceProvider.getSources("d"); + sourceProvider.getSources("d$1"); + sourceProvider.getSources("e"); + sourceProvider.getSources("f"); + sourceProvider.getSources("g"); + sourceProvider.getSources("g$a"); + sourceProvider.getSources("g$a$a"); + sourceProvider.getSources("g$b"); + sourceProvider.getSources("g$b$a"); + sourceProvider.getSources("h"); + sourceProvider.getSources("h$a"); + sourceProvider.getSources("h$a$a"); + sourceProvider.getSources("h$b"); + sourceProvider.getSources("h$b$a"); + sourceProvider.getSources("h$b$a$a"); + sourceProvider.getSources("h$b$a$b"); + sourceProvider.getSources("i"); + sourceProvider.getSources("i$a"); + sourceProvider.getSources("i$b"); } } -- cgit v1.2.3