Merge pull request #157 from SeeSharpSoft/master

Release 2.7.0

Author: SeeSharpSoft

.travis.yml

@@ -5,8 +5,9 @@ jdk:
 env:
   - IDEA_VERSION=IC-2016.3.2 GRAMMAR_KIT_VERSION=1.4.3
   - IDEA_VERSION=IC-2017.3.2 GRAMMAR_KIT_VERSION=2017.1.2
-  - IDEA_VERSION=IC-2018.3.2 GRAMMAR_KIT_VERSION=2017.1.6
-  - IDEA_VERSION=PC-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2017.1.6
+  - IDEA_VERSION=IC-2018.3.2 GRAMMAR_KIT_VERSION=2017.1.7
+  - IDEA_VERSION=IC-2019.2.2 GRAMMAR_KIT_VERSION=2017.1.7
+#  - IDEA_VERSION=PC-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=07f30a1e7666f36ae780f614b6bbc89690ba36c3
 
 script: xvfb-run gradle check
 
@@ -16,9 +17,9 @@ after_success:
 jobs:
   include:
     - if: (branch = master AND type = push) OR (type = pull_request)
-      env: IDEA_VERSION=IC-191.5701.16 GRAMMAR_KIT_VERSION=2017.1.6
+      env: IDEA_VERSION=IC-191.5701.16 GRAMMAR_KIT_VERSION=2017.1.7
       script: xvfb-run gradle check verifyPlugin
     - stage: deploy
       if: branch IN (Testing, Staging, Stable) AND type = push
-      env: IDEA_VERSION=IC-191.5701.16 GRAMMAR_KIT_VERSION=2017.1.6 JI_CHANNELS=$TRAVIS_BRANCH
+      env: IDEA_VERSION=IC-191.5701.16 GRAMMAR_KIT_VERSION=2017.1.7 JI_CHANNELS=$TRAVIS_BRANCH
       script: xvfb-run gradle publishPlugin

CHANGELOG

@@ -1,3 +1,10 @@
+2.7.0
+Sep 16, 2019
+
+NEW: add separator selection to table editor #140
+FIX: coloring of table cells (e.g. selection mode)
+FIX: enter edit mode via keyboard (e.g. ENTER key in cell)
+
 2.6.4
 Aug 30, 2019
 

README.md

@@ -10,8 +10,8 @@
 
 Compatible with _IntelliJ IDEA  PhpStorm  WebStorm  PyCharm  RubyMine  AppCode  CLion  Gogland  DataGrip  Rider  MPS  Android Studio_ - __2016.3.2 and newer__
 
-This plugin introduces CSV (_Comma-Separated Values_) as a language to Jetbrains IDE with a syntax definition, structured language elements and associated file types (.csv/.tsv).
-This enables default editor features like syntax validation, highlighting and inspections for CSV files.
+This plugin introduces CSV (_Comma-Separated Values_) as a language to Jetbrains IDE with a syntax definition, structured language elements and associated file types (.csv/.tsv/.psv).
+This enables default editor features like syntax validation, highlighting and inspections for CSV-alike files.
 
 ## Features
 
@@ -300,7 +300,7 @@ Annasusanna,Amsterdam,         1
 
 ![Context menu](./docs/contextmenu.png)
 
-The action to switch the value separator used for CSV syntax validation of a specific file is part of its text editors context menu.
+The action to switch the value separator used for CSV syntax validation of a specific file is part of its editors context menu.
 
 
 This action defines how the parser/validator/highlighter/etc. behaves. It does intentionally not change the file content.
@@ -312,7 +312,7 @@ Calculates and sets the maximum width for all table columns based on their conte
 
 #### Reset column widths to default (table editor only)
 
