Merge pull request #109 from SeeSharpSoft/master

Release 2.3.0

Author: SeeSharpSoft

.gitignore

@@ -21,6 +21,7 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+*.iml
 .idea
 out/
-gen/
+gen/

CHANGELOG

@@ -1,3 +1,10 @@
+2.3.0
+Mar 04, 2019
+
+NEW: Zoom table-editor cells with Ctrl+Mouse Wheel (contribution by @royqh1979)
+FIX: Scratches are now recognised as CSV
+FIX: Several issues resolved by reworking column/row editing
+
 2.2.1
 Jan 26, 2019
 

README.md

@@ -60,7 +60,7 @@ Additionally the file type TSV was introduced as a kind of CSV language.
 For TSV files the same formatter and code style settings are applied as for CSV itself, but the separator is considered to be a tab.
 All functionality that is available for plain CSV files (inspections, intentions, structure view, etc.) can be used for TSV as well.   
 
-### \*NEW\* Table Editor 
+### Table Editor 
 
 The plugin provides editing of CSV files via a table editor since version 2.0.0. This editor is NOT related to the _Edit as table..._ functionality of [IntelliJ IDEA Ultimate/PhpStorm/DataGrip/etc.](https://www.jetbrains.com/help/phpstorm/editing-csv-and-tsv-files.html) and does not share any implementation or settings. It is a an alternative to the CSV text editor and not meant to replace or mirror the capabilities of the Jetbrains _"Data"_ tab.
 
@@ -143,19 +143,19 @@ Set whether soft wrapping should be activated for CSV/TSV. It still can be chang
 
 #### Table Editor
 
-##### Textlines per row (default)
+##### Text-lines per row (default)
 
 Defines how many lines of text are shown in one editor cell by default. *Auto* does recalculate the height on the fly that can cause some flickering while editing. This setting can be changed in the table editor itself per file.
 
 ##### Show info panel
 
 Enables/disables the info panel at the bottom of the table editor.
 
-##### **NEW** Enforce value quoting
+##### Enforce value quoting
 
 Always quotes a single value on save - even if not required.
 
-##### **NEW** Enable column highlighting
+##### Enable column highlighting
 
 An easy way to switch *Column Highlighting* on or off (in table editor).
 
@@ -326,6 +326,10 @@ Contributions are welcome. Please check [CONTRIBUTING.md](./CONTRIBUTING.md) for
 
 Besides source code contributions, feel free to open bug reports or just suggest new features [here](https://github.com/SeeSharpSoft/intellij-csv-validator/issues).
 
+### Code/feature contributors
+
+- zoom table-editor cells with Ctrl+Mouse Wheel @royqh1979
+
 ## FAQ
 
 > Why can't I choose the separator freely?

gradle.properties

@@ -3,7 +3,7 @@
 # https://www.jetbrains.com/intellij-repository/snapshots
 
 name='CSV Plugin'
-pluginVersion=2.2.1
+pluginVersion=2.3.0
 javaVersion=1.8
 javaTargetVersion=1.8
 downloadIntellijSources=false

intellij-csv-validator.iml

@@ -1,8 +1,12 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
+import com.intellij.ide.scratch.ScratchFileType;
 import com.intellij.lang.*;
 import com.intellij.lexer.Lexer;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.TokenType;
@@ -37,6 +41,12 @@ public static PsiElement createEmptyCsvField(Project project) {
         return node.getPsi();
     }
 
+    public static boolean isCsvFile(Project project, VirtualFile file) {
+        final FileType fileType = file.getFileType();
+        return (fileType instanceof LanguageFileType && ((LanguageFileType) fileType).getLanguage().isKindOf(CsvLanguage.INSTANCE)) ||
+                (fileType == ScratchFileType.INSTANCE && LanguageUtil.getLanguageForPsi(project, file) == CsvLanguage.INSTANCE);
+    }
+
     public static IElementType getElementType(PsiElement element) {
         return element == null || element.getNode() == null ? null : element.getNode().getElementType();
     }

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

@@ -109,7 +109,7 @@
               <component id="bfa35" class="javax.swing.JLabel">
                 <constraints/>
                 <properties>
-                  <text value="Textlines per row (default):"/>
+                  <text value="Text-lines per row (default):"/>
                 </properties>
               </component>
               <component id="d6ab5" class="javax.swing.JComboBox" binding="cbRowHeight">

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

@@ -3,23 +3,18 @@
 import com.intellij.openapi.editor.EditorSettings;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
-import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.SingleRootFileViewProvider;
-import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 
 public class CsvFileEditorProvider implements AsyncFileEditorProvider, DumbAware {
 
     public static final String EDITOR_TYPE_ID = "csv-text-editor";
 
-    public static boolean isCsvFile(VirtualFile file) {
-        return file.getFileType() instanceof LanguageFileType && ((LanguageFileType) file.getFileType()).getLanguage().isKindOf(CsvLanguage.INSTANCE);
-    }
-
     @Override
     public String getEditorTypeId() {
         return EDITOR_TYPE_ID;
@@ -40,7 +35,7 @@ public FileEditorPolicy getPolicy() {
 
     @Override
     public boolean accept(@NotNull Project project, @NotNull VirtualFile file) {
-        return isCsvFile(file) && !SingleRootFileViewProvider.isTooLargeForContentLoading(file);
+        return CsvHelper.isCsvFile(project, file) && !SingleRootFileViewProvider.isTooLargeForContentLoading(file);
     }
 
     protected void applySettings(EditorSettings editorSettings, CsvEditorSettingsExternalizable csvEditorSettingsExternalizable) {

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

@@ -1,5 +1,6 @@
 package net.seesharpsoft.intellij.plugins.csv.editor.table;
 
+import com.google.common.primitives.Ints;
 import com.intellij.codeHighlighting.BackgroundEditorHighlighter;
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.openapi.application.ApplicationManager;
@@ -15,6 +16,7 @@
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.ArrayUtil;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfoMap;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettingsExternalizable;
@@ -27,12 +29,13 @@
 import javax.swing.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
+import java.util.Collections;
+import java.util.List;
 
 public abstract class CsvTableEditor implements FileEditor, FileEditorLocation {
 
     public static final String EDITOR_NAME = "Table Editor";
 
-    public static final int ROW_LINE_HEIGHT = 20;
     public static final int INITIAL_COLUMN_WIDTH = 100;
 
     protected final Project project;
@@ -75,6 +78,9 @@ public CsvTableEditor(@NotNull Project projectArg, @NotNull VirtualFile fileArg)
 
     protected abstract void afterTableComponentUpdate(Object[][] values);
 
+    public abstract int getPreferredRowHeight();
+
+
     public final void updateTableComponentData(Object[][] values) {
         beforeTableComponentUpdate();
         try {
@@ -85,10 +91,6 @@ public final void updateTableComponentData(Object[][] values) {
         }
     }
 
-    public int getPreferredRowHeight() {
-        return ROW_LINE_HEIGHT * getFileEditorState().getRowLines();
-    }
-
     public void setEditable(boolean editable) {
         this.tableIsEditable = editable;
         this.updateInteractionElements();
@@ -282,10 +284,68 @@ public Project getProject() {
 
     @Nullable
     public CsvFile getCsvFile() {
-        return this.psiFile instanceof CsvFile ? (CsvFile)psiFile : null;
+        return this.psiFile instanceof CsvFile ? (CsvFile) psiFile : null;
     }
 
     public TableDataHandler getDataHandler() {
         return this.dataManagement;
     }
+
+    public int getRowCount() {
+        return getDataHandler().getCurrentState().length;
+    }
+
+    public int getColumnCount() {
+        Object[][] currentData = getDataHandler().getCurrentState();
+        return currentData.length > 0 ? currentData[0].length : 0;
+    }
+
+    public Object[][] addRow(int focusedRowIndex, boolean before) {
+        int index = (before ? (focusedRowIndex == -1 ? 0 : focusedRowIndex) : (focusedRowIndex == -1 ? getRowCount() : focusedRowIndex + 1)) +
+                (getFileEditorState().getFixedHeaders() ? 1 : 0);
+        TableDataHandler dataHandler = getDataHandler();
+        Object[][] currentData = ArrayUtil.insert(dataHandler.getCurrentState(), index, new Object[getColumnCount()]);
+        updateTableComponentData(dataHandler.addState(currentData));
+        return currentData;
+    }
+
+    public Object[][] removeRows(int[] indices) {
+        List<Integer> currentRows = Ints.asList(indices);
+        currentRows.sort(Collections.reverseOrder());
+        TableDataHandler dataHandler = getDataHandler();
+        Object[][] currentData = dataHandler.getCurrentState();
+        for (int currentRow : currentRows) {
+            currentData = ArrayUtil.remove(currentData, currentRow + (getFileEditorState().getFixedHeaders() ? 1 : 0));
+        }
+        updateTableComponentData(dataHandler.addState(currentData));
+        return currentData;
+    }
+
+    public Object[][] addColumn(int focusedColumnIndex, boolean before) {
+        int index = before ? (focusedColumnIndex == -1 ? 0 : focusedColumnIndex) : (focusedColumnIndex == -1 ? getColumnCount() : focusedColumnIndex + 1);
+        boolean fixedHeaders = getFileEditorState().getFixedHeaders();
+        TableDataHandler dataHandler = getDataHandler();
+        Object[][] currentData = dataHandler.getCurrentState();
+        for (int i = 0; i < currentData.length; ++i) {
+            currentData[i] = ArrayUtil.insert(currentData[i], index, fixedHeaders && i == 0 ? "" : null);
+        }
+        updateTableComponentData(dataHandler.addState(currentData));
+        return currentData;
+    }
+
+    public Object[][] removeColumns(int[] indices) {
+        List<Integer> currentColumns = Ints.asList(indices);
+        currentColumns.sort(Collections.reverseOrder());
+
+        TableDataHandler dataHandler = getDataHandler();
+        Object[][] currentData = dataHandler.getCurrentState();
+
+        for (int currentColumn : currentColumns) {
+            for (int i = 0; i < currentData.length; ++i) {
+                currentData[i] = ArrayUtil.remove(currentData[i], currentColumn);
+            }
+        }
+        updateTableComponentData(dataHandler.addState(currentData));
+        return currentData;
+    }
 }

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

@@ -8,8 +8,8 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.SingleRootFileViewProvider;
+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettingsExternalizable;
-import net.seesharpsoft.intellij.plugins.csv.editor.CsvFileEditorProvider;
 import net.seesharpsoft.intellij.plugins.csv.editor.table.swing.CsvTableEditorSwing;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
@@ -38,7 +38,8 @@ public FileEditorPolicy getPolicy() {
 
     @Override
     public boolean accept(@NotNull Project project, @NotNull VirtualFile file) {
-        return CsvEditorSettingsExternalizable.getInstance().getEditorPrio() != CsvEditorSettingsExternalizable.EditorPrio.TEXT_ONLY && CsvFileEditorProvider.isCsvFile(file) &&
+        return CsvEditorSettingsExternalizable.getInstance().getEditorPrio() != CsvEditorSettingsExternalizable.EditorPrio.TEXT_ONLY &&
+                CsvHelper.isCsvFile(project, file) &&
                 !SingleRootFileViewProvider.isTooLargeForIntelligence(file);
     }