SONAR-11238 Xoo plugin supports recent symbol/highlighting location

2 files changed, 60 insertions, 22 deletions

diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java
index d3882c3f15b..ea70128377a 100644
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java
@@ -24,6 +24,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.batch.fs.InputFile;
@@ -36,6 +37,8 @@ import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.xoo.Xoo;
 
+import static java.lang.Integer.parseInt;
+
 /**
  * Parse files *.xoo.symbol
  */
@@ -72,31 +75,55 @@ public class SymbolReferencesSensor implements Sensor {
   private static void processLine(File symbolFile, int lineNumber, NewSymbolTable symbolTable, String line) {
     try {
       Iterator<String> split = Splitter.on(",").split(line).iterator();
-      Iterator<String> symbolOffsets = Splitter.on(":").split(split.next()).iterator();
-
-      int startOffset = Integer.parseInt(symbolOffsets.next());
-      int endOffset = Integer.parseInt(symbolOffsets.next());
-      int defaultLen = endOffset - startOffset;
+      String[] symbolOffsets = split.next().split(":");
 
-      NewSymbol s = symbolTable.newSymbol(startOffset, endOffset);
-
-      while (split.hasNext()) {
-        addReference(s, split.next(), defaultLen);
+      if (symbolOffsets.length == 2) {
+        int startOffset = parseInt(symbolOffsets[0]);
+        int endOffset = parseInt(symbolOffsets[1]);
+        NewSymbol s = symbolTable.newSymbol(startOffset, endOffset);
+        parseReferences(s, split, endOffset - startOffset);
+      } else if (symbolOffsets.length == 4) {
+        int startLine = parseInt(symbolOffsets[0]);
+        int startLineOffset = parseInt(symbolOffsets[1]);
+        int endLine = parseInt(symbolOffsets[2]);
+        int endLineOffset = parseInt(symbolOffsets[3]);
+        NewSymbol s = symbolTable.newSymbol(startLine, startLineOffset, endLine, endLineOffset);
+        parseReferences(s, split, null);
+      } else {
+        throw new IllegalStateException("Illegal number of elements separated by ':'. " +
+          "Must either be startOffset:endOffset (offset in whole file) or startLine:startLineOffset:endLine:endLineOffset");
       }
     } catch (Exception e) {
       throw new IllegalStateException("Error processing line " + lineNumber + " of file " + symbolFile.getAbsolutePath(), e);
     }
   }
 
-  private static void addReference(NewSymbol s, String str, int defaultLen) {
-    if (str.contains(":")) {
-      Iterator<String> split = Splitter.on(":").split(str).iterator();
-      int startOffset = Integer.parseInt(split.next());
-      int toOffset = Integer.parseInt(split.next());
+  private static void parseReferences(NewSymbol s, Iterator<String> split, @Nullable Integer defaultLen) {
+    while (split.hasNext()) {
+      addReference(s, split.next(), defaultLen);
+    }
+  }
 
-      s.newReference(startOffset, toOffset);
+  private static void addReference(NewSymbol s, String str, @Nullable Integer defaultLen) {
+    if (str.contains(":")) {
+      String[] split = str.split(":");
+      if (split.length == 2) {
+        int startOffset = parseInt(split[0]);
+        int endOffset = parseInt(split[1]);
+        s.newReference(startOffset, endOffset);
+      } else if (split.length == 4) {
+        int startLine = parseInt(split[0]);
+        int startLineOffset = parseInt(split[1]);
+        int endLine = parseInt(split[2]);
+        int endLineOffset = parseInt(split[3]);
+        s.newReference(startLine, startLineOffset, endLine, endLineOffset);
+      } else {
+        throw new IllegalStateException("Illegal number of elements separated by ':'");
+      }
+    } else if (defaultLen == null) {
+      throw new IllegalStateException("Mix of new and old format. Use startLine:startLineOffset:endLine:endLineOffset for references too");
     } else {
-      int startOffset = Integer.parseInt(str);
+      int startOffset = parseInt(str);
       s.newReference(startOffset, startOffset + defaultLen);
     }
   }
diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java
index 8012f6152e3..e37a8602a5f 100644
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java
@@ -19,10 +19,8 @@
  */
 package org.sonar.xoo.lang;
 
-import com.google.common.base.Splitter;
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -36,6 +34,8 @@ import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.xoo.Xoo;
 
+import static java.lang.Integer.parseInt;
+
 /**
  * Parse files *.xoo.highlighting
  */
@@ -70,10 +70,21 @@ public class SyntaxHighlightingSensor implements Sensor {
 
   private static void processLine(File highlightingFile, int lineNumber, NewHighlighting highlighting, String line) {
     try {
-      Iterator<String> split = Splitter.on(":").split(line).iterator();
-      int startOffset = Integer.parseInt(split.next());
-      int endOffset = Integer.parseInt(split.next());
-      highlighting.highlight(startOffset, endOffset, TypeOfText.forCssClass(split.next()));
+      String[] split = line.split(":");
+      if (split.length == 3) {
+        int startOffset = parseInt(split[0]);
+        int endOffset = parseInt(split[1]);
+        highlighting.highlight(startOffset, endOffset, TypeOfText.forCssClass(split[2]));
+      } else if (split.length == 5) {
+        int startLine = parseInt(split[0]);
+        int startLineOffset = parseInt(split[1]);
+        int endLine = parseInt(split[2]);
+        int endLineOffset = parseInt(split[3]);
+        highlighting.highlight(startLine, startLineOffset, endLine, endLineOffset, TypeOfText.forCssClass(split[4]));
+      } else {
+        throw new IllegalStateException("Illegal number of elements separated by ':'. " +
+          "Must either be startOffset:endOffset:class (offset in whole file) or startLine:startLineOffset:endLine:endLineOffset:class");
+      }
     } catch (Exception e) {
       throw new IllegalStateException("Error processing line " + lineNumber + " of file " + highlightingFile.getAbsolutePath(), e);
     }