Merge pull request #263 from SeeSharpSoft/master

Release 2.15.0

Author: SeeSharpSoft

.travis.yml

@@ -3,7 +3,7 @@ jdk:
  - openjdk11
 
 env:
- - IDEA_VERSION=PC-2019.3.3 GRAMMAR_KIT_VERSION=2019.3
+ - IDEA_VERSION=PC-2020.3.3 GRAMMAR_KIT_VERSION=2019.3
  - IDEA_VERSION=IU-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2019.3
 
 script: xvfb-run gradle check

CHANGELOG

@@ -1,3 +1,9 @@
+2.15.0
+Mar 23, 2021
+
+NEW: Default value separator #259
+FIX: Removal of deprecated function usage
+
 2.14.4
 Feb 14, 2021
 

README.md

@@ -7,7 +7,7 @@
 
 # Lightweight CSV Plugin for JetBrains IDE family
 
-Compatible with _IntelliJ IDEA PhpStorm WebStorm PyCharm RubyMine AppCode CLion Gogland DataGrip Rider MPS Android Studio_ - __2017.3.1 and newer__
+Compatible with _IntelliJ IDEA PhpStorm WebStorm PyCharm RubyMine AppCode CLion Gogland DataGrip Rider MPS Android Studio_ - __2019.3.5 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/.psv).
 This enables default editor features like syntax validation, highlighting and inspections for CSV-alike files.
@@ -37,7 +37,7 @@ This enables default editor features like syntax validation, highlighting and in
 
 **!!Please note!!**
 
