Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: CtExecutableReference cannot use CtTypeParameterReference #2725

Merged
merged 1 commit into from
Oct 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/spoon/reflect/factory/ExecutableFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private <T> CtExecutableReference<T> createReferenceInternal(CtExecutable<T> e)

private CtTypeReference<?> getMethodParameterType(CtTypeReference<?> paramType) {
if (paramType instanceof CtTypeParameterReference) {
paramType = ((CtTypeParameterReference) paramType).getBoundingType();
return getMethodParameterType(((CtTypeParameterReference) paramType).getBoundingType());
}
if (paramType instanceof CtArrayTypeReference) {
CtArrayTypeReference atr = (CtArrayTypeReference) paramType;
Expand Down
34 changes: 34 additions & 0 deletions src/test/java/spoon/test/generics/GenericsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import spoon.reflect.declaration.CtTypedElement;
import spoon.reflect.declaration.CtVariable;
import spoon.reflect.factory.Factory;
import spoon.reflect.reference.CtExecutableReference;
import spoon.reflect.reference.CtReference;
import spoon.reflect.reference.CtTypeParameterReference;
import spoon.reflect.reference.CtTypeReference;
Expand All @@ -54,6 +55,8 @@
import spoon.reflect.visitor.filter.TypeFilter;
import spoon.support.StandardEnvironment;
import spoon.support.comparator.CtLineElementComparator;
import spoon.support.reflect.reference.CtTypeParameterReferenceImpl;
import spoon.support.reflect.reference.CtTypeReferenceImpl;
import spoon.support.util.SortedList;
import spoon.support.visitor.ClassTypingContext;
import spoon.support.visitor.GenericTypeAdapter;
Expand Down Expand Up @@ -1466,4 +1469,35 @@ public void testGenericsOverriding() {

assertTrue(m6B.isOverriding(m6A));
}

@Test
public void testDeepGenericsInExecutableReference() {
//the generic which extends another generic is handled well
Launcher launcher = new Launcher();
launcher.addInputResource("./src/test/java/spoon/test/generics/testclasses4/C.java");
CtModel model = launcher.buildModel();

CtClass<?> c = model.getElements(new NamedElementFilter<>(CtClass.class, "C")).get(0);


CtMethod<?> m = c.getMethodsByName("m").get(0);
CtTypeReference<?> execParamType = m.getParameters().get(0).getType();
assertEquals(CtTypeParameterReferenceImpl.class, execParamType.getClass());
assertEquals("W", execParamType.getSimpleName());

{
CtExecutableReference<?> mRef = ((CtInvocation) m.getBody().getStatements().get(0)).getExecutable();

CtTypeReference<?> execRefParamType = mRef.getParameters().get(0);
assertEquals(CtTypeReferenceImpl.class, execRefParamType.getClass());
assertEquals("java.util.List<java.lang.String>", execRefParamType.toString());
}
{
CtExecutableReference<?> mRef = m.getReference();

CtTypeReference<?> execRefParamType = mRef.getParameters().get(0);
assertEquals(CtTypeReferenceImpl.class, execRefParamType.getClass());
assertEquals("java.util.List<java.lang.String>", execRefParamType.toString());
}
}
}
9 changes: 9 additions & 0 deletions src/test/java/spoon/test/generics/testclasses4/C.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package spoon.test.generics.testclasses4;

import java.util.List;

public class C {
static <V extends W, W extends T, T extends U, U extends List<String>> void m(W t) {
m(t);
}
}