You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/04/09 03:12:51 UTC
[groovy] branch master updated: GROOVY-9008: fix merge glitch
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new efc90a1 GROOVY-9008: fix merge glitch
efc90a1 is described below
commit efc90a199a7d53516c47e1a8c6e90e064a31daf8
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Apr 9 13:12:43 2019 +1000
GROOVY-9008: fix merge glitch
---
.../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 18a42a3..cef2fce 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -686,8 +686,8 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
ClassNode actualType =
findActualTypeByGenericsPlaceholderName(
- fieldNode.getOriginType().getUnresolvedName(),
- makeDeclaringAndActualGenericsTypeMap(fieldNode.getDeclaringClass(), typeCheckingContext.getEnclosingClassNode())
+ fieldNode.getOriginType().getUnresolvedName(),
+ makeDeclaringAndActualGenericsTypeMap(fieldNode.getDeclaringClass(), typeCheckingContext.getEnclosingClassNode())
);
if (null != actualType) {
@@ -3628,7 +3628,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
}
}
-// inferMethodReferenceType(call, receiver, argumentList);
+ inferMethodReferenceType(call, receiver, argumentList);
} finally {
typeCheckingContext.popEnclosingMethodCall();
extension.afterMethodCall(call);