fix tests & highlight-handling & codestyle

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvHelper.java

@@ -130,18 +130,19 @@ public static int getFieldIndex(@NotNull final PsiElement element) {
     @Nullable
     public static PsiElement getNthChild(@Nullable final PsiElement parent, int n, @Nullable IElementType countable) {
         if (parent != null) {
+            int count = 0;
             for (PsiElement child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
                 if (countable != null && getElementType(child) != countable) continue;
-                if (n == 0) return child;
-                --n;
+                if (count == n) return child;
+                ++count;
             }
         }
         return null;
     }
 
     public static int findIndex(@Nullable final PsiElement parent, @NotNull PsiElement needle, @Nullable IElementType countable) {
-        int index = 0;
         if (parent != null) {
+            int index = 0;
             for (PsiElement child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
                 if (countable != null && getElementType(child) != countable) continue;
                 if (needle == child) return index;

src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandler.java

@@ -15,7 +15,7 @@
 
 public class CsvHighlightUsagesHandler extends HighlightUsagesHandlerBase {
 
-    private static int MAX_HIGHLIGHTING_ROWS = 200;
+    private static int MAX_HIGHLIGHTING_ROWS = 1000;
 
     protected CsvHighlightUsagesHandler(@NotNull Editor editor, @NotNull CsvFile file) {
         super(editor, file);
@@ -51,8 +51,8 @@ public void computeUsages(List list) {
             int index = CsvHelper.getFieldIndex(psiElement);
             if (index == -1) continue;
             CsvRecord csvRecord = (CsvRecord) psiElement.getParent();
-            int leftOverRows = addOccurrence(csvRecord, index, MAX_HIGHLIGHTING_ROWS / 2, true);
-            addOccurrence(csvRecord, index, MAX_HIGHLIGHTING_ROWS / 2 + leftOverRows, false);
+            int leftOverRows = addOccurrence(csvRecord, index, MAX_HIGHLIGHTING_ROWS / 2, false);
+            addOccurrence(csvRecord, index, MAX_HIGHLIGHTING_ROWS / 2 + leftOverRows, true);
         }
     }
 
@@ -63,7 +63,7 @@ protected void selectTargets(List list, Consumer consumer) {
 
     protected int addOccurrence(@NotNull CsvRecord csvRecord, int index, int noOfSiblings, boolean backward) {
         int count = noOfSiblings;
-        for (PsiElement sibling = backward ? csvRecord.getPrevSibling() : csvRecord.getNextSibling();
+        for (PsiElement sibling = backward ? csvRecord.getPrevSibling() : csvRecord;
              count != 0 && sibling != null;
              sibling = backward ? sibling.getPrevSibling() : sibling.getNextSibling(), --count) {
             PsiElement field = CsvHelper.getNthChild(sibling, index, CsvTypes.FIELD);

src/test/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandlerTest.java

@@ -8,15 +8,24 @@
 import com.intellij.openapi.util.TextRange;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class CsvHighlightUsagesHandlerTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
         return "./src/test/resources/highlighter";
     }
 
-    private void assertHighlightedText(RangeHighlighter rangeHighlighter, String text) {
-        assertEquals(text, rangeHighlighter.getDocument().getText(TextRange.create(rangeHighlighter.getStartOffset(), rangeHighlighter.getEndOffset())));
+    private void assertHighlightedTexts(RangeHighlighter[] rangeHighlighters, String... texts) {
+        assertSize(texts.length, rangeHighlighters);
+        List<String> needles =  new ArrayList(Arrays.asList(texts));
+        for (RangeHighlighter rangeHighlighter : rangeHighlighters) {
+            needles.removeIf(text -> text.equals(rangeHighlighter.getDocument().getText(TextRange.create(rangeHighlighter.getStartOffset(), rangeHighlighter.getEndOffset()))));
+        }
+        assertSize(0, needles);
     }
 
     private RangeHighlighter[] testHighlightUsages(String... fileNames) {
@@ -38,47 +47,37 @@ private RangeHighlighter[] testHighlightUsages(String... fileNames) {
     public void testHighlightUsages01() {
         RangeHighlighter[] rangeHighlighters = testHighlightUsages("HighlightUsagesTestData01.csv");
 
-        assertSize(2, rangeHighlighters);
-        assertHighlightedText(rangeHighlighters[0], "Header 2");
-        assertHighlightedText(rangeHighlighters[1], "Value 2");
+        assertHighlightedTexts(rangeHighlighters, "Header 2", "Value 2");
     }
 
     public void testHighlightUsages02() {
         RangeHighlighter[] rangeHighlighters = testHighlightUsages("HighlightUsagesTestData02.csv");
 
-        assertSize(2, rangeHighlighters);
-        assertHighlightedText(rangeHighlighters[0], "Header 2");
-        assertHighlightedText(rangeHighlighters[1], "Value 2");
+        assertHighlightedTexts(rangeHighlighters, "Header 2", "Value 2");
     }
 
     public void testHighlightUsages03() {
         RangeHighlighter[] rangeHighlighters = testHighlightUsages("HighlightUsagesTestData03.csv");
 
-        assertSize(2, rangeHighlighters);
-        assertHighlightedText(rangeHighlighters[0], "Header 1");
-        assertHighlightedText(rangeHighlighters[1], "Value 1");
+        assertHighlightedTexts(rangeHighlighters, "Header 1", "Value 1");
     }
 
     public void testHighlightUsages04() {
         RangeHighlighter[] rangeHighlighters = testHighlightUsages("HighlightUsagesTestData04.csv");
 
-        assertSize(1, rangeHighlighters);
-        assertHighlightedText(rangeHighlighters[0], "Value 3");
+        assertHighlightedTexts(rangeHighlighters, "Value 3");
     }
 
     public void testHighlightUsages05() {
         RangeHighlighter[] rangeHighlighters = testHighlightUsages("HighlightUsagesTestData05.csv");
 
-        assertSize(2, rangeHighlighters);
-        assertHighlightedText(rangeHighlighters[0], "Header 2");
-        assertHighlightedText(rangeHighlighters[1], "Value 2");
+        assertHighlightedTexts(rangeHighlighters, "Header 2", "Value 2");
     }
 
     public void testHighlightUsages06() {
         RangeHighlighter[] rangeHighlighters = testHighlightUsages("HighlightUsagesTestData06.csv");
 
-        assertSize(1, rangeHighlighters);
-        assertHighlightedText(rangeHighlighters[0], "Value 3");
+        assertHighlightedTexts(rangeHighlighters, "Value 3");
     }
 
     public void testHighlightUsages07() {