Merge pull request #133 from SeeSharpSoft/master

SeeSharpSoft · web-flow · commit 616b7893e6f6 · 2019-05-16T12:56:10.000+02:00
Release 2.5.0
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+2.5.0
+May 16, 2019
+
+NEW: PSV file support
+FIX: NullPointerException in StorageHelper class
+
 2.4.0
 May 11, 2019
 
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This enables default editor features like syntax validation, highlighting and in
 
 ## Features
 
-- CSV/TSV file detection
+- CSV/TSV/PSV file detection
 - table editor
 - customizable text editor
 - syntax validation
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 # https://www.jetbrains.com/intellij-repository/snapshots
 
 name='CSV Plugin'
-pluginVersion=2.4.0
+pluginVersion=2.5.0
 javaVersion=1.8
 javaTargetVersion=1.8
 downloadIntellijSources=false
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvStorageHelper.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvStorageHelper.java
@@ -1,9 +1,9 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
-import com.intellij.psi.PsiFile;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.PathUtil;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Pattern;
 
@@ -12,13 +12,16 @@ public final class CsvStorageHelper {
 
     public static final Key<String> RELATIVE_FILE_URL = Key.create("CSV_PLUGIN_RELATIVE_URL");
 
-    public static String getRelativeFileUrl(@NotNull PsiFile psiFile) {
-        String url = psiFile.getUserData(RELATIVE_FILE_URL);
+    public static String getRelativeFileUrl(Project project, VirtualFile virtualFile) {
+        if (project == null || virtualFile == null) {
+            return null;
+        }
+        String url = virtualFile.getUserData(RELATIVE_FILE_URL);
         if (url == null) {
-            String projectDir = PathUtil.getLocalPath(psiFile.getProject().getBasePath());
-            url = PathUtil.getLocalPath(psiFile.getOriginalFile().getVirtualFile().getPath())
+            String projectDir = PathUtil.getLocalPath(project.getBasePath());
+            url = PathUtil.getLocalPath(virtualFile.getPath())
                     .replaceFirst("^" + Pattern.quote(projectDir), "");
-            psiFile.putUserData(RELATIVE_FILE_URL, url);
+            virtualFile.putUserData(RELATIVE_FILE_URL, url);
         }
         return url;
     }
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
@@ -28,7 +28,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
                 return false;
             }
             CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
-            return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(psiFile).equals(mySeparator);
+            return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), 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
@@ -34,7 +34,9 @@ public void update(AnActionEvent anActionEvent) {
 
         if (psiFile != null) {
             anActionEvent.getPresentation()
-                    .setText(String.format("CSV Value Separator: %s", CsvCodeStyleSettings.getSeparatorDisplayText(CsvCodeStyleSettings.getCurrentSeparator(psiFile))));
+                    .setText(String.format("CSV Value Separator: %s",
+                            CsvCodeStyleSettings.getSeparatorDisplayText(CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile)))
+                    );
         }
     }
 
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
@@ -3,6 +3,8 @@
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import net.seesharpsoft.intellij.plugins.csv.CsvStorageHelper;
@@ -37,27 +39,45 @@ public void loadState(@NotNull CsvFileAttributes state) {
     }
 
     protected String generateMapKey(@NotNull PsiFile psiFile) {
-        return CsvStorageHelper.getRelativeFileUrl(psiFile);
+        return generateMapKey(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile());
+    }
+
+    protected String generateMapKey(@NotNull Project project, @NotNull VirtualFile virtualFile) {
+        return CsvStorageHelper.getRelativeFileUrl(project, virtualFile);
     }
 
     public void setFileSeparator(@NotNull PsiFile psiFile, @NotNull String separator) {
-        Attribute state = attributeMap.get(generateMapKey(psiFile));
+        String key = generateMapKey(psiFile);
+        if (key == null) {
+            return;
+        }
+        Attribute state = attributeMap.get(key);
         if (state == null) {
             state = new Attribute();
-            attributeMap.put(generateMapKey(psiFile), state);
+            attributeMap.put(key, state);
         }
         state.separator = separator;
     }
 
     public void removeFileSeparator(@NotNull PsiFile psiFile) {
-        attributeMap.remove(generateMapKey(psiFile));
+        String key = generateMapKey(psiFile);
+        if (key != null) {
+            attributeMap.remove(key);
+        }
     }
 
