From 8629e4cf223a0890323ed113c6cc2e27c251b363 Mon Sep 17 00:00:00 2001 From: Skylot <118523+skylot@users.noreply.github.com> Date: Tue, 23 Dec 2025 21:40:35 +0000 Subject: [PATCH] tests(cli): use provided plugin loader to not use global plugins in tests --- jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java b/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java index 3dd346796..ec93a2a2d 100644 --- a/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java +++ b/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java @@ -25,7 +25,6 @@ import jadx.api.plugins.options.OptionDescription; import jadx.core.plugins.JadxPluginManager; import jadx.core.plugins.PluginContext; import jadx.core.utils.Utils; -import jadx.plugins.tools.JadxExternalPluginsLoader; public class JCommanderWrapper { private final JCommander jc; @@ -275,19 +274,16 @@ public class JCommanderWrapper { private String appendPluginOptions(int maxNamesLen) { StringBuilder sb = new StringBuilder(); - int k = 1; // load and init all options plugins to print all options try (JadxDecompiler decompiler = new JadxDecompiler(argsObj.toJadxArgs())) { JadxPluginManager pluginManager = decompiler.getPluginManager(); - pluginManager.load(new JadxExternalPluginsLoader()); + pluginManager.load(decompiler.getArgs().getPluginLoader()); pluginManager.initAll(); try { for (PluginContext context : pluginManager.getAllPluginContexts()) { JadxPluginOptions options = context.getOptions(); if (options != null) { - if (appendPlugin(context.getPluginInfo(), context.getOptions(), sb, maxNamesLen)) { - k++; - } + appendPlugin(context.getPluginInfo(), context.getOptions(), sb, maxNamesLen); } } } finally {