lahodaj commented on code in PR #6658:
URL: https://github.com/apache/netbeans/pull/6658#discussion_r1406200083
##########
java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToLambdaPreconditionChecker.java:
##########
@@ -137,9 +137,48 @@ private MethodTree
getMethodFromFunctionalInterface(TreePath pathToNewClassTree)
candidate = (MethodTree)member;
}
}
+ // default methods can't be implemented with a lambda
+ ExecutableElement candidateElement = (ExecutableElement)
info.getTrees().getElement(new TreePath(pathToNewClassTree, candidate));
+ if (overridesDefaultMethod(candidateElement, (TypeElement)
baseElement)) {
+ return null;
+ }
return candidate;
}
+ private boolean overridesDefaultMethod(ExecutableElement method,
TypeElement superType) {
+ Boolean overrides = overridesDefaultMethodImpl(method, superType);
+ return overrides != null && overrides;
+ }
+
+ private Boolean overridesDefaultMethodImpl(ExecutableElement method,
TypeElement superType) {
+ List<? extends VariableElement> methodParams = method.getParameters();
+ for (Element e : superType.getEnclosedElements()) {
+ if (e.getKind() == ElementKind.METHOD &&
method.getSimpleName().equals(e.getSimpleName())
+ && parameterTypesMatch(methodParams, ((ExecutableElement)
e).getParameters())) {
+ return e.getModifiers().contains(Modifier.DEFAULT);
+ }
+ }
+ for (TypeMirror otherType : superType.getInterfaces()) {
+ Boolean overrides = overridesDefaultMethodImpl(method,
(TypeElement) types.asElement(otherType));
+ if (overrides != null) {
+ return overrides;
+ }
+ }
+ return null; // no match here but check the rest of the interface tree
+ }
Review Comment:
Yes, I believe the cycle is broken somewhere.
##########
java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToLambdaPreconditionChecker.java:
##########
@@ -137,9 +137,48 @@ private MethodTree
getMethodFromFunctionalInterface(TreePath pathToNewClassTree)
candidate = (MethodTree)member;
}
}
+ // default methods can't be implemented with a lambda
+ ExecutableElement candidateElement = (ExecutableElement)
info.getTrees().getElement(new TreePath(pathToNewClassTree, candidate));
+ if (overridesDefaultMethod(candidateElement, (TypeElement)
baseElement)) {
+ return null;
+ }
return candidate;
}
+ private boolean overridesDefaultMethod(ExecutableElement method,
TypeElement superType) {
+ Boolean overrides = overridesDefaultMethodImpl(method, superType);
+ return overrides != null && overrides;
+ }
+
+ private Boolean overridesDefaultMethodImpl(ExecutableElement method,
TypeElement superType) {
+ List<? extends VariableElement> methodParams = method.getParameters();
+ for (Element e : superType.getEnclosedElements()) {
+ if (e.getKind() == ElementKind.METHOD &&
method.getSimpleName().equals(e.getSimpleName())
+ && parameterTypesMatch(methodParams, ((ExecutableElement)
e).getParameters())) {
Review Comment:
Hm, I wonder if we can use `Elements.overrides` to find tell if this method
overrides a method from a superinterface. Should subsume the name check, the
parameters check, and some others.
##########
java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToLambdaPreconditionChecker.java:
##########
@@ -137,9 +137,48 @@ private MethodTree
getMethodFromFunctionalInterface(TreePath pathToNewClassTree)
candidate = (MethodTree)member;
}
}
+ // default methods can't be implemented with a lambda
+ ExecutableElement candidateElement = (ExecutableElement)
info.getTrees().getElement(new TreePath(pathToNewClassTree, candidate));
+ if (overridesDefaultMethod(candidateElement, (TypeElement)
baseElement)) {
+ return null;
+ }
return candidate;
}
+ private boolean overridesDefaultMethod(ExecutableElement method,
TypeElement superType) {
+ Boolean overrides = overridesDefaultMethodImpl(method, superType);
+ return overrides != null && overrides;
+ }
+
+ private Boolean overridesDefaultMethodImpl(ExecutableElement method,
TypeElement superType) {
+ List<? extends VariableElement> methodParams = method.getParameters();
+ for (Element e : superType.getEnclosedElements()) {
Review Comment:
Side note: please see `javax.lang.model.util.ElementFilter.methodsIn`. That
filter methods out of the enclosed elements.
##########
java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToLambdaPreconditionChecker.java:
##########
@@ -137,9 +137,48 @@ private MethodTree
getMethodFromFunctionalInterface(TreePath pathToNewClassTree)
candidate = (MethodTree)member;
}
}
+ // default methods can't be implemented with a lambda
+ ExecutableElement candidateElement = (ExecutableElement)
info.getTrees().getElement(new TreePath(pathToNewClassTree, candidate));
Review Comment:
So, two comments here:
- should we rather check the method implements an abstract interface
method, rather than checking it is not default? (Meaning, if the method based
is not found, we don't try to do the conversion?)
- should this be moved to be part of `ensurePreconditionsAreChecked`? (And
then `passesAllPreconditions` and `passesFatalPreconditions`?)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
