review fix: Invalid use of type access generics

src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java

@@ -18,6 +18,7 @@
 
 import spoon.SpoonException;
 import spoon.compiler.Environment;
+import spoon.reflect.code.BinaryOperatorKind;
 import spoon.reflect.code.CtAnnotationFieldAccess;
 import spoon.reflect.code.CtArrayAccess;
 import spoon.reflect.code.CtArrayRead;
@@ -482,7 +483,12 @@ public <T> void visitCtBinaryOperator(CtBinaryOperator<T> operator) {
  printer.write(" ");
  printer.write(OperatorHelper.getOperatorText(operator.getKind()));
  printer.write(" ");
- scan(operator.getRightHandOperand());
+ try (Writable _context = context.modify()) {
+ if (operator.getKind() == BinaryOperatorKind.INSTANCEOF) {
+ _context.forceWildcardGenerics(true);
+ }
+ scan(operator.getRightHandOperand());
+ }
  exitCtExpression(operator);
  }
 
@@ -778,7 +784,7 @@ public <T> void visitCtFieldWrite(CtFieldWrite<T> fieldWrite) {
  private <T> void printCtFieldAccess(CtFieldAccess<T> f) {
  enterCtExpression(f);
  try (Writable _context = context.modify()) {
- if (f.getVariable().isStatic() && f.getTarget() instanceof CtTypeAccess) {
+ if ((f.getVariable().isStatic() || "class".equals(f.getVariable().getSimpleName())) && f.getTarget() instanceof CtTypeAccess) {
  _context.ignoreGenerics(true);
  }
  CtExpression<?> target = f.getTarget();
@@ -1374,7 +1380,12 @@ public <T> void visitCtLambda(CtLambda<T> lambda) {
  @Override
  public <T, E extends CtExpression<?>> void visitCtExecutableReferenceExpression(CtExecutableReferenceExpression<T, E> expression) {
  enterCtExpression(expression);
- scan(expression.getTarget());
+ try (Writable _context = context.modify()) {
+ if (expression.getExecutable().isStatic()) {
+ _context.ignoreGenerics(true);
+ }
+ scan(expression.getTarget());
+ }
  printer.write("::");
  if (expression.getExecutable().isConstructor()) {
  printer.write("new");

src/main/java/spoon/reflect/visitor/ElementPrinterHelper.java

@@ -232,7 +232,11 @@ public void writeActualTypeArguments(CtActualTypeContainer ctGenericElementRefer
  for (CtTypeReference<?> argument : arguments) {
  if (!argument.isImplicit()) {
  lp.printSeparatorIfAppropriate();
- prettyPrinter.scan(argument);
+ if (prettyPrinter.context.forceWildcardGenerics()) {
+ printer.write('?');
+ } else {
+ prettyPrinter.scan(argument);
+ }
  }
  }
  }

src/main/java/spoon/reflect/visitor/PrintingContext.java

@@ -31,6 +31,7 @@ public class PrintingContext {
  private long SKIP_ARRAY = 1 << 2;
  private long IGNORE_STATIC_ACCESS = 1 << 3;
  private long IGNORE_ENCLOSING_CLASS = 1 << 4;
+ private long FORCE_WILDCARD_GENERICS = 1 << 5;
 
  private long state;
 
@@ -49,6 +50,9 @@ public boolean ignoreStaticAccess() {
  public boolean ignoreEnclosingClass() {
  return (state & IGNORE_ENCLOSING_CLASS) != 0L;
  }
+ public boolean forceWildcardGenerics() {
+ return (state & FORCE_WILDCARD_GENERICS) != 0L;
+ }
 
  public class Writable implements AutoCloseable {
  private long oldState;
@@ -81,6 +85,10 @@ public <T extends Writable> T ignoreEnclosingClass(boolean v) {
  setState(IGNORE_ENCLOSING_CLASS, v);
  return (T) this;
  }
+ public <T extends Writable> T forceWildcardGenerics(boolean v) {
+ setState(FORCE_WILDCARD_GENERICS, v);
+ return (T) this;
+ }
  private void setState(long mask, boolean v) {
  state = v ? state | mask : state & ~mask;
  }

src/test/java/spoon/test/template/TemplateTest.java

@@ -1041,5 +1041,9 @@ public void substituteTypeAccessReference() throws Exception {
  assertEquals("spoon.test.template.TypeReferenceClassAccess.Example<java.util.Date>", method.getParameters().get(0).getType().toString());
  assertEquals("o = spoon.test.template.TypeReferenceClassAccess.Example.out", method.getBody().getStatement(0).toString());
  assertEquals("spoon.test.template.TypeReferenceClassAccess.Example<java.util.Date> ret = new spoon.test.template.TypeReferenceClassAccess.Example<java.util.Date>()", method.getBody().getStatement(1).toString());
+ assertEquals("o = spoon.test.template.TypeReferenceClassAccess.Example.currentTimeMillis()", method.getBody().getStatement(2).toString());
+ assertEquals("o = spoon.test.template.TypeReferenceClassAccess.Example.class", method.getBody().getStatement(3).toString());
+ assertEquals("o = (o) instanceof spoon.test.template.TypeReferenceClassAccess.Example<?>", method.getBody().getStatement(4).toString());
+ assertEquals("java.util.function.Supplier<java.lang.Long> p = spoon.test.template.TypeReferenceClassAccess.Example::currentTimeMillis", method.getBody().getStatement(5).toString());
  }
 }

src/test/java/spoon/test/template/testclasses/TypeReferenceClassAccessTemplate.java

@@ -1,5 +1,7 @@
 package spoon.test.template.testclasses;
 
+import java.util.function.Supplier;
+
 import spoon.reflect.reference.CtTypeReference;
 import spoon.template.ExtensionTemplate;
 import spoon.template.Local;
@@ -11,6 +13,10 @@ public class TypeReferenceClassAccessTemplate extends ExtensionTemplate {
  $Type$ someMethod($Type$ param) {
  o = $Type$.out;
  $Type$ ret = new $Type$();
+ o = $Type$.currentTimeMillis();
+ o = $Type$.class;
+ o = o instanceof $Type$;
+ Supplier<Long> p = $Type$::currentTimeMillis;
  return ret;
  }