Merge pull request #248 from SeeSharpSoft/fb_commenter

[NEW] Support "Comment with line comment"

Author: SeeSharpSoft

CHANGELOG

@@ -1,3 +1,8 @@
+2.14.3
+Oct ??, 2020
+
+NEW: Support "Comment with line comment" #247
+
 2.14.2
 Sep 17, 2020
 

build.gradle

@@ -24,7 +24,7 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.14.2'
+version '2.14.3'
 
 apply plugin: 'java'
 sourceCompatibility = javaVersion

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

@@ -0,0 +1,39 @@
+package net.seesharpsoft.intellij.plugins.csv;
+
+import com.intellij.lang.Commenter;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
+import org.jetbrains.annotations.Nullable;
+
+public class CsvCommenter implements Commenter {
+
+    @Nullable
+    @Override
+    public String getLineCommentPrefix() {
+        String commentIndicator = CsvEditorSettings.getInstance().getCommentIndicator();
+        return commentIndicator == null || commentIndicator.isEmpty() ? null : commentIndicator + " ";
+    }
+
+    @Nullable
+    @Override
+    public String getBlockCommentPrefix() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getBlockCommentSuffix() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getCommentedBlockCommentPrefix() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getCommentedBlockCommentSuffix() {
+        return null;
+    }
+}

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

@@ -49,8 +49,7 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-FIX: Settings reset every update #245
-FIX: Removing comment indicator causes parsing errors
+NEW: Support "Comment with line comment" #247
       </pre>
     ]]>
     </change-notes>
@@ -168,6 +167,8 @@ FIX: Removing comment indicator causes parsing errors
         <todoIndexer implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvTodoIndexer" filetype="PSV" />
 
         <postStartupActivity implementation="net.seesharpsoft.intellij.plugins.csv.CsvPlugin" />
+
+        <lang.commenter implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvCommenter" language="csv" />
     </extensions>
 
     <actions>