Allow calling extension methods on this as receiver

AUTHORS

@@ -13,6 +13,7 @@ Christoph Dreis <[email protected]>
 DaveLaw <[email protected]>
 Dave Brosius <[email protected]>
 Dawid Rusin <[email protected]>
+Demian Banakh <[email protected]>
 Denis Stepanov <[email protected]>
 Emil Lundberg <[email protected]>
 Enrique da Costa Cambio <[email protected]>

src/core/lombok/javac/handlers/HandleExtensionMethod.java

@@ -171,7 +171,8 @@ private void handleMethodCall(final JCMethodInvocation methodCall) {
 			JCExpression receiver = receiverOf(methodCall);
 			String methodName = methodNameOf(methodCall);
 
-			if ("this".equals(receiver.toString()) || "this".equals(methodName) || "super".equals(methodName)) return;
+			if ("this".equals(receiver.toString()) && isImplicitReceiver(methodCall)) return;
+			if ("this".equals(methodName) || "super".equals(methodName)) return;
 			Map<JCTree, JCTree> resolution = new JavacResolution(methodCallNode.getContext()).resolveMethodMember(methodCallNode);
 
 			JCTree resolvedMethodCall = resolution.get(methodCall);
@@ -224,5 +225,9 @@ private JCExpression receiverOf(final JCMethodInvocation methodCall) {
 				return ((JCFieldAccess) methodCall.meth).selected;
 			}
 		}
+
+		private boolean isImplicitReceiver(final JCMethodInvocation methodCall) {
+			return methodCall.meth instanceof JCIdent;
+		}
 	}
 }

test/transform/resource/after-delombok/ExtensionMethodThis.java

@@ -0,0 +1,14 @@
+class ExtensionMethodThis {
+	public void test() {
+		ExtensionMethodThis.Extensions.hello(this);
+		hello();
+	}
+
+	private void hello() {
+	}
+
+	static class Extensions {
+		public static void hello(ExtensionMethodThis self) {	
+		}
+	}
+}

test/transform/resource/after-ecj/ExtensionMethodThis.java

@@ -0,0 +1,19 @@
+import lombok.experimental.ExtensionMethod;
+@ExtensionMethod(ExtensionMethodThis.Extensions.class) class ExtensionMethodThis {
+  static class Extensions {
+    Extensions() {
+      super();
+    }
+    public static void hello(ExtensionMethodThis self) {
+    }
+  }
+  ExtensionMethodThis() {
+    super();
+  }
+  public void test() {
+    ExtensionMethodThis.Extensions.hello(this);
+    hello();
+  }
+  private void hello() {
+  }
+}

test/transform/resource/before/ExtensionMethodThis.java

@@ -0,0 +1,17 @@
+import lombok.experimental.ExtensionMethod;
+
+@ExtensionMethod(ExtensionMethodThis.Extensions.class)
+class ExtensionMethodThis {
+	public void test() {
+		this.hello();
+		hello();
+	}
+
+	private void hello() {
+	}
+
+	static class Extensions {
+		public static void hello(ExtensionMethodThis self) {
+		}
+	}
+}