Speed up highlighting on batch side

diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java b/sonar-batch/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java
index f73c35c06793aa1a4057bf4a51652ad0d3289683..63109a53d853b588b084fd8cace01cea7e157d57 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java
@@ -231,8 +231,6 @@ public class DefaultSensorStorage implements SensorStorage {
 
         @Override
         public BatchReport.SyntaxHighlighting apply(SyntaxHighlightingRule input) {
-          builder.clear();
-          rangeBuilder.clear();
           builder.setRange(rangeBuilder.setStartLine(input.range().start().line())
             .setStartOffset(input.range().start().lineOffset())
             .setEndLine(input.range().end().line())

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java
index 5190bb1a0f1844114da6229b54e3d04bafab5a15..62f96db4ff9461589e196e808652af35e1743f82 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java
@@ -227,6 +227,10 @@ public class DefaultInputFile implements InputFile {
   public TextRange newRange(TextPointer start, TextPointer end) {
     checkValid(start, "start pointer");
     checkValid(end, "end pointer");
+    return newRangeValidPointers(start, end);
+  }
+
+  private TextRange newRangeValidPointers(TextPointer start, TextPointer end) {
     Preconditions.checkArgument(start.compareTo(end) < 0, "Start pointer %s should be before end pointer %s", start, end);
     return new DefaultTextRange(start, end);
   }
@@ -235,7 +239,7 @@ public class DefaultInputFile implements InputFile {
    * Create Range from global offsets. Used for backward compatibility with older API.
    */
   public TextRange newRange(int startOffset, int endOffset) {
-    return newRange(newPointer(startOffset), newPointer(endOffset));
+    return newRangeValidPointers(newPointer(startOffset), newPointer(endOffset));
   }
 
   public TextPointer newPointer(int globalOffset) {