handle explicit this

palantir · May 29, 2020 · 9ac79db · carterkozak · May 29, 2020 · 9ac79db
1 parent c7fa4b0
commit 9ac79db
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/...ine-error-prone/src/main/java/com/palantir/baseline/errorprone/LambdaMethodReference.java b/...ine-error-prone/src/main/java/com/palantir/baseline/errorprone/LambdaMethodReference.java
@@ -120,7 +120,7 @@ private Description convertSuppliersAndVariableInstanceMethods(
         }
 
         ExpressionTree receiver = ASTHelpers.getReceiver(methodInvocation);
-        boolean isLocal = receiver == null;
+        boolean isLocal = isLocal(methodInvocation);
         if (!isLocal && !(receiver instanceof IdentifierTree)) {
             return Description.NO_MATCH;
         }
@@ -145,10 +145,9 @@ private Description convertMethodInvocations(
             return Description.NO_MATCH;
         }
 
-        boolean isLocal = ASTHelpers.getReceiver(methodInvocation) == null;
         return buildDescription(root)
                 .setMessage(MESSAGE)
-                .addFix(buildFix(methodSymbol, methodInvocation, root, state, isLocal))
+                .addFix(buildFix(methodSymbol, methodInvocation, root, state, isLocal(methodInvocation)))
                 .build();
     }
 
@@ -197,4 +196,11 @@ private static Optional<String> toMethodReference(String qualifiedMethodName) {
         }
         return Optional.empty();
     }
+
+    private static boolean isLocal(MethodInvocationTree methodInvocationTree) {
+        ExpressionTree receiver = ASTHelpers.getReceiver(methodInvocationTree);
+        return receiver == null
+                || (receiver instanceof IdentifierTree
+                        && "this".equals(((IdentifierTree) receiver).getName().toString()));
+    }
 }
diff --git a/...error-prone/src/test/java/com/palantir/baseline/errorprone/LambdaMethodReferenceTest.java b/...error-prone/src/test/java/com/palantir/baseline/errorprone/LambdaMethodReferenceTest.java
@@ -280,6 +280,34 @@ void testAutoFix_localInstanceMethod() {
                 .doTest();
     }
 
+    @Test
+    void testAutoFix_localInstanceMethod_explicitThis() {
+        refactoringValidator
+                .addInputLines(
+                        "Test.java",
+                        "import " + Optional.class.getName() + ';',
+                        "class Test {",
+                        "  public Optional<String> foo(Optional<String> optional) {",
+                        "    return optional.map(v -> this.bar(v));",
+                        "  }",
+                        "  private String bar(String v) {",
+                        "    return v;",
+                        "  }",
+                        "}")
+                .addOutputLines(
+                        "Test.java",
+                        "import " + Optional.class.getName() + ';',
+                        "class Test {",
+                        "  public Optional<String> foo(Optional<String> optional) {",
+                        "    return optional.map(this::bar);",
+                        "  }",
+                        "  private String bar(String v) {",
+                        "    return v;",
+                        "  }",
+                        "}")
+                .doTest();
+    }
+
     @Test
     void testAutoFix_localStaticMethod() {
         refactoringValidator