From ce7e796d93a28d450d0fa984154504a970da6985 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 28 Jul 2023 22:11:10 -0400 Subject: [PATCH] Only collect options from ModernFixEarlyConfig added to the immutable map --- scripts/modernfixlib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/modernfixlib.py b/scripts/modernfixlib.py index 032aacd7..be94b3bb 100644 --- a/scripts/modernfixlib.py +++ b/scripts/modernfixlib.py @@ -16,7 +16,7 @@ def get_valid_mixin_options(): all_mixin_options.add("mixin." + mixin_name) # gather any mixin strings referenced in ModernFixEarlyConfig with open('common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java') as config_java: - config_str = config_java.read() - for option in re.findall(r"\"(mixin(?:\.[a-z_]+)+)\"", config_str): - all_mixin_options.add(option) + for line in config_java: + for option in re.findall(r"\.put[A-Za-z_]*\(.*\"(mixin(?:\.[a-z_]+)+)\"", line): + all_mixin_options.add(option) return all_mixin_options \ No newline at end of file