honor both /* param */ and // param

Author: fluentfuture

mug-errorprone/src/main/java/com/google/mu/errorprone/ParametersMustMatchByNameCheck.java

@@ -48,7 +48,8 @@ public final class ParametersMustMatchByNameCheck extends AbstractBugChecker
     implements AbstractBugChecker.MethodInvocationCheck, AbstractBugChecker.ConstructorCallCheck {
   private static final String ANNOTATION_NAME =
       "com.google.mu.annotations.ParametersMustMatchByName";
-  private static final Substring.Pattern ARG_COMMENT = Substring.spanningInOrder("/*", "*/");
+  private static final Substring.Pattern ARG_COMMENT =
+	      Substring.spanningInOrder("/*", "*/").or(Substring.spanningInOrder("//", "\n"));
 
   @Override public void checkConstructorCall(NewClassTree tree, VisitorState state)
       throws ErrorReport {
@@ -74,9 +75,6 @@ private void checkParameters(
       List<String> argSources,
       VisitorState state)
       throws ErrorReport {
-    if (method == null) {
-      return;
-    }
     if (!isEffectivelyAnnotated(method, state)) {
         return;
     }

mug-errorprone/src/test/java/com/google/mu/errorprone/ParametersMustMatchByNameCheckTest.java

@@ -228,6 +228,24 @@ public void onMethod_literalOnOneArg_incorrectComment_fails() {
         .doTest();
   }
 
+  @Test
+  public void onMethod_literalOnOneArg_incorrectTrailingComment_fails() {
+    helper
+        .addSourceLines(
+            "Test.java",
+            "import com.google.mu.annotations.ParametersMustMatchByName;",
+            "class Test {",
+            "  @ParametersMustMatchByName",
+            "  void test(int width) {}",
+            "  void callSite() {",
+            "    test(",
+            "        // BUG: Diagnostic contains: must match",
+            "        100); // height",
+            "  }",
+            "}")
+        .doTest();
+  }
+
   @Test
   public void onMethod_literalOnTwoArgsOfSameType_fails() {
     helper
@@ -1043,4 +1061,19 @@ public void onPackage_argsInCorrectOrder_succeeds() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void onUnannotatedMethod_argsInWrongOrder_succeeds() {
+    helper
+        .addSourceLines(
+            "Test.java",
+            "import com.google.mu.annotations.ParametersMustMatchByName;",
+            "class Test {",
+            "  void test(int width, int height) {}",
+            "  void callSite(int height, int width) {",
+            "    test(height, width);",
+            "  }",
+            "}")
+        .doTest();
+  }
 }