Fix: Rework CSV file detection for FileEditorProvider

java.lang.NoSuchFieldException: INSTANCE #904

Author: SeeSharpSoft

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

@@ -2,6 +2,7 @@
 
 import com.intellij.lang.*;
 import com.intellij.lexer.Lexer;
+import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -51,32 +52,21 @@ public static PsiElement createEmptyCsvField(PsiFile psiFile) {
         return node.getPsi();
     }
 
-    public static boolean isCsvFile(String extension) {
-        if (extension == null) {
-            return false;
-        }
-        Language language = LanguageUtil.getFileTypeLanguage(
-                FileTypeRegistry.getInstance().getFileTypeByExtension(extension)
-        );
+    public static boolean isCsvFile(FileType fileType) {
+        Language language = LanguageUtil.getFileTypeLanguage(fileType);
         return language != null && language.isKindOf(CsvLanguage.INSTANCE);
     }
 
-    public static boolean isCsvFile(Project project, VirtualFile file) {
-        if (file == null) {
-            return false;
-        }
-        if (project == null) {
-            return isCsvFile(file.getExtension());
-        }
-        final Language language = LanguageUtil.getLanguageForPsi(project, file);
-        return language != null && language.isKindOf(CsvLanguage.INSTANCE);
+    public static boolean isCsvFile(String extension) {
+        return extension != null && isCsvFile(FileTypeRegistry.getInstance().getFileTypeByExtension(extension));
+    }
+
+    public static boolean isCsvFile(VirtualFile file) {
+        return file != null && isCsvFile(file.getFileType());
     }
 
     public static boolean isCsvFile(PsiFile file) {
-        if (file == null) {
-            return false;
-        }
-        return isCsvFile(file.getProject(), getVirtualFile(file));
+        return file != null && isCsvFile(getVirtualFile(file));
     }
 
     public static boolean isCommentElement(PsiElement element) {

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

@@ -83,7 +83,7 @@ private synchronized Attribute getFileAttribute(@NotNull Project project, @NotNu
         Attribute attribute = attributeMap.get(key);
         if (attribute == null && createIfMissing) {
             attribute = new Attribute();
-            if (!CsvHelper.isCsvFile(project, virtualFile)) {
+            if (!CsvHelper.isCsvFile(virtualFile)) {
                 LOG.error("CSV file attribute requested for non CSV file: " + virtualFile.toString());
             } else {
                 attributeMap.put(key, attribute);
@@ -167,7 +167,7 @@ private CsvValueSeparator autoDetectSeparator(Project project, VirtualFile virtu
 
     @NotNull
     public CsvValueSeparator getValueSeparator(Project project, VirtualFile virtualFile) {
-        if (!CsvHelper.isCsvFile(project, virtualFile)) {
+        if (!CsvHelper.isCsvFile(virtualFile)) {
             return CsvEditorSettings.getInstance().getDefaultValueSeparator();
         }
         FileType fileType = virtualFile.getFileType();
@@ -207,7 +207,7 @@ public void resetEscapeSeparator(@NotNull PsiFile psiFile) {
 
     @NotNull
     public CsvEscapeCharacter getEscapeCharacter(Project project, VirtualFile virtualFile) {
-        if (!CsvHelper.isCsvFile(project, virtualFile)) {
+        if (!CsvHelper.isCsvFile(virtualFile)) {
             return CsvEditorSettings.getInstance().getDefaultEscapeCharacter();
         }
         FileType fileType = virtualFile.getFileType();

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvFileEditorProvider.java

@@ -22,7 +22,7 @@ public static boolean acceptCsvFile(@NotNull Project project, @NotNull VirtualFi
             return !SingleRootFileViewProvider.isTooLargeForContentLoading(file)
                     && !SingleRootFileViewProvider.isTooLargeForIntelligence(file)
                     && !(file instanceof DiffViewerVirtualFile)
-                    && CsvHelper.isCsvFile(project, file);
+                    && CsvHelper.isCsvFile(file);
         } catch(Exception exc) {
             return false;
         }

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

@@ -49,9 +49,9 @@
     <depends optional="true" config-file="withGithub.xml">org.jetbrains.plugins.github</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <fileType name="CSV" language="csv" implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvFileType" extensions="csv" fieldName="INSTANCE"/>
-        <fileType name="TSV" language="csv" implementationClass="net.seesharpsoft.intellij.plugins.tsv.TsvFileType" extensions="tsv;tab" fieldName="INSTANCE"/>
-        <fileType name="PSV" language="csv" implementationClass="net.seesharpsoft.intellij.plugins.psv.PsvFileType" extensions="psv" fieldName="INSTANCE"/>
+        <fileType name="CSV" language="csv" implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvFileType" extensions="csv"/>
+        <fileType name="TSV" language="csv" implementationClass="net.seesharpsoft.intellij.plugins.tsv.TsvFileType" extensions="tsv;tab"/>
+        <fileType name="PSV" language="csv" implementationClass="net.seesharpsoft.intellij.plugins.psv.PsvFileType" extensions="psv"/>
 
         <lang.parserDefinition language="csv"
                                implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvParserDefinition"/>
@@ -60,6 +60,10 @@
                                        implementationClass="net.seesharpsoft.intellij.plugins.csv.highlighter.CsvSyntaxHighlighterFactory"/>
         <editorHighlighterProvider filetype="CSV"
                                    implementationClass="net.seesharpsoft.intellij.plugins.csv.highlighter.CsvEditorHighlighterProvider"/>
+        <editorHighlighterProvider filetype="TSV"
+                                   implementationClass="net.seesharpsoft.intellij.plugins.csv.highlighter.CsvEditorHighlighterProvider"/>
+        <editorHighlighterProvider filetype="PSV"
+                                   implementationClass="net.seesharpsoft.intellij.plugins.csv.highlighter.CsvEditorHighlighterProvider"/>
         <highlightUsagesHandlerFactory
                 implementation="net.seesharpsoft.intellij.plugins.csv.highlighter.CsvHighlightUsagesHandlerFactory"/>