Adjust tab width char handling

With pmd/pmd#2656 tab characters are now handled with column
with of 1. That means, the position that PMD's parser reports
uses this with. The display of the tab character might be different
in the code are of the designer (and in any other text editor).

Author: adangel

src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/PmdCoordinatesSystem.java

@@ -54,8 +54,7 @@ public static TextPos2D getPmdLineAndColumnFromOffset(CodeArea codeArea, int abs
 
         Position pos = codeArea.offsetToPosition(absoluteOffset, Bias.Forward);
 
-        return new TextPos2D(getPmdLineFromRtfxParIndex(pos.getMajor()),
-                             getPmdColumnIndexFromRtfxColumn(codeArea, pos.getMajor(), pos.getMinor()));
+        return new TextPos2D(getPmdLineFromRtfxParIndex(pos.getMajor()), pos.getMinor() + 1);
     }
 
 
@@ -65,7 +64,7 @@ public static TextPos2D getPmdLineAndColumnFromOffset(CodeArea codeArea, int abs
      *
      * <ul>
      * <li>CodeArea counts a tab as 1 column width but displays it as 8 columns width.
-     * PMD counts it correctly as 8 columns, so the position must be offset.
+     * PMD counts it correctly as 1 column (since PMD 6.27.0, before it was 8 columns).
      * <li>PMD lines start at 1 but paragraph nums start at 0 in the code area,
      * same for columns.
      * <li>PMD's end column is inclusive and not exclusive.
@@ -76,36 +75,11 @@ public static int getOffsetFromPmdPosition(CodeArea codeArea, int line, int colu
         column = max(column, 1);
 
         int parIdx = getRtfxParIndexFromPmdLine(line);
-        int raw = codeArea.getAbsolutePosition(parIdx, getRtfxColumnIndexFromPmdColumn(codeArea, parIdx, column));
+        int raw = codeArea.getAbsolutePosition(parIdx, column - 1);
         return clip(raw, 0, codeArea.getLength() - 1);
     }
 
 
-    private static int getRtfxColumnIndexFromPmdColumn(CodeArea codeArea, int parIdx, int column) {
-        String parTxt = codeArea.getParagraph(parIdx).getText();
-        int end = column - 1;
-        for (int i = 0; i < end && end > 0; i++) {
-            char c = parTxt.charAt(i);
-            if (c == '\t') {
-                end = max(end - 7, 0);
-            }
-        }
-        return end;
-    }
-
-    private static int getPmdColumnIndexFromRtfxColumn(CodeArea codeArea, int parIdx, int rtfxCol) {
-        String parTxt = codeArea.getParagraph(parIdx).getText();
-        int mapped = rtfxCol;
-        for (int i = 0; i < rtfxCol && i < parTxt.length(); i++) {
-            char c = parTxt.charAt(i);
-            if (c == '\t') {
-                mapped += 7;
-            }
-        }
-        return mapped + 1;
-    }
-
-
     private static int clip(int val, int min, int max) {
         return max(min, min(val, max));
     }

src/test/kotlin/net/sourceforge/pmd/util/fxdesigner/util/codearea/CoordinateMappingTest.kt

@@ -53,27 +53,27 @@ class CoordinateMappingTest : FunSpec({
         //--------
 
         codeArea.fromPmd(1, 1) shouldBe 0
-        codeArea.fromPmd(1, 2) shouldBe 0
-        codeArea.fromPmd(1, 7) shouldBe 0
-        codeArea.fromPmd(1, 8) shouldBe 0
-        codeArea.fromPmd(1, 9) shouldBe 1
-        codeArea.fromPmd(1, 10) shouldBe 2
+        codeArea.fromPmd(1, 2) shouldBe 1
+        codeArea.fromPmd(1, 3) shouldBe 2
+        codeArea.fromPmd(1, 8) shouldBe 7
 
         codeArea.toPmd(0) shouldBe TextPos2D(1, 1)
-        codeArea.toPmd(1) shouldBe TextPos2D(1, 9)
-        codeArea.toPmd(2) shouldBe TextPos2D(1, 10)
+        codeArea.toPmd(1) shouldBe TextPos2D(1, 2)
+        codeArea.toPmd(2) shouldBe TextPos2D(1, 3)
+        codeArea.toPmd(7) shouldBe TextPos2D(1, 8)
     }
 
     test("All tabs corner case") {
 
         val codeArea = CodeArea("\t\t\t")
 
         codeArea.fromPmd(1, 1) shouldBe 0
-        codeArea.fromPmd(1, 2) shouldBe 0
+        codeArea.fromPmd(1, 2) shouldBe 1
+        codeArea.fromPmd(1, 3) shouldBe 2
 
         codeArea.toPmd(0) shouldBe TextPos2D(1, 1)
-        codeArea.toPmd(1) shouldBe TextPos2D(1, 9)
-        codeArea.toPmd(2) shouldBe TextPos2D(1, 17)
+        codeArea.toPmd(1) shouldBe TextPos2D(1, 2)
+        codeArea.toPmd(2) shouldBe TextPos2D(1, 3)
     }
 
     test("Empty corner case") {