Merge pull request #360 from SeeSharpSoft/main

Release 3.0.1

Author: SeeSharpSoft

CHANGELOG

@@ -1,3 +1,10 @@
+3.0.1
+Nov 11, 2022
+
+FIX: cannot init component state (componentName=CsvFileAttributes) #359
+FIX: image in plugin description
+FIX: plugin update restart
+
 3.0.0
 Nov 09, 2022
 

build.gradle

@@ -73,7 +73,7 @@ var final EAP_BUILD = '223'
 var idea_version = System.getenv().getOrDefault('IDEA_VERSION', '2022.2.1')
 var build_version = idea_version == EAP_VERSION ? EAP_BUILD : idea_version.substring(2, 4) + idea_version.charAt(5) // extract e.g. '221' from '2022.1.1'
 
-version '3.0.0-' + build_version
+version '3.0.1-' + build_version
 
 apply plugin: 'org.jetbrains.intellij'
 intellij {
@@ -100,9 +100,20 @@ For this release, the plugin was reworked quite a bit, focusing on performance a
 
 Some options were removed for simplification and consistency (e.g. 'Tabularize' formatting), while new features were added (e.g. comment support in table editor).
 
+Due to incompatible code changes, file specific settings (value separator & escape character) are lost and might need to be set again accordingly.
+
 Feedback is welcome!
 
 PS: The previous versions are still available on the project page.
+
+
+Update 3.0.1
+
+FIX: cannot init component state (componentName=CsvFileAttributes) #359
+FIX: image in plugin description
+FIX: plugin update restart
+
+
 </pre>"""
 }
 publishPlugin {

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

@@ -1,6 +1,7 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
 import com.intellij.util.xmlb.Converter;
+import com.intellij.xml.util.XmlStringUtil;
 
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -48,11 +49,11 @@ public static CsvEscapeCharacter create(String character) {
 
     public static class CsvEscapeCharacterConverter extends Converter<CsvEscapeCharacter> {
         public CsvEscapeCharacter fromString(String value) {
-            return CsvEscapeCharacter.create(value);
+            return CsvEscapeCharacter.create(XmlStringUtil.unescapeIllegalXmlChars(value));
         }
 
         public String toString(CsvEscapeCharacter value) {
-            return value.getCharacter();
+            return XmlStringUtil.escapeIllegalXmlChars(value.getCharacter());
         }
     }
 

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

@@ -10,7 +10,7 @@
 import java.util.regex.Pattern;
 
 public final class CsvStorageHelper {
-    public static final String CSV_STATE_STORAGE_FILE = "csv-plugin.xml";
+    public static final String CSV_STATE_STORAGE_FILE = "csv-editor.xml";
 
     public static final Key<String> RELATIVE_FILE_URL = Key.create("CSV_PLUGIN_RELATIVE_URL");
 

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

@@ -11,7 +11,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
-import com.intellij.util.PathUtil;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import com.intellij.util.xmlb.annotations.OptionTag;
 import net.seesharpsoft.commons.collection.Pair;
@@ -22,16 +21,16 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 @State(
         name = "CsvFileAttributes",
         storages = {@Storage(CsvStorageHelper.CSV_STATE_STORAGE_FILE)}
 )
-@SuppressWarnings("all")
 public class CsvFileAttributes implements PersistentStateComponent<CsvFileAttributes> {
     private final static Logger LOG = Logger.getInstance(CsvFileAttributes.class);
 
-    public Map<String, Attribute> attributeMap = new HashMap<>();
+    public Map<String, Attribute> attributeMap = new ConcurrentHashMap<>();
 
     public static class Attribute {
         @OptionTag(converter = CsvValueSeparator.CsvValueSeparatorConverter.class)
@@ -58,7 +57,6 @@ public void loadState(@NotNull CsvFileAttributes state) {
 
     public void cleanupAttributeMap(@NotNull Project project) {
         List<String> faultyFiles = new ArrayList<>();
-        final String projectBasePath = PathUtil.getLocalPath(project.getBasePath());
         attributeMap.forEach((fileName, attribute) -> {
             if (!CsvStorageHelper.csvFileExists(project, fileName)) {
                 LOG.debug(fileName + " not found or not CSV file");
@@ -72,21 +70,17 @@ public void reset() {
         attributeMap.clear();
     }
 
-    protected String generateMapKey(@NotNull PsiFile psiFile) {
-        return generateMapKey(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile());
-    }
-
     protected String generateMapKey(@NotNull Project project, @NotNull VirtualFile virtualFile) {
         return CsvStorageHelper.getRelativeFilePath(project, virtualFile);
     }
 
     @Nullable
-    private Attribute getFileAttribute(@NotNull Project project, @NotNull VirtualFile virtualFile, boolean createIfMissing) {
+    private synchronized Attribute getFileAttribute(@NotNull Project project, @NotNull VirtualFile virtualFile, boolean createIfMissing) {
         String key = generateMapKey(project, virtualFile);
         if (key == null) {
             return null;
         }
-        Attribute attribute = key != null ? attributeMap.get(key) : null;
+        Attribute attribute = attributeMap.get(key);
         if (attribute == null && createIfMissing) {
             attribute = new Attribute();
             if (!CsvHelper.isCsvFile(project, virtualFile)) {
@@ -144,7 +138,7 @@ private CsvValueSeparator autoDetectOrGetDefaultValueSeparator(Project project,
     private CsvValueSeparator autoDetectSeparator(Project project, VirtualFile 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 List<CsvValueSeparator> applicableValueSeparators = new ArrayList<>(Arrays.asList(CsvValueSeparator.values()));
         final CsvValueSeparator defaultValueSeparator = CsvEditorSettings.getInstance().getDefaultValueSeparator();
         if (defaultValueSeparator.isCustom()) {
             applicableValueSeparators.add(defaultValueSeparator);

src/main/resources/META-INF/plugin.xml

@@ -1,14 +1,13 @@
-<idea-plugin require-restart="false">
+<idea-plugin require-restart="true">
     <id>net.seesharpsoft.intellij.plugins.csv</id>
     <name>CSV Editor</name>
     <vendor url="https://github.com/SeeSharpSoft/intellij-csv-validator">
         Martin Sommer
     </vendor>
 
     <description><![CDATA[
-
         <p>Plugin for editing CSV files with a rainbow colored text- & table-editor. It supports are syntax validation, customization, intentions and many more.</p><br>
-        <img width="600" height="297" src="https://plugins.jetbrains.com/files/10037/screenshot_80656a25-da46-4f76-b5c1-a9e8263b8bf3.png" /><br><br>
+        <img width="600" height="297" src="https://plugins.jetbrains.com/files/10037/screenshot_80656a25-da46-4f76-b5c1-a9e8263b8bf3" />
         <p><b>Features:</b><br>
         <ul>
             <li>support for CSV/TSV/PSV file extensions</li>
@@ -29,7 +28,6 @@
             <li>tab (&#8633;) separator highlighting</li>
         </ul>
         </p><br>
-
         <p>
         <b>TSV/PSV file support:</b> <em>TSV/PSV files are recognized as such but treated as a variant of CSV files, the same syntax highlighting and code style settings are applied.</em>
         <br><br>