-    public String getFileSeparator(@NotNull PsiFile psiFile) {
-        Attribute state = attributeMap.get(generateMapKey(psiFile));
-        if (state != null) {
-            return state.separator;
+    public String getFileSeparator(@NotNull Project project, @NotNull VirtualFile virtualFile) {
+        String key = generateMapKey(project, virtualFile);
+        if (key != null) {
+            Attribute state = attributeMap.get(key);
+            if (state != null) {
+                return state.separator;
+            }
         }
         return null;
     }
+
+    public String getFileSeparator(@NotNull PsiFile psiFile) {
+        return getFileSeparator(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
@@ -39,7 +39,7 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio
             return;
         }
 
-        CsvColumnInfo<PsiElement> columnInfo = csvFile.getMyColumnInfoMap().getColumnInfo(element);
+        CsvColumnInfo<PsiElement> columnInfo = csvFile.getColumnInfoMap().getColumnInfo(element);
 
         if (columnInfo != null) {
             PsiElement headerElement = columnInfo.getHeaderElement();
@@ -82,7 +82,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))) {
-                String separator = CsvCodeStyleSettings.getCurrentSeparator(csvFile.getProject(), csvFile.getLanguage());
+                String separator = CsvCodeStyleSettings.getCurrentSeparator(csvFile);
                 if (CsvEditorSettingsExternalizable.getInstance().isHighlightTabSeparator() && separator.equals(CsvCodeStyleSettings.TAB_SEPARATOR)) {
                     textAttributes = new TextAttributes(null,
                             CsvEditorSettingsExternalizable.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
@@ -101,7 +101,7 @@ public boolean isEditable() {
 
     public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {
         CsvFile csvFile = getCsvFile();
-        return csvFile == null ? null : csvFile.getMyColumnInfoMap();
+        return csvFile == null ? null : csvFile.getColumnInfoMap();
     }
 
     public boolean hasErrors() {
@@ -289,7 +289,7 @@ public CsvFile getCsvFile() {
             this.document = FileDocumentManager.getInstance().getDocument(this.file);
             PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);
             this.psiFile = documentManager.getPsiFile(this.document);
-            this.currentSeparator = CsvCodeStyleSettings.getCurrentSeparator(this.psiFile);
+            this.currentSeparator = CsvCodeStyleSettings.getCurrentSeparator(this.getProject(), this.getFile());
         }
         return this.psiFile instanceof CsvFile ? (CsvFile) psiFile : null;
     }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java
@@ -338,7 +338,7 @@ protected void updateUIComponents() {
             return;
         }
 
-        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();
+        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getColumnInfoMap();
         if (Objects.equals(lastColumnInfoMap, columnInfoMap)) {
             return;
         }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandler.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandler.java
@@ -52,9 +52,9 @@ protected void selectTargets(List<PsiElement> list, Consumer<List<PsiElement>> c
 
     @Override
     public void computeUsages(List<PsiElement> list) {
-        CsvColumnInfoMap<PsiElement> columnInfoMap = getCsvFile().getMyColumnInfoMap();
+        CsvColumnInfoMap<PsiElement> columnInfoMap = getCsvFile().getColumnInfoMap();
         for (PsiElement listElement : list) {
-            CsvColumnInfo<PsiElement> csvColumnInfo = getCsvFile().getMyColumnInfoMap().getColumnInfo(listElement);
+            CsvColumnInfo<PsiElement> csvColumnInfo = getCsvFile().getColumnInfoMap().getColumnInfo(listElement);
             if (csvColumnInfo == null) {
                 continue;
             }
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
@@ -1,11 +1,9 @@
 package net.seesharpsoft.intellij.plugins.csv.highlighter;
 
-import com.intellij.lang.Language;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -38,19 +36,17 @@ public class CsvSyntaxHighlighter extends SyntaxHighlighterBase {
     private static final TextAttributesKey[] EMPTY_KEYS = new TextAttributesKey[0];
 
     private Project myProject;
-    private Language myLanguage;
+    private VirtualFile myVirtualFile;
 
     public CsvSyntaxHighlighter(Project project, VirtualFile virtualFile) {
         this.myProject = project;
-        if (virtualFile != null && virtualFile.getFileType() instanceof LanguageFileType) {
-            this.myLanguage = ((LanguageFileType)virtualFile.getFileType()).getLanguage();
-        }
+        this.myVirtualFile = virtualFile;
     }
 
     @NotNull
     @Override
     public Lexer getHighlightingLexer() {
-        return new CsvLexerAdapter(CsvCodeStyleSettings.getCurrentSeparator(this.myProject, this.myLanguage));
+        return new CsvLexerAdapter(CsvCodeStyleSettings.getCurrentSeparator(this.myProject, this.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
@@ -148,7 +148,7 @@ 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 separator = CsvCodeStyleSettings.getCurrentSeparator(project, element.getContainingFile());
                 String text = document.getText();
                 document.setText(text.substring(0, element.getTextOffset()) + separator + 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(), CsvCodeStyleSettings.getCurrentSeparator(project, csvFile.getLanguage()), leftColumnInfo, rightColumnInfo)
+                changeLeftAndRightColumnOrder(document.getText(), CsvCodeStyleSettings.getCurrentSeparator(project, csvFile), leftColumnInfo, rightColumnInfo)
         );
     }
 
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnLeftIntentionAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnLeftIntentionAction.java
@@ -22,7 +22,7 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull final PsiEl
 
         PsiElement element = CsvHelper.getParentFieldElement(psiElement);
 
-        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();
+        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getColumnInfoMap();
         CsvColumnInfo<PsiElement> rightColumnInfo = columnInfoMap.getColumnInfo(element);
 
         // column must be at least index 1 to be shifted left
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnRightIntentionAction.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnRightIntentionAction.java
@@ -23,7 +23,7 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
 
         PsiElement element = CsvHelper.getParentFieldElement(psiElement);
 
-        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();
+        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getColumnInfoMap();
         CsvColumnInfo<PsiElement> leftColumnInfo = columnInfoMap.getColumnInfo(element);
 
         // column must be at least index 1 to be shifted left
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvFile.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvFile.java
@@ -21,7 +21,7 @@ public CsvFile(@NotNull FileViewProvider viewProvider, LanguageFileType fileType
         myFileType = fileType;
     }
 
-    public CsvColumnInfoMap<PsiElement> getMyColumnInfoMap() {
+    public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {
         if (myColumnInfoMap == null || this.getModificationStamp() != myColumnInfoMapModifiedStamp) {
             myColumnInfoMap = CsvHelper.createColumnInfoMap(this);
             myColumnInfoMapModifiedStamp = getModificationStamp();
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvCodeStyleSettings.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvCodeStyleSettings.java
@@ -3,7 +3,9 @@
 import com.intellij.lang.Language;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
@@ -31,8 +33,9 @@ public class CsvCodeStyleSettings extends CustomCodeStyleSettings {
 
     public static final String DEFAULT_SEPARATOR = ",";
     public static final String TAB_SEPARATOR = "\t";
-    public static final String[] SUPPORTED_SEPARATORS = new String[]{",", ";", "|", TAB_SEPARATOR};
-    public static final String[] SUPPORTED_SEPARATORS_DISPLAY = new String[]{"Comma (,)", "Semicolon (;)", "Pipe (|)", "Tab (↹)"};
+    public static final String PIPE_SEPARATOR = "|";
+    public static final String[] SUPPORTED_SEPARATORS = new String[] {",", ";", PIPE_SEPARATOR, TAB_SEPARATOR};
+    public static final String[] SUPPORTED_SEPARATORS_DISPLAY = new String[] {"Comma (,)", "Semicolon (;)", "Pipe (|)", "Tab (↹)"};
     public static final Pattern REPLACE_DEFAULT_SEPARATOR_PATTERN = Pattern.compile(CsvCodeStyleSettings.DEFAULT_SEPARATOR);
 
     public static String getCurrentSeparator(CodeStyleSettings codeStyleSettings) {
@@ -45,28 +48,41 @@ public static String getCurrentSeparator(CodeStyleSettings codeStyleSettings) {
         return DEFAULT_SEPARATOR;
     }
 
-    public static String getCurrentSeparator(@Nullable Project project) {
+    protected static String getCurrentSeparator(@Nullable Project project) {
         if (!ApplicationManager.getApplication().isUnitTestMode() && project != null) {
             return getCurrentSeparator(CodeStyleSettingsManager.getInstance(project).getCurrentSettings());
         }
         return DEFAULT_SEPARATOR;
     }
 
-    public static String getCurrentSeparator(@Nullable Project project, @Nullable Language language) {
+    protected static String getCurrentSeparator(@Nullable Project project, @Nullable Language language) {
         if (language != null && language instanceof CsvSeparatorHolder) {
-            return ((CsvSeparatorHolder)language).getSeparator();
+            return ((CsvSeparatorHolder) language).getSeparator();
         }
         return getCurrentSeparator(project);
     }
 
+    public static String getCurrentSeparator(@Nullable Project project, @Nullable VirtualFile virtualFile) {
+        if (virtualFile == null) {
+            return getCurrentSeparator(project);
+        }
+        CsvFileAttributes csvFileAttributes = project != null ? ServiceManager.getService(project, CsvFileAttributes.class) : null;
+        String separator = csvFileAttributes != null ? csvFileAttributes.getFileSeparator(project, virtualFile) : null;
+        return separator != null ? separator :
+                virtualFile.getFileType() instanceof LanguageFileType ?
+                        getCurrentSeparator(project, ((LanguageFileType) virtualFile.getFileType()).getLanguage()) :
+                        getCurrentSeparator(project);
+    }
+
+    public static String getCurrentSeparator(@Nullable Project project, @Nullable PsiFile psiFile) {
+        return getCurrentSeparator(project, psiFile == null ? null : psiFile.getOriginalFile().getVirtualFile());
+    }
+
     public static String getCurrentSeparator(@Nullable PsiFile psiFile) {
         if (psiFile == null) {
-            return getCurrentSeparator((Project)null);
+            return getCurrentSeparator((Project) null);
         }
-        Project project = psiFile.getProject();
-        CsvFileAttributes csvFileAttributes = project != null ? ServiceManager.getService(project, CsvFileAttributes.class) : null;
-        String separator = csvFileAttributes != null ? csvFileAttributes.getFileSeparator(psiFile) : null;
-        return separator != null ? separator : getCurrentSeparator(project, psiFile.getLanguage());
+        return getCurrentSeparator(psiFile.getProject(), psiFile);
     }
 
     public static String getSeparatorDisplayText(String separator) {
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/structureview/CsvStructureViewElement.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/structureview/CsvStructureViewElement.java
@@ -98,7 +98,7 @@ protected List<PsiElement> getElements(CsvColumnInfo<PsiElement> columnInfo, int
         public TreeElement[] getChildren() {
             if (myElement instanceof CsvFile) {
                 CsvFile csvFile = (CsvFile) myElement;
-                CsvColumnInfoMap csvColumnInfoMap = csvFile.getMyColumnInfoMap();
+                CsvColumnInfoMap csvColumnInfoMap = csvFile.getColumnInfoMap();
                 int maxRowNumbers = csvColumnInfoMap.getColumnInfo(0).getSize();
                 if (csvColumnInfoMap.hasEmptyLastLine() && CsvEditorSettingsExternalizable.getInstance().isFileEndLineBreak()) {
                     --maxRowNumbers;
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvFileType.java b/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvFileType.java
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvFileTypeFactory.java b/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvFileTypeFactory.java
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvLanguage.java b/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvLanguage.java
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvParserDefinition.java b/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvParserDefinition.java
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/tsv/TsvFileTypeFactory.java b/src/main/java/net/seesharpsoft/intellij/plugins/tsv/TsvFileTypeFactory.java
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
diff --git a/src/main/resources/media/icons/psv-icon.png b/src/main/resources/media/icons/psv-icon.png

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {`
`28`	`28`	`return false;`
`29`	`29`	`}`
`30`	`30`	`CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);`
`31`		`- return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(psiFile).equals(mySeparator);`
	`31`	`+ return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile).equals(mySeparator);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ public void update(AnActionEvent anActionEvent) {`
`34`	`34`
`35`	`35`	`if (psiFile != null) {`
`36`	`36`	`anActionEvent.getPresentation()`
`37`		`- .setText(String.format("CSV Value Separator: %s", CsvCodeStyleSettings.getSeparatorDisplayText(CsvCodeStyleSettings.getCurrentSeparator(psiFile))));`
	`37`	`+ .setText(String.format("CSV Value Separator: %s",`
	`38`	`+ CsvCodeStyleSettings.getSeparatorDisplayText(CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile)))`
	`39`	`+ );`
`38`	`40`	`}`
`39`	`41`	`}`
`40`	`42`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public boolean isEditable() {`
`101`	`101`
`102`	`102`	`public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {`
`103`	`103`	`CsvFile csvFile = getCsvFile();`
`104`		`- return csvFile == null ? null : csvFile.getMyColumnInfoMap();`
	`104`	`+ return csvFile == null ? null : csvFile.getColumnInfoMap();`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public boolean hasErrors() {`
`@@ -289,7 +289,7 @@ public CsvFile getCsvFile() {`
`289`	`289`	`this.document = FileDocumentManager.getInstance().getDocument(this.file);`
`290`	`290`	`PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);`
`291`	`291`	`this.psiFile = documentManager.getPsiFile(this.document);`
`292`		`- this.currentSeparator = CsvCodeStyleSettings.getCurrentSeparator(this.psiFile);`
	`292`	`+ this.currentSeparator = CsvCodeStyleSettings.getCurrentSeparator(this.getProject(), this.getFile());`
`293`	`293`	`}`
`294`	`294`	`return this.psiFile instanceof CsvFile ? (CsvFile) psiFile : null;`
`295`	`295`	`}`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ protected void updateUIComponents() {`
`338`	`338`	`return;`
`339`	`339`	`}`
`340`	`340`
`341`		`- CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();`
	`341`	`+ CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getColumnInfoMap();`
`342`	`342`	`if (Objects.equals(lastColumnInfoMap, columnInfoMap)) {`
`343`	`343`	`return;`
`344`	`344`	`}`