From f93c7b9e169eedeaf6caaa860cbc45cd8f2ffb2a Mon Sep 17 00:00:00 2001 From: zaaarf Date: Sun, 2 Jun 2024 21:30:10 +0200 Subject: fix: map overridden methods using top-level's name --- src/main/java/ftbsc/lll/processor/utils/ASTUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/ftbsc/lll/processor/utils/ASTUtils.java') diff --git a/src/main/java/ftbsc/lll/processor/utils/ASTUtils.java b/src/main/java/ftbsc/lll/processor/utils/ASTUtils.java index e75d5e9..6989e5e 100644 --- a/src/main/java/ftbsc/lll/processor/utils/ASTUtils.java +++ b/src/main/java/ftbsc/lll/processor/utils/ASTUtils.java @@ -116,14 +116,14 @@ public class ASTUtils { } /** - * Gets the internal name from an {@link TypeMirror}. + * Gets the internal name from a {@link TypeMirror}. * @param type the {@link TypeMirror} in question * @param env the {@link ProcessingEnvironment} to perform the operation in * @return the internal name at compile time, or null if it wasn't a qualifiable * @since 0.5.1 */ public static String internalNameFromType(TypeMirror type, ProcessingEnvironment env) { - //needed to actually turn elem into a TypeVariable, find it ignoring generics + // needed to actually turn elem into a TypeVariable, find it ignoring generics Element elem = env.getTypeUtils().asElement(env.getTypeUtils().erasure(type)); StringBuilder fqnBuilder = new StringBuilder(); while(elem.getEnclosingElement() != null && elem.getEnclosingElement().getKind() != ElementKind.PACKAGE) { @@ -213,7 +213,7 @@ public class ASTUtils { } /** - * Gets the {@link ClassData} corresponding to the given fully-qualified name, + * Gets the {@link ClassData} corresponding to the given internal name, * or creates a false one with the same, non-obfuscated name twice. * @param name the internal name of the class to convert * @param mapper the {@link Mapper} to use, may be null @@ -222,7 +222,7 @@ public class ASTUtils { */ public static ClassData getClassData(String name, Mapper mapper) { try { - name = name.replace('.', '/'); //just in case + name = name.replace('.', '/'); // just in case if(mapper != null) return mapper.getClassData(name); } catch(MappingNotFoundException ignored) {} @@ -242,7 +242,7 @@ public class ASTUtils { */ public static MethodData getMethodData(String parent, String name, String descriptor, Mapper mapper) { try { - name = name.replace('.', '/'); //just in case + parent = parent.replace('.', '/'); // just in case if(mapper != null) return mapper.getMethodData(parent, name, descriptor); } catch(MappingNotFoundException ignored) {} @@ -360,7 +360,7 @@ public class ASTUtils { /** * Tries to find the "synthetic bridge" generated by the compiler for a certain overridden - * method. A "bridge" only exists in cases where type erasure is involved (i.e. when the + * methods. A "bridge" only exists in cases where type erasure is involved (i.e. when the * method being overridden uses a generic parameter that is not preserved in the overriding * method). * @param context the {@link TypeElement} representing the parent class -- cgit v1.2.3-56-ga3b1