From 062f8117b9f00459c52d91e3e30b5e65e77604d7 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Wed, 15 Mar 2023 20:32:44 +0100 Subject: fix: fixed failure to write descriptor of parametrised type --- src/main/java/ftbsc/lll/processor/tools/ASTUtils.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main/java/ftbsc/lll') diff --git a/src/main/java/ftbsc/lll/processor/tools/ASTUtils.java b/src/main/java/ftbsc/lll/processor/tools/ASTUtils.java index faac3dc..fe72167 100644 --- a/src/main/java/ftbsc/lll/processor/tools/ASTUtils.java +++ b/src/main/java/ftbsc/lll/processor/tools/ASTUtils.java @@ -1,9 +1,6 @@ package ftbsc.lll.processor.tools; -import com.squareup.javapoet.ArrayTypeName; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.MethodSpec; -import com.squareup.javapoet.TypeName; +import com.squareup.javapoet.*; import ftbsc.lll.tools.DescriptorBuilder; import javax.annotation.processing.ProcessingEnvironment; @@ -53,8 +50,8 @@ public class ASTUtils { desc.append("["); type = ((ArrayTypeName) type).componentType; } - if(type instanceof ClassName) { - ClassName var = (ClassName) type; + if(type instanceof ClassName || type instanceof ParameterizedTypeName) { + ClassName var = type instanceof ParameterizedTypeName ? ((ParameterizedTypeName) type).rawType : (ClassName) type; desc.append(DescriptorBuilder.nameToDescriptor(var.canonicalName(), 0)); } else { if(TypeName.BOOLEAN.equals(type)) -- cgit v1.2.3-56-ga3b1