Merge 142bd64 into 811dd5f

Author: SeeSharpSoft

README.md

@@ -105,10 +105,16 @@ The plugin introduces an enhanced text editor supporting custom settings - and a
 
 ![Editor settings](./docs/editorsettings.png)
 
-#### Editor Usage
+#### General
+
+##### Editor Usage
 
 The preferred editor usage can be switched between "Text Editor first", "Table Editor first" or "Text Editor only", which has an effect on the editor tab order (or whether the table editor is shown at all). A "Table Editor only" option is not available (mainly due to the table editor restrictions when handling erroneous CSV files).
 
+##### Column numbering
+
+Enable zero-based column numbering. This affects the tooltip info of the text editor as well as column numbering of the table editor.
+
 #### Text Editor
 
 ##### Highlighting

docs/editorsettings.png

@@ -50,7 +50,7 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio
                         String.format("%s<br /><br />Header: %s<br />Index: %d",
                                 XmlStringUtil.escapeString(element.getText(), true),
                                 message,
-                                columnInfo.getColumnIndex()
+                                columnInfo.getColumnIndex() + (CsvEditorSettingsExternalizable.getInstance().isZeroBasedColumnNumbering() ? 0 : 1)
                         )
                 );
             }

docs/tableeditor.png

@@ -39,6 +39,7 @@ public static final class OptionSet {
         public EditorPrio EDITOR_PRIO;
         public int TABLE_EDITOR_ROW_HEIGHT;
         public boolean TABLE_COLUMN_HIGHTLIGHTING;
+        public boolean ZERO_BASED_COLUMN_NUMBERING;
 
         public boolean SHOW_TABLE_EDITOR_INFO_PANEL;
         public boolean QUOTING_ENFORCED;
@@ -56,6 +57,7 @@ public OptionSet() {
             TABLE_EDITOR_ROW_HEIGHT = TABLE_EDITOR_DEFAULT_ROW_HEIGHT;
             QUOTING_ENFORCED = false;
             TABLE_COLUMN_HIGHTLIGHTING = true;
+            ZERO_BASED_COLUMN_NUMBERING = false;
         }
     }
 
@@ -173,4 +175,11 @@ public boolean isTableColumnHighlightingEnabled() {
     public void setTableColumnHighlightingEnabled(boolean columnHighlightingEnabled) {
         getState().TABLE_COLUMN_HIGHTLIGHTING = columnHighlightingEnabled;
     }
+
+    public boolean isZeroBasedColumnNumbering() {
+        return getState().ZERO_BASED_COLUMN_NUMBERING;
+    }
+    public void setZeroBasedColumnNumbering(boolean zeroBasedColumnNumbering) {
+        getState().ZERO_BASED_COLUMN_NUMBERING = zeroBasedColumnNumbering;
+    }
 }

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettingsProvider">
-  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="1180" height="648"/>
@@ -16,7 +16,7 @@
       <grid id="350ae" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="10" left="10" bottom="10" right="10"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="line" title="Text Editor"/>
@@ -94,7 +94,7 @@
       <grid id="3e325" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="10" left="10" bottom="10" right="10"/>
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="line" title="Table Editor"/>
@@ -165,7 +165,7 @@
       </grid>
       <vspacer id="ff292">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="19f8" class="javax.swing.JLabel">
@@ -188,6 +188,22 @@
           </model>
         </properties>
       </component>
+      <component id="980fc" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Column numbering:"/>
+        </properties>
+      </component>
+      <component id="bfc7c" class="javax.swing.JCheckBox" binding="cbZeroBasedColumnNumbering">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Zero-based"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvEditorSettingsExternalizable.java

