Use TextRange

Author: elegoff

src/main/java/org/elegoff/plugins/rust/externalreport/clippy/ClippyJsonReportReader.java

@@ -2,12 +2,11 @@
 
 import javax.annotation.Nullable;
 import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.ArrayList;
 import java.util.stream.Stream;
 import java.util.function.Consumer;
+
+import org.sonar.api.utils.log.Logger;
+import org.sonar.api.utils.log.Loggers;
 import org.sonarsource.analyzer.commons.internal.json.simple.JSONArray;
 import org.sonarsource.analyzer.commons.internal.json.simple.JSONObject;
 import org.sonarsource.analyzer.commons.internal.json.simple.parser.JSONParser;
@@ -18,6 +17,7 @@
 public class ClippyJsonReportReader {
     private final JSONParser jsonParser = new JSONParser();
     private final Consumer<Issue> consumer;
+    private static final Logger LOG = Loggers.get(ClippyJsonReportReader.class);
 
     public static class Issue {
         @Nullable
@@ -31,6 +31,10 @@ public static class Issue {
         @Nullable
         Integer lineNumberEnd;
         @Nullable
+        Integer colNumberStart;
+        @Nullable
+        Integer colNumberEnd;
+        @Nullable
         String severity;
     }
 
@@ -59,7 +63,7 @@ private void onResult(JSONObject result) {
         if (code == null) return;
         issue.ruleKey = (String) code.get("code");
 
-        System.out.println("[ELG] rule found : " + issue.ruleKey);
+       LOG.debug("Clippy rule found : " + issue.ruleKey);
 
 
         JSONArray spans = (JSONArray) message.get("spans");
@@ -70,8 +74,10 @@ private void onResult(JSONObject result) {
 
         issue.message = (String) message.get("message");
 
-        issue.lineNumberStart = toInteger(span.get("line_start"));
+        issue.lineNumberStart = toInteger(span.get("line_start")) ;
         issue.lineNumberEnd = toInteger(span.get("line_end"));
+        issue.colNumberStart = toInteger(span.get("column_start"));
+        issue.colNumberEnd = toInteger(span.get("column_end")) ;
 
         issue.severity = (String) message.get("level");
 

src/main/java/org/elegoff/plugins/rust/externalreport/clippy/ClippySensor.java

@@ -104,7 +104,7 @@ private static void saveIssue(SensorContext context, ClippyJsonReportReader.Issu
             .on(inputFile);
 
     if (issue.lineNumberStart != null) {
-      primaryLocation.at(inputFile.selectLine(issue.lineNumberStart));
+      primaryLocation.at(inputFile.newRange(issue.lineNumberStart, issue.colNumberStart -1, issue.lineNumberEnd , issue.colNumberEnd -1));
     }
 
     newExternalIssue.at(primaryLocation);
@@ -114,11 +114,20 @@ private static void saveIssue(SensorContext context, ClippyJsonReportReader.Issu
 
   private static Severity toSonarQubeSeverity(String severity) {
     if ("error".equalsIgnoreCase(severity)) {
-      return  Severity.CRITICAL;
-    } else if ("MEDIUM".equalsIgnoreCase(severity)) {
       return Severity.MAJOR;
-    } else {
+    } else
       return Severity.MINOR;
+  }
+
+
+
+  private static RuleType toSonarQubeType(String severity) {
+    if ("error".equalsIgnoreCase(severity)) {
+      return RuleType.BUG;
+    } else if ("help".equalsIgnoreCase(severity)) {
+      return RuleType.CODE_SMELL;
+    } else {
+      return RuleType.CODE_SMELL;
     }
   }
 

src/main/resources/org/sonar/plugins/rust/clippy/rules.json

@@ -21,12 +21,12 @@
   },
   {
     "key": "clippy::assertions_on_constants",
-    "name": "TODO",
+    "name": "Checks for assert!(true) and assert!(false) calls.",
     "url": "https://rust-lang.github.io/rust-clippy/master/index.html#assertions_on_constants"
   },
   {
     "key": "clippy::assign_op_pattern",
-    "name": "TODO",
+    "name": "Checks for a = a op b or a = b commutative_op a patterns.",
     "url": "https://rust-lang.github.io/rust-clippy/master/index.html#assign_op_pattern"
   },
   {

src/test/java/org/elegoff/plugins/rust/externalreport/clippy/ClippySensorTest.java

@@ -60,7 +60,7 @@ public void issues_with_sonarqube() throws IOException {
         ExternalIssue first = externalIssues.get(0);
         assertThat(first.ruleKey().toString()).isEqualTo(CLIPPY_AEC);
         assertThat(first.type()).isEqualTo(RuleType.CODE_SMELL);
-        assertThat(first.severity()).isEqualTo(Severity.CRITICAL);
+        assertThat(first.severity()).isEqualTo(Severity.MAJOR);
         IssueLocation firstPrimaryLoc = first.primaryLocation();
         assertThat(firstPrimaryLoc.inputComponent().key()).isEqualTo(CLIPPY_FILE);
         assertThat(firstPrimaryLoc.message())
@@ -73,7 +73,7 @@ public void issues_with_sonarqube() throws IOException {
         ExternalIssue second = externalIssues.get(1);
         assertThat(second.ruleKey().toString()).isEqualTo("external_clippy:clippy::absurd_extreme_comparisons");
         assertThat(second.type()).isEqualTo(RuleType.CODE_SMELL);
-        assertThat(second.severity()).isEqualTo(Severity.CRITICAL);
+        assertThat(second.severity()).isEqualTo(Severity.MAJOR);
         IssueLocation secondPrimaryLoc = second.primaryLocation();
         assertThat(secondPrimaryLoc.inputComponent().key()).isEqualTo(CLIPPY_FILE);
         assertThat(secondPrimaryLoc.message()).isEqualTo("this comparison involving the minimum or maximum element for this type contains a case that is always true or always false");
@@ -117,7 +117,7 @@ public void clippy_report_with_unknown_rule_key() throws IOException {
     public static void assertNoErrorWarnDebugLogs(LogTester logTester) {
         org.assertj.core.api.Assertions.assertThat(logTester.logs(LoggerLevel.ERROR)).isEmpty();
         org.assertj.core.api.Assertions.assertThat(logTester.logs(LoggerLevel.WARN)).isEmpty();
-        org.assertj.core.api.Assertions.assertThat(logTester.logs(LoggerLevel.DEBUG)).isEmpty();
+        //org.assertj.core.api.Assertions.assertThat(logTester.logs(LoggerLevel.DEBUG)).isEmpty();
     }
 
     private static List<ExternalIssue> executeSensorImporting(int majorVersion, int minorVersion, @Nullable String fileName) throws IOException {