[INTERNAL] Code cleanup

SeeSharpSoft · SeeSharpSoft · commit ce2918bd395e · 2020-02-07T16:01:53.000+01:00
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/Csv.bnf b/src/main/java/net/seesharpsoft/intellij/plugins/csv/Csv.bnf
@@ -1,8 +1,6 @@
 {
   parserClass="net.seesharpsoft.intellij.plugins.csv.parser.CsvParser"
 
-  parserImports=["static net.seesharpsoft.intellij.plugins.csv.CsvParserUtil.*"]
-
   extends="com.intellij.extapi.psi.ASTWrapperPsiElement"
 
   psiClassPrefix="Csv"
@@ -25,10 +23,10 @@
 
 csvFile ::= record (CRLF record)* [CRLF]
 
-record ::= field ( << separator >> COMMA field)*
+record ::= field (COMMA field)*
 
 field ::= (escaped | nonEscaped)
 
-private escaped ::= QUOTE ( TEXT | << escapeCharacter >> ESCAPED_TEXT)* QUOTE
+private escaped ::= QUOTE (TEXT | ESCAPED_TEXT)* QUOTE
 
 private nonEscaped ::= TEXT*
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvHelper.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvHelper.java
@@ -151,24 +151,48 @@ public static int getFieldEndOffset(PsiElement field) {
         return separator == null ? field.getContainingFile().getTextLength() : separator.getTextOffset();
     }
 
-    public static CsvValueSeparator getCurrentValueSeparator(CsvFile csvFile) {
-        return getCurrentValueSeparator(csvFile.getContainingFile());
+    public static VirtualFile getVirtualFile(PsiFile psiFile) {
+        return psiFile == null ? null : psiFile.getOriginalFile().getVirtualFile();
     }
 
-    public static CsvValueSeparator getCurrentValueSeparator(PsiFile psiFile) {
-        return CsvFileAttributes.getInstance(psiFile.getProject()).getFileSeparator(psiFile);
+    public static Project getProject(PsiFile psiFile) {
+        return psiFile == null ? null : psiFile.getProject();
     }
 
-    public static CsvEscapeCharacter getCurrentEscapeCharacter(CsvFile csvFile) {
-        return getCurrentEscapeCharacter(csvFile.getContainingFile());
+    public static CsvValueSeparator getValueSeparator(CsvFile csvFile) {
+        return getValueSeparator(csvFile.getContainingFile());
     }
 
-    public static CsvEscapeCharacter getCurrentEscapeCharacter(PsiFile psiFile) {
-        return CsvFileAttributes.getInstance(psiFile.getProject()).getEscapeCharacter(psiFile);
+    public static CsvValueSeparator getValueSeparator(PsiFile psiFile) {
+        return getValueSeparator(getProject(psiFile), getVirtualFile(psiFile));
+    }
+
+    public static CsvValueSeparator getValueSeparator(Project project, VirtualFile virtualFile) {
+        return CsvFileAttributes.getInstance(project).getValueSeparator(project, virtualFile);
+    }
+
+    public static boolean hasValueSeparatorAttribute(@NotNull PsiFile psiFile) {
+        return CsvFileAttributes.getInstance(getProject(psiFile)).hasValueSeparatorAttribute(getProject(psiFile), getVirtualFile(psiFile));
+    }
+
+    public static CsvEscapeCharacter getEscapeCharacter(CsvFile csvFile) {
+        return getEscapeCharacter(csvFile.getContainingFile());
+    }
+
+    public static CsvEscapeCharacter getEscapeCharacter(PsiFile psiFile) {
+        return getEscapeCharacter(getProject(psiFile), getVirtualFile(psiFile));
+    }
+
+    public static CsvEscapeCharacter getEscapeCharacter(Project project, VirtualFile virtualFile) {
+        return CsvFileAttributes.getInstance(project).getEscapeCharacter(project, virtualFile);
+    }
+
+    public static boolean hasEscapeCharacterAttribute(@NotNull PsiFile psiFile) {
+        return CsvFileAttributes.getInstance(getProject(psiFile)).hasEscapeCharacterAttribute(getProject(psiFile), getVirtualFile(psiFile));
     }
 
     public static CsvColumnInfoMap<PsiElement> createColumnInfoMap(CsvFile csvFile) {
-        CsvEscapeCharacter escapeCharacter = getCurrentEscapeCharacter(csvFile);
+        CsvEscapeCharacter escapeCharacter = getEscapeCharacter(csvFile);
         Map<Integer, CsvColumnInfo<PsiElement>> columnInfoMap = new HashMap<>();
         CsvRecord[] records = PsiTreeUtil.getChildrenOfType(csvFile, CsvRecord.class);
         int row = 0;
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvParserDefinition.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvParserDefinition.java
@@ -11,12 +11,10 @@
 import com.intellij.psi.tree.IFileElementType;
 import com.intellij.psi.tree.TokenSet;
 import net.seesharpsoft.intellij.lang.FileParserDefinition;
-import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 import net.seesharpsoft.intellij.plugins.csv.parser.CsvParser;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvFile;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvFileElementType;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
-import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 import org.jetbrains.annotations.NotNull;
 
 public class CsvParserDefinition implements FileParserDefinition {
@@ -77,7 +75,7 @@ public PsiElement createElement(ASTNode node) {
 
     @Override
     public Lexer createLexer(@NotNull PsiFile file) {
-        return new CsvLexerAdapter(CsvHelper.getCurrentValueSeparator(file), CsvFileAttributes.getInstance(file.getProject()).getEscapeCharacter(file));
+        return new CsvLexerAdapter(CsvHelper.getValueSeparator(file), CsvHelper.getEscapeCharacter(file));
     }
 
     @Override
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvParserUtil.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvParserUtil.java
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterAction.java
@@ -8,6 +8,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.util.FileContentUtilCore;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,8 +26,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
         if (psiFile == null) {
             return false;
         }
-        CsvFileAttributes csvFileAttributes = CsvFileAttributes.getInstance(psiFile.getProject());
-        return csvFileAttributes.hasEscapeCharacterAttribute(psiFile) && csvFileAttributes.getEscapeCharacter(psiFile).equals(myEscapeCharacter);
+        return CsvHelper.hasEscapeCharacterAttribute(psiFile) && CsvHelper.getEscapeCharacter(psiFile).equals(myEscapeCharacter);
     }
 
     @Override
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionGroup.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionGroup.java
@@ -7,8 +7,8 @@
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.psi.PsiFile;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
-import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,7 +31,7 @@ public void update(AnActionEvent anActionEvent) {
         anActionEvent.getPresentation().setEnabledAndVisible(psiFile != null && language != null && language.isKindOf(CsvLanguage.INSTANCE));
 
         if (psiFile != null) {
-            CsvEscapeCharacter escapeCharacter = CsvFileAttributes.getInstance(psiFile.getProject()).getEscapeCharacter(psiFile);
+            CsvEscapeCharacter escapeCharacter = CsvHelper.getEscapeCharacter(psiFile);
             anActionEvent.getPresentation().setText(String.format("CSV Escape Character: %s", escapeCharacter.getDisplay()));
         }
     }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorAction.java
@@ -9,6 +9,7 @@
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.FileContentUtilCore;
+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
 import net.seesharpsoft.intellij.plugins.csv.CsvSeparatorHolder;
 import net.seesharpsoft.intellij.plugins.csv.CsvValueSeparator;
@@ -29,8 +30,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
         if (psiFile == null) {
             return false;
         }
-        CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
-        return csvFileAttributes.getFileSeparator(psiFile) != null && csvFileAttributes.getFileSeparator(psiFile).equals(mySeparator);
+        return CsvHelper.hasValueSeparatorAttribute(psiFile) && CsvHelper.getValueSeparator(psiFile).equals(mySeparator);
     }
 
     @Override
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionGroup.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionGroup.java
@@ -36,7 +36,7 @@ public void update(AnActionEvent anActionEvent) {
         if (psiFile != null) {
             anActionEvent.getPresentation()
                     .setText(String.format("CSV Value Separator: %s",
-                            CsvHelper.getCurrentValueSeparator(psiFile).getDisplay())
+                            CsvHelper.getValueSeparator(psiFile).getDisplay())
                     );
         }
     }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvDefaultEscapeCharacterAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvDefaultEscapeCharacterAction.java
@@ -7,6 +7,7 @@
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.FileContentUtilCore;
+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 import org.jetbrains.annotations.NotNull;
 
@@ -21,7 +22,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
         if (psiFile == null) {
             return false;
         }
-        return !CsvFileAttributes.getInstance(psiFile.getProject()).hasEscapeCharacterAttribute(psiFile);
+        return !CsvHelper.hasEscapeCharacterAttribute(psiFile);
     }
 
     @Override
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvDefaultSeparatorAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvDefaultSeparatorAction.java
@@ -4,10 +4,10 @@
 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.FileContentUtilCore;
+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 import org.jetbrains.annotations.NotNull;
 
@@ -22,8 +22,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
         if (psiFile == null) {
             return false;
         }
-        CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
-        return csvFileAttributes.getFileSeparator(psiFile) == null;
+        return CsvHelper.getValueSeparator(psiFile) == null;
     }
 
     @Override
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java
@@ -119,7 +119,7 @@ public void resetValueSeparator(@NotNull PsiFile psiFile) {
     }
 
     public @NotNull
-    CsvValueSeparator getFileSeparator(Project project, VirtualFile virtualFile) {
+    CsvValueSeparator getValueSeparator(Project project, VirtualFile virtualFile) {
         if (project == null || virtualFile == null) {
             return CsvEditorSettings.getInstance().getDefaultValueSeparator();
         }
@@ -134,19 +134,11 @@ CsvValueSeparator getFileSeparator(Project project, VirtualFile virtualFile) {
                 attribute.valueSeparator;
     }
 
-    public CsvValueSeparator getFileSeparator(@NotNull PsiFile psiFile) {
-        return getFileSeparator(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile());
-    }
-
-    public boolean hasSeparatorAttribute(@NotNull Project project, @NotNull VirtualFile virtualFile) {
+    public boolean hasValueSeparatorAttribute(@NotNull Project project, @NotNull VirtualFile virtualFile) {
         Attribute attribute = getFileAttribute(project, virtualFile);
         return attribute != null && attribute.valueSeparator != null;
     }
 
-    public boolean hasSeparatorAttribute(@NotNull PsiFile psiFile) {
-        return hasSeparatorAttribute(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile());
-    }
-
     public void setEscapeCharacter(@NotNull PsiFile psiFile, @NotNull CsvEscapeCharacter escapeCharacter) {
         Attribute attribute = getFileAttribute(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile(), true);
         attribute.escapeCharacter = escapeCharacter;
@@ -170,16 +162,8 @@ CsvEscapeCharacter getEscapeCharacter(Project project, VirtualFile virtualFile)
                 attribute.escapeCharacter;
     }
 
-    public CsvEscapeCharacter getEscapeCharacter(@NotNull PsiFile psiFile) {
-        return getEscapeCharacter(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile());
-    }
-
     public boolean hasEscapeCharacterAttribute(@NotNull Project project, @NotNull VirtualFile virtualFile) {
         Attribute attribute = getFileAttribute(project, virtualFile);
         return attribute != null && attribute.escapeCharacter != null;
     }
-
-    public boolean hasEscapeCharacterAttribute(@NotNull PsiFile psiFile) {
-        return hasEscapeCharacterAttribute(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile());
-    }
 }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java
@@ -88,7 +88,7 @@ protected boolean handleSeparatorElement(@NotNull PsiElement element, @NotNull A
         if (elementType == CsvTypes.COMMA) {
             TextAttributes textAttributes = holder.getCurrentAnnotationSession().getUserData(TAB_SEPARATOR_HIGHLIGHT_COLOR_KEY);
             if (!Boolean.TRUE.equals(holder.getCurrentAnnotationSession().getUserData(TAB_SEPARATOR_HIGHLIGHT_COLOR_DETERMINED_KEY))) {
-                CsvValueSeparator separator = CsvHelper.getCurrentValueSeparator(csvFile);
+                CsvValueSeparator separator = CsvHelper.getValueSeparator(csvFile);
                 if (CsvEditorSettings.getInstance().isHighlightTabSeparator() && separator.equals(CsvValueSeparator.TAB)) {
                     textAttributes = new TextAttributes(null,
                             CsvEditorSettings.getInstance().getTabHighlightColor(),
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java
@@ -309,8 +309,8 @@ public final CsvFile getCsvFile() {
             this.document = FileDocumentManager.getInstance().getDocument(this.file);
             PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);
             this.psiFile = documentManager.getPsiFile(this.document);
-            this.currentSeparator = CsvHelper.getCurrentValueSeparator(this.psiFile);
-            this.currentEscapeCharacter = CsvHelper.getCurrentEscapeCharacter(this.psiFile);
+            this.currentSeparator = CsvHelper.getValueSeparator(this.psiFile);
+            this.currentEscapeCharacter = CsvHelper.getEscapeCharacter(this.psiFile);
         }
         return this.psiFile instanceof CsvFile ? (CsvFile) psiFile : null;
     }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvSyntaxHighlighter.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvSyntaxHighlighter.java
@@ -46,7 +46,7 @@ public CsvSyntaxHighlighter(Project project, VirtualFile virtualFile) {
     @NotNull
     @Override
     public Lexer getHighlightingLexer() {
-        return new CsvLexerAdapter(CsvFileAttributes.getInstance(myProject).getFileSeparator(myProject, myVirtualFile), CsvFileAttributes.getInstance(myProject).getEscapeCharacter(myProject, myVirtualFile));
+        return new CsvLexerAdapter(CsvFileAttributes.getInstance(myProject).getValueSeparator(myProject, myVirtualFile), CsvFileAttributes.getInstance(myProject).getEscapeCharacter(myProject, myVirtualFile));
     }
 
     @NotNull
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/inspection/CsvValidationInspection.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/inspection/CsvValidationInspection.java
@@ -151,7 +151,7 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
             try {
                 PsiElement element = descriptor.getPsiElement();
                 Document document = PsiDocumentManager.getInstance(project).getDocument(element.getContainingFile());
-                CsvValueSeparator separator = CsvHelper.getCurrentValueSeparator(element.getContainingFile());
+                CsvValueSeparator separator = CsvHelper.getValueSeparator(element.getContainingFile());
                 String text = document.getText();
                 document.setText(text.substring(0, element.getTextOffset()) + separator.getCharacter() + text.substring(element.getTextOffset()));
             } catch (IncorrectOperationException e) {
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnIntentionAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnIntentionAction.java
@@ -25,7 +25,7 @@ protected static void changeLeftAndRightColumnOrder(@NotNull Project project,
                                                         CsvColumnInfo<PsiElement> rightColumnInfo) {
         Document document = PsiDocumentManager.getInstance(project).getDocument(csvFile);
         document.setText(
-                changeLeftAndRightColumnOrder(document.getText(), CsvHelper.getCurrentValueSeparator(csvFile), leftColumnInfo, rightColumnInfo)
+                changeLeftAndRightColumnOrder(document.getText(), CsvHelper.getValueSeparator(csvFile), leftColumnInfo, rightColumnInfo)
         );
     }
 
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionTest.java
@@ -41,21 +41,21 @@ public void testChangeEscapeCharacter() {
         for (CsvEscapeCharacter escapeCharacter : CsvEscapeCharacter.values()) {
             Presentation presentation = myFixture.testAction(new CsvChangeEscapeCharacterAction(escapeCharacter));
             assertEquals(escapeCharacter.getDisplay(), presentation.getText());
-            assertEquals(escapeCharacter, CsvHelper.getCurrentEscapeCharacter(myFixture.getFile()));
+            assertEquals(escapeCharacter, CsvHelper.getEscapeCharacter(myFixture.getFile()));
         }
     }
 
     public void testDefaultEscapeCharacterAction() {
         myFixture.configureByFiles("CommaSeparated.csv");
 
-        CsvEscapeCharacter initialEscapeCharacter = CsvHelper.getCurrentEscapeCharacter(myFixture.getFile());
+        CsvEscapeCharacter initialEscapeCharacter = CsvHelper.getEscapeCharacter(myFixture.getFile());
 
         myFixture.testAction(new CsvChangeEscapeCharacterAction(CsvEscapeCharacter.BACKSLASH));
 
-        assertFalse("separator should not be initial", initialEscapeCharacter.equals(CsvHelper.getCurrentEscapeCharacter(myFixture.getFile())));
+        assertFalse("separator should not be initial", initialEscapeCharacter.equals(CsvHelper.getEscapeCharacter(myFixture.getFile())));
 
         myFixture.testAction(new CsvDefaultEscapeCharacterAction());
 
-        assertEquals(initialEscapeCharacter, CsvHelper.getCurrentEscapeCharacter(myFixture.getFile()));
+        assertEquals(initialEscapeCharacter, CsvHelper.getEscapeCharacter(myFixture.getFile()));
     }
 }
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionTest.java
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributesTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributesTest.java
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsTest.java

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void update(AnActionEvent anActionEvent) {`
`36`	`36`	`if (psiFile != null) {`
`37`	`37`	`anActionEvent.getPresentation()`
`38`	`38`	`.setText(String.format("CSV Value Separator: %s",`
`39`		`- CsvHelper.getCurrentValueSeparator(psiFile).getDisplay())`
	`39`	`+ CsvHelper.getValueSeparator(psiFile).getDisplay())`
`40`	`40`	`);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import com.intellij.openapi.fileEditor.FileEditor;`
`8`	`8`	`import com.intellij.psi.PsiFile;`
`9`	`9`	`import com.intellij.util.FileContentUtilCore;`
	`10`	`+import net.seesharpsoft.intellij.plugins.csv.CsvHelper;`
`10`	`11`	`import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;`
`11`	`12`	`import org.jetbrains.annotations.NotNull;`
`12`	`13`
`@@ -21,7 +22,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {`
`21`	`22`	`if (psiFile == null) {`
`22`	`23`	`return false;`
`23`	`24`	`}`
`24`		`- return !CsvFileAttributes.getInstance(psiFile.getProject()).hasEscapeCharacterAttribute(psiFile);`
	`25`	`+ return !CsvHelper.hasEscapeCharacterAttribute(psiFile);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`@Override`