zaaarf/lillero-processor
1
0
Fork 0
mirror of https://github.com/zaaarf/lillero-processor.git synced 2024-11-25 13:54:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: canonical way to get raw TypeMirrors

Browse source
This commit is contained in:
zaaarf 2023-04-11 23:02:20 +02:00
parent 415f1eef8b
commit 5579df7c39
No known key found for this signature in database
GPG key ID: 82240E075E31FA4C
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ftbsc/lll/processor/tools/ASTUtils.java
View file

@ -15,6 +15,7 @@ import javax.lang.model.type.*;
import javax.tools.Diagnostic; import javax.tools.Diagnostic;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -122,7 +123,7 @@ public class ASTUtils {
*/ */
public static String internalNameFromType(TypeMirror type, ProcessingEnvironment env) { 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.getElementUtils().getTypeElement(type.toString().split("<")[0]); Element elem = env.getTypeUtils().asElement(env.getTypeUtils().erasure(type));
StringBuilder fqnBuilder = new StringBuilder(); StringBuilder fqnBuilder = new StringBuilder();
while(elem.getEnclosingElement() != null && elem.getEnclosingElement().getKind() != ElementKind.PACKAGE) { while(elem.getEnclosingElement() != null && elem.getEnclosingElement().getKind() != ElementKind.PACKAGE) {
fqnBuilder fqnBuilder
@ -131,7 +132,7 @@ public class ASTUtils {
elem = elem.getEnclosingElement(); elem = elem.getEnclosingElement();
} }
return fqnBuilder return fqnBuilder
.insert(0, elem.asType().toString().split("<")[0]) .insert(0, env.getTypeUtils().erasure(elem.asType()).toString())
.toString() .toString()
.replace('.', '/'); .replace('.', '/');
} }
@ -143,6 +144,8 @@ public class ASTUtils {
* @return a {@link String} containing the relevant descriptor * @return a {@link String} containing the relevant descriptor
*/ */
public static String descriptorFromType(TypeMirror t, ProcessingEnvironment env) { public static String descriptorFromType(TypeMirror t, ProcessingEnvironment env) {
t = env.getTypeUtils().erasure(t); //type erasure
StringBuilder desc = new StringBuilder(); StringBuilder desc = new StringBuilder();
//add array brackets //add array brackets
while(t.getKind() == TypeKind.ARRAY) { while(t.getKind() == TypeKind.ARRAY) {