Precise issue location for unused method parameters

Author: benzonico

its/ruling/src/test/resources/commons-beanutils/squid-S1172.json

@@ -1,6 +1,6 @@
 {
 'commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils/FluentPropertyBeanIntrospector.java':[
-175,
+176,
 ],
 'commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils/LazyDynaBean.java':[
 785,

its/ruling/src/test/resources/guava/squid-S1172.json

@@ -24,6 +24,6 @@
 2364,
 ],
 'com.google.guava:guava:src/com/google/common/escape/ArrayBasedUnicodeEscaper.java':[
-104,
+105,
 ],
 }

its/ruling/src/test/resources/java-squid/squid-S1172.json

@@ -3,7 +3,7 @@
 46,
 ],
 'org.sonarsource.java:java-squid:src/main/java/org/sonar/java/ast/parser/TreeFactory.java':[
-137,
+138,
 746,
 ],
 'org.sonarsource.java:java-squid:src/main/java/org/sonar/java/resolve/Resolve.java':[

its/ruling/src/test/resources/sonar-server/squid-S1172.json

@@ -2,13 +2,13 @@
 'org.codehaus.sonar:sonar-server:src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java':[
 313,
 321,
-336,
+337,
 ],
 'org.codehaus.sonar:sonar-server:src/main/java/org/sonar/server/db/BaseDao.java':[
 346,
 ],
 'org.codehaus.sonar:sonar-server:src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java':[
-50,
+51,
 ],
 'org.codehaus.sonar:sonar-server:src/main/java/org/sonar/server/issue/ws/SearchAction.java':[
 598,

java-checks/src/main/java/org/sonar/java/checks/UnusedMethodParameterCheck.java

@@ -19,7 +19,6 @@
  */
 package org.sonar.java.checks;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.BooleanUtils;
@@ -29,7 +28,9 @@
 import org.sonar.java.model.ModifiersUtils;
 import org.sonar.java.model.declaration.MethodTreeImpl;
 import org.sonar.java.tag.Tag;
+import org.sonar.plugins.java.api.JavaFileScannerContext;
 import org.sonar.plugins.java.api.tree.BlockTree;
+import org.sonar.plugins.java.api.tree.IdentifierTree;
 import org.sonar.plugins.java.api.tree.MethodTree;
 import org.sonar.plugins.java.api.tree.Modifier;
 import org.sonar.plugins.java.api.tree.Tree;
@@ -38,6 +39,7 @@
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
 import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Rule(
@@ -59,14 +61,19 @@ public List<Tree.Kind> nodesToVisit() {
   public void visitNode(Tree tree) {
     MethodTree methodTree = (MethodTree) tree;
     if (hasSemantic() && methodTree.block() != null && !isExcluded(methodTree)) {
-      List<String> unused = Lists.newArrayList();
+      List<IdentifierTree> unused = Lists.newArrayList();
       for (VariableTree var : methodTree.parameters()) {
         if (var.symbol().usages().isEmpty()) {
-          unused.add(var.simpleName().name());
+          unused.add(var.simpleName());
         }
       }
       if (!unused.isEmpty()) {
-        addIssue(methodTree, "Remove the unused method parameter(s) \"" + Joiner.on(",").join(unused) + "\".");
+        List<JavaFileScannerContext.Location> locations = new ArrayList<>();
+        for (IdentifierTree identifier : unused.subList(1, unused.size())) {
+          locations.add(new JavaFileScannerContext.Location("Remove this unused method parameter "+identifier.name()+"\".", identifier));
+        }
+        IdentifierTree firstUnused = unused.get(0);
+        reportIssue(firstUnused, "Remove this unused method parameter \"" + firstUnused.name() + "\".", locations, null);
       }
     }
   }

java-checks/src/test/files/checks/UnusedMethodParameterCheck.java

@@ -1,5 +1,5 @@
 class A extends B{
-  void doSomething(int a, int b) { // Noncompliant {{Remove the unused method parameter(s) "b".}}
+  void doSomething(int a, int b) { // Noncompliant {{Remove this unused method parameter "b".}} [[sc=31;ec=32]]
     compute(a);
   }
 
@@ -34,7 +34,7 @@ void foo(int a) {
 }
 
 class D extends C {
-  void foo(int b, int a) { // Noncompliant
+  void foo(int b, int a) { // Noncompliant {{Remove this unused method parameter "b".}} [[sc=16;ec=17;secondary=37]]
     System.out.println("");
   }
 }
@@ -89,6 +89,11 @@ private baz(int arg) { // Noncompliant
     //no-op
   }
 
+  // Noncompliant@+1
+  private qiz(int arg1, int arg2) {
+
+  }
+
   public Supplier<String> parameterNotUsed(final Object o) {
     return o::toString;
   }