From d42a6fe40eacd8aca9697adda0eed61f66ab7d6c Mon Sep 17 00:00:00 2001
From: Rawi01 <Rawi01@users.noreply.github.com>
Date: Sun, 7 Feb 2021 21:22:07 +0100
Subject: [fixes #2741] Handle inner method invocations first

---
 .../lombok/javac/handlers/HandleExtensionMethod.java  |  5 +++--
 .../resource/after-delombok/ExtensionMethodChain.java | 15 +++++++++++++++
 .../resource/after-ecj/ExtensionMethodChain.java      | 19 +++++++++++++++++++
 .../resource/before/ExtensionMethodChain.java         | 17 +++++++++++++++++
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 test/transform/resource/after-delombok/ExtensionMethodChain.java
 create mode 100644 test/transform/resource/after-ecj/ExtensionMethodChain.java
 create mode 100644 test/transform/resource/before/ExtensionMethodChain.java

diff --git a/src/core/lombok/javac/handlers/HandleExtensionMethod.java b/src/core/lombok/javac/handlers/HandleExtensionMethod.java
index bda8c93a..8d42a82d 100644
--- a/src/core/lombok/javac/handlers/HandleExtensionMethod.java
+++ b/src/core/lombok/javac/handlers/HandleExtensionMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 The Project Lombok Authors.
+ * Copyright (C) 2012-2021 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
@@ -152,8 +152,9 @@ public class HandleExtensionMethod extends JavacAnnotationHandler<ExtensionMetho
 		
 		@Override
 		public Void visitMethodInvocation(final MethodInvocationTree tree, final Void p) {
+			super.visitMethodInvocation(tree, p);
 			handleMethodCall((JCMethodInvocation) tree);
-			return super.visitMethodInvocation(tree, p);
+			return null;
 		}
 		
 		private void handleMethodCall(final JCMethodInvocation methodCall) {
diff --git a/test/transform/resource/after-delombok/ExtensionMethodChain.java b/test/transform/resource/after-delombok/ExtensionMethodChain.java
new file mode 100644
index 00000000..77f79dea
--- /dev/null
+++ b/test/transform/resource/after-delombok/ExtensionMethodChain.java
@@ -0,0 +1,15 @@
+import java.util.Arrays;
+import java.util.List;
+
+class ExtensionMethodChain {
+	public void test() {
+		ExtensionMethodChain.Extensions.intValue("1").intValue();
+	}
+
+
+	static class Extensions {
+		public static Integer intValue(String s) {
+			return Integer.valueOf(s);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ExtensionMethodChain.java b/test/transform/resource/after-ecj/ExtensionMethodChain.java
new file mode 100644
index 00000000..8eda4bf8
--- /dev/null
+++ b/test/transform/resource/after-ecj/ExtensionMethodChain.java
@@ -0,0 +1,19 @@
+import java.util.Arrays;
+import java.util.List;
+import lombok.experimental.ExtensionMethod;
+@ExtensionMethod(ExtensionMethodChain.Extensions.class) class ExtensionMethodChain {
+  static class Extensions {
+    Extensions() {
+      super();
+    }
+    public static Integer intValue(String s) {
+      return Integer.valueOf(s);
+    }
+  }
+  ExtensionMethodChain() {
+    super();
+  }
+  public void test() {
+    ExtensionMethodChain.Extensions.intValue("1").intValue();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ExtensionMethodChain.java b/test/transform/resource/before/ExtensionMethodChain.java
new file mode 100644
index 00000000..f7960ed4
--- /dev/null
+++ b/test/transform/resource/before/ExtensionMethodChain.java
@@ -0,0 +1,17 @@
+import java.util.Arrays;
+import java.util.List;
+import lombok.experimental.ExtensionMethod;
+
+@ExtensionMethod(ExtensionMethodChain.Extensions.class)
+class ExtensionMethodChain {
+	
+	public void test() {
+		"1".intValue().intValue();
+	}
+	
+	static class Extensions {
+		public static Integer intValue(String s) {
+			return Integer.valueOf(s);
+		}
+	}
+}
-- 
cgit