Remove Error Position

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/diagnostics/ErrorPosition.java

@@ -13,14 +13,14 @@ public class LJDiagnostic extends RuntimeException {
     private final String accentColor;
     private final String customMessage;
     private String file;
-    private ErrorPosition position;
+    private SourcePosition position;
     private static final String PIPE = " | ";
 
     public LJDiagnostic(String title, String message, SourcePosition pos, String accentColor, String customMessage) {
         this.title = title;
         this.message = message;
         this.file = (pos != null && pos.getFile() != null) ? pos.getFile().getPath() : null;
-        this.position = ErrorPosition.fromSpoonPosition(pos);
+        this.position = pos;
         this.accentColor = accentColor;
         this.customMessage = customMessage;
     }
@@ -41,14 +41,14 @@ public String getDetails() {
         return ""; // to be overridden by subclasses
     }
 
-    public ErrorPosition getPosition() {
+    public SourcePosition getPosition() {
         return position;
     }
 
     public void setPosition(SourcePosition pos) {
         if (pos == null)
             return;
-        this.position = ErrorPosition.fromSpoonPosition(pos);
+        this.position = pos;
         this.file = pos.getFile().getPath();
     }
 
@@ -82,7 +82,7 @@ public String toString() {
 
         // location
         if (file != null && position != null) {
-            sb.append("\n").append(file).append(":").append(position.lineStart()).append(Colors.RESET).append("\n");
+            sb.append("\n").append(file).append(":").append(position.getLine()).append(Colors.RESET).append("\n");
         }
 
         return sb.toString();
@@ -100,8 +100,8 @@ public String getSnippet() {
             // before and after lines for context
             int contextBefore = 2;
             int contextAfter = 2;
-            int startLine = Math.max(1, position.lineStart() - contextBefore);
-            int endLine = Math.min(lines.size(), position.lineEnd() + contextAfter);
+            int startLine = Math.max(1, position.getLine() - contextBefore);
+            int endLine = Math.min(lines.size(), position.getEndLine() + contextAfter);
 
             // calculate padding for line numbers
             int padding = String.valueOf(endLine).length();
@@ -115,9 +115,9 @@ public String getSnippet() {
                 sb.append(Colors.GREY).append(lineNumStr).append(PIPE).append(line).append(Colors.RESET).append("\n");
 
                 // add error markers on the line(s) with the error
-                if (i >= position.lineStart() && i <= position.lineEnd()) {
-                    int colStart = (i == position.lineStart()) ? position.colStart() : 1;
-                    int colEnd = (i == position.lineEnd()) ? position.colEnd() : rawLine.length();
+                if (i >= position.getLine() && i <= position.getEndLine()) {
+                    int colStart = (i == position.getLine()) ? position.getColumn() : 1;
+                    int colEnd = (i == position.getEndLine()) ? position.getEndColumn() : rawLine.length();
 
                     if (colStart > 0 && colEnd > 0) {
                         int tabsBeforeStart = (int) rawLine.substring(0, Math.max(0, colStart - 1)).chars()