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.

Sign up for GitHub

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

Jump to bottom

Reset inference context for extension methods #2658

Merged
merged 1 commit into from Dec 10, 2020
Merged

Reset inference context for extension methods #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012-2014 The Project Lombok Authors.
* Copyright (C) 2012-2020 The Project Lombok Authors.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -58,7 +58,6 @@
import org.eclipse.jdt.internal.compiler.lookup.Binding;
import org.eclipse.jdt.internal.compiler.lookup.BlockScope;
import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
import org.eclipse.jdt.internal.compiler.lookup.ParameterizedTypeBinding;
import org.eclipse.jdt.internal.compiler.lookup.ProblemMethodBinding;
import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
import org.eclipse.jdt.internal.compiler.lookup.Scope;
Expand Down Expand Up @@ -304,12 +303,13 @@ public static Object resolveType(Object resolvedType, MessageSend methodCall, Bl
argumentTypes.add(argumentType);
}

// Copy generic information. This one covers a few simple cases, more complex cases are still broken
int typeVariables = extensionMethod.typeVariables.length;
if (typeVariables > 0 && methodCall.receiver.resolvedType instanceof ParameterizedTypeBinding) {
ParameterizedTypeBinding parameterizedTypeBinding = (ParameterizedTypeBinding) methodCall.receiver.resolvedType;
if (parameterizedTypeBinding.arguments != null && parameterizedTypeBinding.arguments.length == typeVariables) {
methodCall.genericTypeArguments = parameterizedTypeBinding.arguments;
if (methodCall.receiver instanceof MessageSend) {
if (Reflection.inferenceContexts != null) {
try {
Permit.set(Reflection.inferenceContexts, methodCall.receiver, null);
} catch (IllegalAccessException ignore) {
// ignore
}
}
}

Expand Down Expand Up @@ -402,6 +402,7 @@ private static NameReference createNameRef(TypeBinding typeBinding, ASTNode sour
private static final class Reflection {
public static final Field argumentTypes = Permit.permissiveGetField(MessageSend.class, "argumentTypes");
public static final Field argumentsHaveErrors = Permit.permissiveGetField(MessageSend.class, "argumentsHaveErrors");
public static final Field inferenceContexts = Permit.permissiveGetField(MessageSend.class, "inferenceContexts");
private static final Class<?> functionalExpression;
private static final Constructor<?> polyTypeBindingConstructor;

Expand Down
15 changes: 14 additions & 1 deletion test/transform/resource/after-delombok/ExtensionMethodFunctional.java
View file
Open in desktop
@@ -1,12 +1,17 @@
import java.util.function.Function;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

class ExtensionMethodFunctional {
public void test() {
String test = "test";
test = ExtensionMethodFunctional.Extensions.map(test, s -> ExtensionMethodFunctional.Extensions.reverse(s));
ExtensionMethodFunctional.Extensions.consume(test, s -> System.out.println("1: " + s), s -> System.out.println("2: " + s));
ExtensionMethodFunctional.Extensions.consume(test, System.out::println, System.out::println);
ExtensionMethodFunctional.Extensions.toList(Stream.of("a", "b", "c").map(String::toUpperCase));
List<Integer> i2 = ExtensionMethodFunctional.Extensions.toList2(Stream.of("a", "b", "c").map(String::toUpperCase));
}

static class Extensions {
Expand All @@ -24,5 +29,13 @@ public static <T> void consume(T o, Consumer<T>... consumer) {
consumer[i].accept(o);
}
}

public static <T> List<T> toList(Stream<T> stream) {
return (List<T>) stream.collect(Collectors.toList());
}

public static <T, U> List<U> toList2(Stream<T> stream) {
return null;
}
}
}
33 changes: 33 additions & 0 deletions test/transform/resource/after-delombok/ExtensionMethodGeneric.java
View file
Open in desktop
@@ -0,0 +1,33 @@
import java.util.List;
import java.util.Map;

class ExtensionMethodGeneric {
public void test() {
List<String> stringList = null;
List<Number> numberList = null;
ExtensionMethodGeneric.Extensions.test(stringList);
ExtensionMethodGeneric.Extensions.test(stringList, numberList);
ExtensionMethodGeneric.Extensions.test(ExtensionMethodGeneric.Extensions.test(stringList, stringList), numberList);
Integer i = ExtensionMethodGeneric.Extensions.test2(stringList);
Map<String, Integer> map = null;
List<String> l = ExtensionMethodGeneric.Extensions.test(map, stringList, numberList);
}

static class Extensions {
public static <T> List<T> test(List<String> obj, List<T> list) {
return null;
}

public static <K, V> K test(Map<String, Integer> obj, K k, V v) {
return k;
}

public static <T> T test(List<T> list) {
return null;
}

public static <T, U> U test2(List<T> list) {
return null;
}
}
}
15 changes: 13 additions & 2 deletions test/transform/resource/after-ecj/ExtensionMethodFunctional.java
View file
Open in desktop
@@ -1,7 +1,10 @@
import java.util.function.Function;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.experimental.ExtensionMethod;
@ExtensionMethod(ExtensionMethodFunctional.Extensions.class) class ExtensionMethodFunctional {
@ExtensionMethod(value = ExtensionMethodFunctional.Extensions.class,suppressBaseMethods = false) class ExtensionMethodFunctional {
static class Extensions {
Extensions() {
super();
Expand All @@ -18,6 +21,12 @@ public static String reverse(String string) {
consumer[i].accept(o);
}
}
public static <T>List<T> toList(Stream<T> stream) {
return (List<T>) stream.collect(Collectors.toList());
}
public static <T, U>List<U> toList2(Stream<T> stream) {
return null;
}
}
ExtensionMethodFunctional() {
super();
Expand All @@ -27,5 +36,7 @@ public void test() {
test = ExtensionMethodFunctional.Extensions.map(test, (<no type> s) -> ExtensionMethodFunctional.Extensions.reverse(s));
ExtensionMethodFunctional.Extensions.consume(test, (<no type> s) -> System.out.println(("1: " + s)), (<no type> s) -> System.out.println(("2: " + s)));
ExtensionMethodFunctional.Extensions.consume(test, System.out::println, System.out::println);
ExtensionMethodFunctional.Extensions.toList(Stream.of("a", "b", "c").map(String::toUpperCase));
List<Integer> i2 = ExtensionMethodFunctional.Extensions.toList2(Stream.of("a", "b", "c").map(String::toUpperCase));
}
}
35 changes: 35 additions & 0 deletions test/transform/resource/after-ecj/ExtensionMethodGeneric.java
View file
Open in desktop
@@ -0,0 +1,35 @@
import java.util.List;
import java.util.Map;
import lombok.experimental.ExtensionMethod;
@ExtensionMethod(ExtensionMethodGeneric.Extensions.class) class ExtensionMethodGeneric {
static class Extensions {
Extensions() {
super();
}
public static <T>List<T> test(List<String> obj, List<T> list) {
return null;
}
public static <K, V>K test(Map<String, Integer> obj, K k, V v) {
return k;
}
public static <T>T test(List<T> list) {
return null;
}
public static <T, U>U test2(List<T> list) {
return null;
}
}
ExtensionMethodGeneric() {
super();
}
public void test() {
List<String> stringList = null;
List<Number> numberList = null;
ExtensionMethodGeneric.Extensions.test(stringList);
ExtensionMethodGeneric.Extensions.test(stringList, numberList);
ExtensionMethodGeneric.Extensions.test(ExtensionMethodGeneric.Extensions.test(stringList, stringList), numberList);
Integer i = ExtensionMethodGeneric.Extensions.test2(stringList);
Map<String, Integer> map = null;
List<String> l = ExtensionMethodGeneric.Extensions.test(map, stringList, numberList);
}
}
18 changes: 16 additions & 2 deletions test/transform/resource/before/ExtensionMethodFunctional.java
View file
Open in desktop
@@ -1,17 +1,23 @@
// version 8:
import java.util.function.Function;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import lombok.experimental.ExtensionMethod;

@ExtensionMethod(ExtensionMethodFunctional.Extensions.class)
@ExtensionMethod(value = ExtensionMethodFunctional.Extensions.class, suppressBaseMethods = false)
class ExtensionMethodFunctional {
public void test() {
String test = "test";
test = test.map(s -> s.reverse());

test.consume(s -> System.out.println("1: " + s), s -> System.out.println("2: " + s));
test.consume(System.out::println, System.out::println);

Stream.of("a", "b", "c").map(String::toUpperCase).toList();
List<Integer> i2 = Stream.of("a", "b", "c").map(String::toUpperCase).toList2();
}

static class Extensions {
Expand All @@ -29,5 +35,13 @@ public static <T> void consume(T o, Consumer<T>... consumer) {
consumer[i].accept(o);
}
}

public static <T> List<T> toList(Stream<T> stream) {
return (List<T>) stream.collect(Collectors.toList());
}

public static <T, U> List<U> toList2(Stream<T> stream) {
return null;
}
}
}
34 changes: 34 additions & 0 deletions test/transform/resource/before/ExtensionMethodGeneric.java
View file
Open in desktop
@@ -0,0 +1,34 @@
import java.util.List;
import java.util.Map;

import lombok.experimental.ExtensionMethod;

@ExtensionMethod(ExtensionMethodGeneric.Extensions.class)
class ExtensionMethodGeneric {
public void test() {
List<String> stringList = null;
List<Number> numberList = null;
stringList.test();
stringList.test(numberList);
stringList.test(stringList).test(numberList);
Integer i = stringList.test2();

Map<String, Integer> map = null;
List<String> l = map.test(stringList, numberList);
}

static class Extensions {
public static <T> List<T> test(List<String> obj, List<T> list) {
return null;
}
public static <K,V> K test(Map<String, Integer> obj, K k, V v) {
return k;
}
public static <T> T test(List<T> list) {
return null;
}
public static <T,U> U test2(List<T> list) {
return null;
}
}
}