[INTERNAL] consider line breaks when calculating max text length

Author: SeeSharpSoft

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

@@ -21,9 +21,11 @@
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvFile;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvRecord;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 public final class CsvHelper {
 
@@ -154,7 +156,7 @@ public static CsvColumnInfoMap<PsiElement> createColumnInfoMap(CsvFile csvFile)
         for (CsvRecord record : records) {
             int column = 0;
             for (CsvField field : record.getFieldList()) {
-                Integer length = field.getTextLength();
+                Integer length = CsvHelper.getMaxTextLineLength(unquoteCsvValue(field.getText()));
                 if (!columnInfoMap.containsKey(column)) {
                     columnInfoMap.put(column, new CsvColumnInfo(column, length, row));
                 } else if (columnInfoMap.get(column).getMaxLength() < length) {
@@ -199,6 +201,24 @@ public static <T> T[][] deepCopy(T[][] matrix) {
         return java.util.Arrays.stream(matrix).map(el -> el.clone()).toArray($ -> matrix.clone());
     }
 
+    public static int getMaxTextLineLength(String text, @NotNull Function<String, Integer> calcCallback) {
+        if (text == null) {
+            return 0;
+        }
+        int maxLength = -1;
+        for (String line : text.split("(\\r?\\n|\\r)+")) {
+            int length = calcCallback.apply(line);
+            if (length > maxLength) {
+                maxLength = length;
+            }
+        }
+        return maxLength;
+    }
+
+    public static int getMaxTextLineLength(String text) {
+        return getMaxTextLineLength(text, input -> input == null ? 0 : input.length());
+    }
+
     private CsvHelper() {
         // static utility class
     }

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java

@@ -313,13 +313,9 @@ public Font getFont() {
         return EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN);
     }
 
-    public Dimension getPreferredCellSize(int row, int column) {
-        Object[][] data = getDataHandler().getCurrentState();
-        String text = data[row][column].toString();
-        if (text == null) {
-            return new Dimension();
-        }
-        return new Dimension(getFont().getSize() * text.length(), getPreferredRowHeight());
+    protected int getStringWidth(String text) {
+        int fontSize = getFont().getSize();
+        return CsvHelper.getMaxTextLineLength(text, input -> fontSize * input.length());
     }
 
     public final void resetAllColumnWidths() {
@@ -345,8 +341,7 @@ protected int[] calculateDistributedColumnWidths() {
 
         for (Map.Entry<Integer, CsvColumnInfo<PsiElement>> columnInfoEntry : columnInfos.entrySet()) {
             CsvColumnInfo<PsiElement> columnInfo = columnInfoEntry.getValue();
-            Dimension preferredDimension = getPreferredCellSize(columnInfo.getMaxLengthRowIndex(), columnInfo.getColumnIndex());
-            int currentWidth = preferredDimension.width;
+            int currentWidth = getStringWidth(data[columnInfo.getMaxLengthRowIndex()][columnInfo.getColumnIndex()].toString());
             if (tableAutoMaxColumnWidth != 0) {
                 currentWidth = Math.min(tableAutoMaxColumnWidth, currentWidth);
             }

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form

@@ -107,6 +107,7 @@
                   <component id="bdd04" class="com.intellij.ui.components.labels.LinkLabel" binding="lnkAdjustColumnWidth">
                     <constraints/>
                     <properties>
+                      <icon value="media/icons/empty.png"/>
                       <text value="Adjust column width"/>
                     </properties>
                   </component>

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java

@@ -35,7 +35,7 @@
 public class CsvTableEditorSwing extends CsvTableEditor implements TableDataChangeEvent.Listener {
 
     private static final int TOTAL_CELL_HEIGHT_SPACING = 3;
-    private static final int TOTAL_CELL_WIDTH_SPACING = 10;
+    private static final int TOTAL_CELL_WIDTH_SPACING = 8;
 
     private JBTable tblEditor;
     private JPanel panelMain;
@@ -212,7 +212,7 @@ protected void updateEditorLayout() {
             getFileEditorState().setColumnWidths(columnWidths);
         }
 
-        float zoomFactor = calculateZoomFactor();
+        float zoomFactor = getZoomFactor();
         for (int i = 0; i < currentColumnCount; ++i) {
             TableColumn column = this.tblEditor.getColumnModel().getColumn(i);
             column.setPreferredWidth(Math.round(columnWidths[i] * zoomFactor));
@@ -223,7 +223,7 @@ protected void updateEditorLayout() {
         panelInfo.setVisible(getFileEditorState().showInfoPanel());
     }
 
-    private float calculateZoomFactor() {
+    private float getZoomFactor() {
         float fontHeight = getFontHeight();
         return fontHeight / baseFontHeight;
     }
@@ -401,7 +401,7 @@ public JComponent getPreferredFocusedComponent() {
 
     public void storeCurrentTableLayout() {
         int[] widths = getCurrentColumnsWidths();
-        float zoomFactor = calculateZoomFactor();
+        float zoomFactor = getZoomFactor();
         for (int i = 0; i < widths.length; i++) {
             widths[i] /= zoomFactor;
         }
@@ -482,13 +482,13 @@ private int getFontHeight() {
     }
 
     @Override
-    public Dimension getPreferredCellSize(int row, int column) {
-        JBTable table = getTable();
-        Component comp = table.prepareRenderer(table.getCellRenderer(row, column), row, column);
-//        rowHeight = Math.max(rowHeight, comp.getPreferredSize().height);
-//        getTable().getFont().getStringBounds()
-//        return getTable().getFontMetrics(getTable().getFont()).stringWidth(text) + TOTAL_CELL_WIDTH_SPACING;
-        return comp.getPreferredSize();
+    protected int getStringWidth(String text) {
+        if (text == null) {
+            return TOTAL_CELL_WIDTH_SPACING;
+        }
+        JTable table = getTable();
+        FontMetrics fontMetrics = getTable().getFontMetrics(table.getFont());
+        return CsvHelper.getMaxTextLineLength(text, input -> (int)Math.ceil((float)(fontMetrics.stringWidth(input) + TOTAL_CELL_WIDTH_SPACING) / getZoomFactor()));
     }
 
     public void changeFontSize(int changeAmount) {

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

@@ -6,6 +6,7 @@
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.formatter.common.AbstractBlock;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfo;
+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvElementType;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
@@ -163,7 +164,7 @@ public static int getTextLength(String text, CodeStyleSettings codeStyleSettings
             text = END_WHITE_SPACE_PATTERN.matcher(text).replaceFirst("");
             length += 2;
         }
-        length += csvCodeStyleSettings.ENABLE_WIDE_CHARACTER_DETECTION ? charWidth(text, csvCodeStyleSettings.TREAT_AMBIGUOUS_CHARACTERS_AS_WIDE) : text.length();
+        length += CsvHelper.getMaxTextLineLength(text, line -> csvCodeStyleSettings.ENABLE_WIDE_CHARACTER_DETECTION ? charWidth(line, csvCodeStyleSettings.TREAT_AMBIGUOUS_CHARACTERS_AS_WIDE) : line.length());
 
         return length;
     }