Merge pull request #28 from SeeSharpSoft/fb_fix_tsv_add_separator_inspection

Fb fix tsv add separator inspection

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvLexer.flex

@@ -4,7 +4,6 @@ import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.openapi.project.Project;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
-import static net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings.getCurrentSeparator;
 import com.intellij.psi.TokenType;
 
 %%

src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnIntentionAction.java

@@ -18,9 +18,9 @@ protected CsvShiftColumnIntentionAction(String text) {
         super(text);
     }
 
-    protected static void changeLeftAndRightColumnOrder(@NotNull Project project, CsvFile psiFile, CsvColumnInfo<PsiElement> leftColumnInfo, CsvColumnInfo<PsiElement> rightColumnInfo) {
-        Document document = PsiDocumentManager.getInstance(project).getDocument(psiFile);
-        document.setText(changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(project, psiFile.getLanguage()), leftColumnInfo, rightColumnInfo));
+    protected static void changeLeftAndRightColumnOrder(@NotNull Project project, CsvFile csvFile, CsvColumnInfo<PsiElement> leftColumnInfo, CsvColumnInfo<PsiElement> rightColumnInfo) {
+        Document document = PsiDocumentManager.getInstance(project).getDocument(csvFile);
+        document.setText(changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(project, csvFile.getLanguage()), leftColumnInfo, rightColumnInfo));
     }
 
     @NotNull
@@ -43,10 +43,10 @@ protected static String changeLeftAndRightColumnOrder(String text, String separa
                     TextRange.create(middleSeparator.getEndOffset(), middleSeparator.getEndOffset()) :
                     findNextSeparatorOrCRLF(rightElement);
 
-            newText.append(text.substring(lastIndex, leftSeparator.getEndOffset()))
-                    .append(text.substring(middleSeparator.getEndOffset(), rightSeparator.getStartOffset()))
+            newText.append(text, lastIndex, leftSeparator.getEndOffset())
+                    .append(text, middleSeparator.getEndOffset(), rightSeparator.getStartOffset())
                     .append(separator)
-                    .append(text.substring(leftSeparator.getEndOffset(), middleSeparator.getStartOffset()));
+                    .append(text, leftSeparator.getEndOffset(), middleSeparator.getStartOffset());
 
             lastIndex = rightSeparator.getStartOffset();
         }

src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvValidationInspection.java

@@ -14,8 +14,8 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
-import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -142,8 +142,9 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
             try {
                 PsiElement element = descriptor.getPsiElement();
                 Document document = PsiDocumentManager.getInstance(project).getDocument(element.getContainingFile());
+                String separator = CsvCodeStyleSettings.getCurrentSeparator(element.getProject(), element.getContainingFile().getLanguage());
                 String text = document.getText();
-                document.setText(text.substring(0, element.getTextOffset()) + CsvCodeStyleSettings.getCurrentSeparator(project) + text.substring(element.getTextOffset()));
+                document.setText(text.substring(0, element.getTextOffset()) + separator + text.substring(element.getTextOffset()));
             } catch (IncorrectOperationException e) {
                 LOG.error(e);
             }

src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvCodeStyleSettings.java

@@ -3,7 +3,6 @@
 import com.intellij.lang.Language;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectCoreUtil;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
@@ -48,10 +47,6 @@ public static String getCurrentSeparator(@Nullable Project project, @Nullable La
         return getCurrentSeparator(project);
     }
 
-    public static String getCurrentSeparator() {
-        return getCurrentSeparator(ProjectCoreUtil.theOnlyOpenProject());
-    }
-
     public CsvCodeStyleSettings(CodeStyleSettings settings) {
         super("CsvCodeStyleSettings", settings);
     }

src/test/java/net/seesharpsoft/intellij/plugins/tsv/intention/TsvInspectionTest.java

@@ -0,0 +1,45 @@
+package net.seesharpsoft.intellij.plugins.tsv.intention;
+
+import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import net.seesharpsoft.intellij.plugins.csv.intention.CsvValidationInspection;
+
+public class TsvInspectionTest extends LightCodeInsightFixtureTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return "./src/test/resources/inspection";
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        myFixture.enableInspections(CsvValidationInspection.class);
+    }
+    
+    protected void doTestIntention(String testName, String hint) throws Throwable {
+        myFixture.configureByFile(testName + "/before.tsv");
+        final IntentionAction action = myFixture.filterAvailableIntentions(hint).stream()
+                .filter(intentionAction -> intentionAction.getText().equals(hint))
+                .findFirst().get();
+        
+        myFixture.launchAction(action);
+        myFixture.checkResultByFile(testName + "/after.tsv");
+    }
+    
+    public void testAddClosingQuote() throws Throwable {
+        doTestIntention("AddClosingQuote", "Add closing quote");
+    }
+
+    public void testAddMissingSeparator() throws Throwable {
+        doTestIntention("AddMissingSeparator", "Add separator");
+    }
+
+    public void testSurroundWithQuotes() throws Throwable {
+        doTestIntention("SurroundWithQuotes", "Surround with quotes");
+    }
+
+    public void testInvalidRange() throws Throwable {
+        doTestIntention("AddMissingSeparator", "Add separator");
+    }
+}

src/test/resources/inspection/AddClosingQuote/after.tsv

@@ -0,0 +1,2 @@
+Header 1	 "Header	 2
+Value 1	 Value 2"

src/test/resources/inspection/AddClosingQuote/before.tsv

@@ -0,0 +1,2 @@
+Header 1	 "Header	 2
+Value 1	 Value 2<caret>

src/test/resources/inspection/AddMissingSeparator/after.tsv

@@ -0,0 +1,2 @@
+Header 1	 "Header	 2" 	Header 3
+Value" 1	 Value 2

src/test/resources/inspection/AddMissingSeparator/before.tsv

@@ -0,0 +1,2 @@
+Header 1	 "Header	 2" <caret>Header 3
+Value" 1	 Value 2

src/test/resources/inspection/InvalidRange/after.tsv

@@ -0,0 +1,2 @@
+"Header 1"	"Header	 2
+Value 1 a	"	Value 2"