-Set the width of all table columns back to default. The default table column width can be changed via [Editor Settings](#default-column-width)).
+Set the width of all table columns back to default. The default table column width can be changed via [Editor Settings](#default-column-width).
 
 ### Inspections
 

build.gradle

@@ -98,7 +98,7 @@ grammarKit {
     jflexRelease = '1.7.0-1'
 
     // tag or short commit hash of Grammar-Kit to use - https://github.com/JetBrains/Grammar-Kit
-    grammarKitRelease = System.getenv().getOrDefault('GRAMMAR_KIT_VERSION', '2017.1.6')
+    grammarKitRelease = System.getenv().getOrDefault('GRAMMAR_KIT_VERSION', '2017.1.7')
 }
 
 import org.jetbrains.grammarkit.tasks.GenerateLexer

gradle.properties

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

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

@@ -7,6 +7,6 @@
 public class CsvFileTypeFactory extends FileTypeFactory {
     @Override
     public void createFileTypes(@NotNull FileTypeConsumer fileTypeConsumer) {
-        fileTypeConsumer.consume(CsvFileType.INSTANCE, String.join(FileTypeConsumer.EXTENSION_DELIMITER, new String[]{"csv"}));
+        fileTypeConsumer.consume(CsvFileType.INSTANCE, String.join(FileTypeConsumer.EXTENSION_DELIMITER, new String[] {"csv"}));
     }
 }

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

@@ -38,7 +38,7 @@ public static PsiElement createEmptyCsvField(PsiFile psiFile) {
         final PsiManager psiManager = PsiManager.getInstance(project);
         final DummyHolder dummyHolder = DummyHolderFactory.createHolder(psiManager, null);
         final FileElement fileElement = dummyHolder.getTreeElement();
-        final FileParserDefinition parserDefinition = (FileParserDefinition)LanguageParserDefinitions.INSTANCE.forLanguage(CsvLanguage.INSTANCE);
+        final FileParserDefinition parserDefinition = (FileParserDefinition) LanguageParserDefinitions.INSTANCE.forLanguage(CsvLanguage.INSTANCE);
         final Lexer lexer = parserDefinition.createLexer(psiFile);
         final PsiBuilder psiBuilder = PsiBuilderFactory.getInstance().createBuilder(project, fileElement, lexer, CsvLanguage.INSTANCE, text);
         final ASTNode node = parserDefinition.createParser(project).parse(type, psiBuilder);

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

@@ -3,8 +3,8 @@
 import com.intellij.lang.PsiBuilder;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.resolve.FileContextUtil;
-import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 
 public final class CsvParserUtil {
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorAction.java

@@ -3,8 +3,10 @@
 import com.intellij.lang.Language;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.FileContentUtil;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
@@ -14,35 +16,40 @@
 import org.jetbrains.annotations.NotNull;
 
 public class CsvChangeSeparatorAction extends ToggleAction {
-        private String mySeparator;
+    private String mySeparator;
 
-        CsvChangeSeparatorAction(String separator, String mySeparatorTextArg) {
-            super(mySeparatorTextArg);
-            mySeparator = separator;
+    CsvChangeSeparatorAction(String separator, String mySeparatorTextArg) {
+        super(mySeparatorTextArg);
+        mySeparator = separator;
+    }
+
+    @Override
+    public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
+        PsiFile psiFile = anActionEvent.getData(CommonDataKeys.PSI_FILE);
+        if (psiFile == null) {
+            return false;
         }
+        CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
+        return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile).equals(mySeparator);
+    }
 
-        @Override
-        public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
-            PsiFile psiFile = anActionEvent.getData(CommonDataKeys.PSI_FILE);
-            if (psiFile == null) {
-                return false;
-            }
-            CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
-            return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile).equals(mySeparator);
+    @Override
+    public void setSelected(@NotNull AnActionEvent anActionEvent, boolean selected) {
+        PsiFile psiFile = anActionEvent.getData(CommonDataKeys.PSI_FILE);
+        if (psiFile == null) {
+            return;
+        }
+        Language language = psiFile.getLanguage();
+        if (!language.isKindOf(CsvLanguage.INSTANCE) || language instanceof CsvSeparatorHolder) {
+            return;
         }
+        CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
+        csvFileAttributes.setFileSeparator(psiFile, this.mySeparator);
+        FileContentUtil.reparseFiles(psiFile.getVirtualFile());
 
-        @Override
-        public void setSelected(@NotNull AnActionEvent anActionEvent, boolean b) {
-            PsiFile psiFile = anActionEvent.getData(CommonDataKeys.PSI_FILE);
-            if (psiFile == null) {
-                return;
-            }
-            Language language = psiFile.getLanguage();
-            if (!language.isKindOf(CsvLanguage.INSTANCE) || language instanceof CsvSeparatorHolder) {
-                return;
-            }
-            CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
-            csvFileAttributes.setFileSeparator(psiFile, this.mySeparator);
-            FileContentUtil.reparseFiles(psiFile.getVirtualFile());
+        FileEditor fileEditor = anActionEvent.getData(PlatformDataKeys.FILE_EDITOR);
+        if (fileEditor != null) {
+            fileEditor.selectNotify();
         }
-    }
+    }
+}

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvDefaultSeparatorAction.java

@@ -3,8 +3,10 @@
 import com.intellij.lang.Language;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.FileContentUtil;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
@@ -28,7 +30,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
     }
 
     @Override
-    public void setSelected(@NotNull AnActionEvent anActionEvent, boolean b) {
+    public void setSelected(@NotNull AnActionEvent anActionEvent, boolean selected) {
         PsiFile psiFile = anActionEvent.getData(CommonDataKeys.PSI_FILE);
         if (psiFile == null) {
             return;
@@ -40,5 +42,10 @@ public void setSelected(@NotNull AnActionEvent anActionEvent, boolean b) {
         CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
         csvFileAttributes.removeFileSeparator(psiFile);
         FileContentUtil.reparseFiles(psiFile.getVirtualFile());
+
+        FileEditor fileEditor = anActionEvent.getData(PlatformDataKeys.FILE_EDITOR);
+        if (fileEditor != null) {
+            fileEditor.selectNotify();
+        }
     }
 }