-- Starting with **CSV Plugin 2.10.0**, _new features will only be developed for IntelliJ IDE 2019.3 and higher_. I will still release patches for major/critical bugs for previous IDE versions 2017.3.1 - 2019.2.\*, but no additional features or cosmetic fixes.
+- Starting with **CSV Plugin 2.10.0**, _new features will only be developed for IntelliJ IDE 2019.3.5 and higher_. ~~I will still release patches for major/critical bugs for previous IDE versions 2017.3.1 - 2019.3.4\*, but no additional features or cosmetic fixes.~~
 
 - Starting with **CSV Plugin 2.11.0**, _Java 9 (53) or higher is required_. Previous versions can be downloaded and installed manually from the following locations: [GitHub Releases](https://github.com/SeeSharpSoft/intellij-csv-validator/releases), [Plugin Repository](https://plugins.jetbrains.com/plugin/10037-csv-plugin/versions) (see also section [Installation](https://github.com/SeeSharpSoft/intellij-csv-validator#installation)).
 
@@ -132,6 +132,8 @@ The preferred editor usage can be switched between "Text Editor first", "Table E
 
 The following separators are currently supported: **,** (Comma), **;** (Semicolon), **:** (Colon), **|** (Pipe) and **↹** (Tab)
 
+**since 2.15.0:** The default value separator can also be a user defined character sequence.
+
 _Default Value Separator_ defines which separator is used as standard for each newly created or opened CSV file.
 The separator character can be changed for each file individually in its editors context menu.
 

build.gradle

@@ -11,25 +11,32 @@ buildscript {
 
 plugins {
  // https://github.com/JetBrains/gradle-intellij-plugin
- id 'org.jetbrains.intellij' version '0.4.10'
+ id 'org.jetbrains.intellij' version '0.7.2'
  id 'jacoco'
- id 'com.github.kt3k.coveralls' version '2.8.2'
+ id 'com.github.kt3k.coveralls' version '2.8.4'
  id "com.github.ManifestClasspath" version "0.1.0-RELEASE"
 }
 
+jacoco {
+ toolVersion = "0.8.6"
+}
+
 jacocoTestReport {
  reports {
  xml.enabled true
  }
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.14.4'
+version '2.15.0'
 
 apply plugin: 'java'
 project.sourceCompatibility = JavaVersion.VERSION_11
 project.targetCompatibility = JavaVersion.VERSION_11
-tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+tasks.withType(JavaCompile) {
+ options.encoding = 'UTF-8'
+ options.compilerArgs << "-Xlint:deprecation"
+}
 repositories {
  mavenCentral()
 }

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

@@ -12,11 +12,11 @@
 
 public class CsvIconProvider extends IconProvider {
 
- public static final Icon FILE = IconLoader.getIcon("/media/icons/csv-icon.png");
+ public static final Icon FILE = IconLoader.getIcon("/media/icons/csv-icon.png", CsvIconProvider.class);
 
- public static final Icon HEADER = IconLoader.getIcon("/media/icons/csv-header-icon.png");
+ public static final Icon HEADER = IconLoader.getIcon("/media/icons/csv-header-icon.png", CsvIconProvider.class);
 
- public static final Icon FIELD = IconLoader.getIcon("/media/icons/csv-field-icon.png");
+ public static final Icon FIELD = IconLoader.getIcon("/media/icons/csv-field-icon.png", CsvIconProvider.class);
 
  @Nullable
  @Override

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

@@ -62,11 +62,6 @@ public PsiFile createFile(FileViewProvider viewProvider) {
  return new CsvFile(viewProvider, CsvFileType.INSTANCE);
  }
 
- @Override
- public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
- return SpaceRequirements.MAY;
- }
-
  @Override
  @NotNull
  public PsiElement createElement(ASTNode node) {

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

@@ -3,6 +3,7 @@
 import com.intellij.ide.actions.ShowSettingsUtilImpl;
 import com.intellij.ide.plugins.IdeaPluginDescriptorImpl;
 import com.intellij.ide.plugins.PluginManager;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.notification.*;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.options.ShowSettingsUtil;
@@ -20,7 +21,7 @@
 public class CsvPlugin implements StartupActivity {
 
  protected static IdeaPluginDescriptorImpl getPluginDescriptor() {
- return (IdeaPluginDescriptorImpl)PluginManager.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
+ return (IdeaPluginDescriptorImpl)PluginManagerCore.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
  }
 
  protected static String getVersion() {

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

@@ -20,9 +20,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 @State(
  name = "CsvFileAttributes",
@@ -125,10 +123,15 @@ CsvValueSeparator autoDetectOrGetDefaultValueSeparator(Project project, VirtualF
 
  private @NotNull
  CsvValueSeparator autoDetectSeparator(Project project, VirtualFile virtualFile) {
- Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
+ final Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
  final String text = document == null ? "" : document.getText();
+ final List<CsvValueSeparator> applicableValueSeparators = new ArrayList(Arrays.asList(CsvValueSeparator.values()));
+ final CsvValueSeparator defaultValueSeparator = CsvEditorSettings.getInstance().getDefaultValueSeparator();
+ if (defaultValueSeparator.isCustom()) {
+ applicableValueSeparators.add(defaultValueSeparator);
+ }
  Pair<CsvValueSeparator, Integer> separatorWithCount =
- Arrays.stream(CsvValueSeparator.values())
+ applicableValueSeparators.parallelStream()
  // count
  .map(separator -> {
  String character = separator.getCharacter();
@@ -143,7 +146,7 @@ CsvValueSeparator autoDetectSeparator(Project project, VirtualFile virtualFile)
 
  CsvValueSeparator valueSeparator = separatorWithCount != null ?
  separatorWithCount.getFirst() :
- CsvEditorSettings.getInstance().getDefaultValueSeparator();
+ defaultValueSeparator;
 
  setFileSeparator(project, virtualFile, valueSeparator);
  return valueSeparator;

src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java

@@ -65,7 +65,14 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio
  textRange = TextRange.from(textRange.getStartOffset() - 1, 1);
  }
 
- Annotation annotation = holder.createAnnotation(CSV_COLUMN_INFO_SEVERITY, textRange, message, tooltip);
+ final Annotation annotation =
+ new Annotation(
+ textRange.getStartOffset(),
+ textRange.getEndOffset(),
+ CSV_COLUMN_INFO_SEVERITY,
+ message,
+ tooltip
+ );
  annotation.setEnforcedTextAttributes(
  CsvEditorSettings.getInstance().getValueColoring() == CsvEditorSettings.ValueColoring.RAINBOW ?
  CsvColorSettings.getTextAttributesOfColumn(columnInfo.getColumnIndex(), holder.getCurrentAnnotationSession()) :
@@ -98,11 +105,15 @@ protected boolean handleSeparatorElement(@NotNull PsiElement element, @NotNull A
  }
  }
  if (textAttributes != null) {
- Annotation annotation = holder.createAnnotation(
- CSV_COLUMN_INFO_SEVERITY,
- element.getTextRange(),
- showInfoBalloon(holder.getCurrentAnnotationSession()) ? "↹" : null
- );
+ final TextRange textRange = element.getTextRange();
+ final Annotation annotation =
+ new Annotation(
+ textRange.getStartOffset(),
+ textRange.getEndOffset(),
+ CSV_COLUMN_INFO_SEVERITY,
+ showInfoBalloon(holder.getCurrentAnnotationSession()) ? "↹" : null,
+ null
+ );
  annotation.setEnforcedTextAttributes(textAttributes);
  annotation.setNeedsUpdateOnTyping(false);
  }