@@ -25,6 +25,7 @@ public class CsvEditorSettingsProvider implements SearchableConfigurable {
     private JComboBox cbEditorUsage;
     private JCheckBox cbQuotingEnforced;
     private JCheckBox cbTableColumnHighlighting;
+    private JCheckBox cbZeroBasedColumnNumbering;
 
     @NotNull
     @Override
@@ -67,7 +68,8 @@ public boolean isModified() {
                 !Objects.equals(cbEditorUsage.getSelectedIndex(), csvEditorSettingsExternalizable.getEditorPrio().ordinal()) ||
                 isModified(cbQuotingEnforced, csvEditorSettingsExternalizable.isQuotingEnforced()) ||
                 !Objects.equals(cbEditorUsage.getSelectedIndex(), csvEditorSettingsExternalizable.getEditorPrio().ordinal()) ||
-                isModified(cbTableColumnHighlighting, csvEditorSettingsExternalizable.isTableColumnHighlightingEnabled());
+                isModified(cbTableColumnHighlighting, csvEditorSettingsExternalizable.isTableColumnHighlightingEnabled()) ||
+                isModified(cbZeroBasedColumnNumbering, csvEditorSettingsExternalizable.isZeroBasedColumnNumbering());
     }
 
     @Override
@@ -84,6 +86,7 @@ public void reset() {
         cbEditorUsage.setSelectedIndex(csvEditorSettingsExternalizable.getEditorPrio().ordinal());
         cbQuotingEnforced.setSelected(csvEditorSettingsExternalizable.isQuotingEnforced());
         cbTableColumnHighlighting.setSelected(csvEditorSettingsExternalizable.isTableColumnHighlightingEnabled());
+        cbZeroBasedColumnNumbering.setSelected(csvEditorSettingsExternalizable.isZeroBasedColumnNumbering());
     }
 
     @Override
@@ -100,6 +103,7 @@ public void apply() throws ConfigurationException {
         csvEditorSettingsExternalizable.setEditorPrio(CsvEditorSettingsExternalizable.EditorPrio.values()[cbEditorUsage.getSelectedIndex()]);
         csvEditorSettingsExternalizable.setQuotingEnforced(cbQuotingEnforced.isSelected());
         csvEditorSettingsExternalizable.setTableColumnHighlightingEnabled(cbTableColumnHighlighting.isSelected());
+        csvEditorSettingsExternalizable.setZeroBasedColumnNumbering(cbZeroBasedColumnNumbering.isSelected());
     }
 
     protected void createUIComponents() {

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvEditorSettingsProvider.form

@@ -47,7 +47,6 @@ public abstract class CsvTableEditor implements FileEditor, FileEditorLocation {
     private Object[][] initialState = null;
     private CsvTableEditorState storedState = null;
 
-    protected CsvColumnInfoMap<PsiElement> columnInfoMap;
     protected boolean tableIsEditable = true;
 
     public CsvTableEditor(@NotNull Project projectArg, @NotNull VirtualFile fileArg) {
@@ -68,21 +67,21 @@ public CsvTableEditor(@NotNull Project projectArg, @NotNull VirtualFile fileArg)
 
     protected abstract void updateInteractionElements();
 
-    protected abstract void applyRowLines(int rowLines);
+    protected abstract void applyEditorState(CsvTableEditorState editorState);
 
     protected abstract void setTableComponentData(Object[][] values);
 
     protected abstract void beforeTableComponentUpdate();
 
-    protected abstract void afterTableComponentUpdate();
+    protected abstract void afterTableComponentUpdate(Object[][] values);
 
     public final void updateTableComponentData(Object[][] values) {
         beforeTableComponentUpdate();
         try {
             setTableComponentData(values);
             saveChanges();
         } finally {
-            afterTableComponentUpdate();
+            afterTableComponentUpdate(values);
         }
     }
 
@@ -99,7 +98,13 @@ public boolean isEditable() {
         return this.tableIsEditable && !this.hasErrors();
     }
 
+    public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {
+        CsvFile csvFile = getCsvFile();
+        return csvFile == null ? null : csvFile.getMyColumnInfoMap();
+    }
+
     public boolean hasErrors() {
+        CsvColumnInfoMap columnInfoMap = getColumnInfoMap();
         return !isValid() || (columnInfoMap != null && columnInfoMap.hasErrors());
     }
 
@@ -186,7 +191,7 @@ public void setState(@NotNull FileEditorState fileEditorState) {
         CsvTableEditorState tableEditorState = fileEditorState instanceof CsvTableEditorState ? (CsvTableEditorState) fileEditorState : new CsvTableEditorState();
         this.storedState = tableEditorState;
 
-        applyRowLines(getFileEditorState().getRowLines());
+        applyEditorState(getFileEditorState());
     }
 
     @Override

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvEditorSettingsProvider.java

@@ -18,6 +18,7 @@ public class CsvTableEditorState implements FileEditorState {
 
     private int[] columnWidths;
     private Boolean showInfoPanel;
+    private Boolean fixedHeaders;
     private Integer rowLines;
 
     public CsvTableEditorState() {
@@ -43,6 +44,14 @@ public void setShowInfoPanel(boolean showInfoPanelArg) {
         showInfoPanel = showInfoPanelArg;
     }
 
+    public boolean getFixedHeaders() {
+        return fixedHeaders == null ? false : fixedHeaders;
+    }
+
+    public void setFixedHeaders(boolean fixedHeadersArg) {
+        fixedHeaders = fixedHeadersArg;
+    }
+
     public int getRowLines() {
         if (rowLines == null) {
             rowLines = CsvEditorSettingsExternalizable.getInstance().getTableEditorRowHeight();
@@ -61,6 +70,7 @@ public boolean canBeMergedWith(FileEditorState fileEditorState, FileEditorStateL
 
     public void write(@NotNull Project project, @NotNull Element element) {
         element.setAttribute("showInfoPanel", "" + showInfoPanel());
+        element.setAttribute("fixedHeaders", "" + getFixedHeaders());
         element.setAttribute("rowLines", "" + getRowLines());
         for (int i = 0; i < columnWidths.length; ++i) {
             Element cwElement = new Element("column");
@@ -79,6 +89,10 @@ public static CsvTableEditorState create(@NotNull Element element, @NotNull Proj
         state.setShowInfoPanel(
                 attribute == null ? CsvEditorSettingsExternalizable.getInstance().showTableEditorInfoPanel() : Boolean.parseBoolean(attribute.getValue())
         );
+        attribute = element.getAttribute("fixedHeaders");
+        state.setFixedHeaders(
+                attribute == null ? false : Boolean.parseBoolean(attribute.getValue())
+        );
         state.setRowLines(
                 StringUtilRt.parseInt(element.getAttributeValue("rowLines"), CsvEditorSettingsExternalizable.getInstance().getTableEditorRowHeight())
         );

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

@@ -53,6 +53,19 @@
                   <visible value="false"/>
                 </properties>
               </component>
+              <component id="83d80" class="javax.swing.JCheckBox" binding="cbFixedHeaders">
+                <constraints/>
+                <properties>
+                  <contentAreaFilled value="false"/>
+                  <horizontalTextPosition value="10"/>
+                  <label value="Header row fixed:"/>
+                  <text value="Header row fixed:"/>
+                </properties>
+              </component>
+              <component id="af7be" class="javax.swing.JToolBar$Separator">
+                <constraints/>
+                <properties/>
+              </component>
               <component id="9bf69" class="javax.swing.JLabel" binding="lblTextlines">
                 <constraints/>
                 <properties>