[FIX] error handling for version 2016.1

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/formatter/CsvBlock.java

@@ -33,10 +33,6 @@ protected List<Block> buildChildren() {
             }
 
             IElementType elementType = node.getElementType();
-            if (elementType == TokenType.ERROR_ELEMENT || elementType == TokenType.BAD_CHARACTER) {
-                break;
-            }
-            
             todoNodes.add(node.getTreeNext());
             if (elementType == CsvTypes.RECORD) {
                 todoNodes.add(node.getFirstChildNode());
@@ -47,6 +43,8 @@ protected List<Block> buildChildren() {
                 }
             } else if (elementType == CsvTypes.COMMA || elementType == CsvTypes.CRLF) {
                 blocks.add(new CsvBlockElement(node, formattingInfo, currentField));
+            } else if (elementType != TokenType.WHITE_SPACE && node.getTextLength() > 0) {
+                blocks.add(new CsvDummyBlock(node, formattingInfo));
             }
         }
         return blocks;
@@ -61,7 +59,7 @@ public Indent getIndent() {
     @Override
     public Spacing getSpacing(@Nullable Block child1, @NotNull Block child2) {
         Spacing spacing = null;
-        if (child1 != null) {
+        if (child1 != null && !(child1 instanceof CsvDummyBlock) && !(child2 instanceof CsvDummyBlock)) {
             CsvBlockElement block1 = (CsvBlockElement) child1;
             CsvBlockElement block2 = (CsvBlockElement) child2;
             if (formattingInfo.getCsvCodeStyleSettings().TABULARIZE && isTabularizeSpacingRequired(block1, block2)) {

src/main/java/net/seesharpsoft/intellij/plugins/csv/formatter/CsvDummyBlock.java

@@ -0,0 +1,33 @@
+package net.seesharpsoft.intellij.plugins.csv.formatter;
+
+import com.intellij.formatting.Block;
+import com.intellij.formatting.Spacing;
+import com.intellij.lang.ASTNode;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.List;
+
+public class CsvDummyBlock extends CsvBlock {
+    
+    protected CsvDummyBlock(@NotNull ASTNode node, CsvFormattingInfo formattingInfo) {
+        super(node, formattingInfo);
+    }
+
+    @Override
+    protected List<Block> buildChildren() {
+        return Collections.EMPTY_LIST;
+    }
+
+    @Nullable
+    @Override
+    public Spacing getSpacing(@Nullable Block block, @NotNull Block block1) {
+        return null;
+    }
+
+    @Override
+    public boolean isLeaf() {
+        return true;
+    }
+}