Merge pull request #308 from SeeSharpSoft/fb_prevent_csv_editors_for_diffs

prevent custom CSV editors for diff views

Author: SeeSharpSoft

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

@@ -1,5 +1,6 @@
 package net.seesharpsoft.intellij.plugins.csv.editor;
 
+import com.intellij.diff.editor.DiffVirtualFile;
 import com.intellij.openapi.editor.EditorSettings;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
@@ -16,6 +17,10 @@ public class CsvFileEditorProvider implements AsyncFileEditorProvider, DumbAware
 
     public static final String EDITOR_TYPE_ID = "csv-text-editor";
 
+    public static boolean acceptCsvFile(@NotNull Project project, @NotNull VirtualFile file) {
+        return CsvHelper.isCsvFile(project, file) && !SingleRootFileViewProvider.isTooLargeForContentLoading(file) && !(file instanceof DiffVirtualFile);
+    }
+
     @Override
     public String getEditorTypeId() {
         return EDITOR_TYPE_ID;
@@ -36,7 +41,7 @@ public FileEditorPolicy getPolicy() {
 
     @Override
     public boolean accept(@NotNull Project project, @NotNull VirtualFile file) {
-        return CsvHelper.isCsvFile(project, file) && !SingleRootFileViewProvider.isTooLargeForContentLoading(file);
+        return CsvFileEditorProvider.acceptCsvFile(project, file);
     }
 
     protected void applySettings(EditorSettings editorSettings, CsvEditorSettings csvEditorSettings) {

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java

@@ -102,7 +102,7 @@ public void setEditable(boolean editable) {
     }
 
     public boolean isEditable() {
-        return this.tableIsEditable && !this.hasErrors() && !hasComments();
+        return this.tableIsEditable && !this.hasErrors() && !hasComments() && file.isWritable();
     }
 
     public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorProvider.java

@@ -7,8 +7,7 @@
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.SingleRootFileViewProvider;
-import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
+import net.seesharpsoft.intellij.plugins.csv.editor.CsvFileEditorProvider;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import net.seesharpsoft.intellij.plugins.csv.editor.table.swing.CsvTableEditorSwing;
 import org.jdom.Element;
@@ -39,8 +38,7 @@ public FileEditorPolicy getPolicy() {
     @Override
     public boolean accept(@NotNull Project project, @NotNull VirtualFile file) {
         return CsvEditorSettings.getInstance().getEditorPrio() != CsvEditorSettings.EditorPrio.TEXT_ONLY &&
-                CsvHelper.isCsvFile(project, file) &&
-                !SingleRootFileViewProvider.isTooLargeForIntelligence(file);
+                CsvFileEditorProvider.acceptCsvFile(project, file);
     }
 
     @NotNull

src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvFileEditorTest.java

@@ -1,12 +1,18 @@
 package net.seesharpsoft.intellij.plugins.csv.editor;
 
+import com.intellij.diff.editor.DiffVirtualFile;
+import com.intellij.diff.impl.DiffRequestProcessor;
 import com.intellij.openapi.editor.EditorSettings;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
 import com.intellij.openapi.fileEditor.impl.text.TextEditorState;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vcs.changes.PreviewDiffVirtualFile;
+import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 
 public class CsvFileEditorTest extends BasePlatformTestCase {
 
@@ -93,4 +99,19 @@ public void testCsvEditorStateReadsAndWritesStates() {
         disposeTextEditor(textEditor);
     }
 
+    private static class DiffVirtualFileDummy extends DiffVirtualFile {
+        public DiffVirtualFileDummy(@NotNull String name) {
+            super(name);
+        }
+
+        @Override
+        public DiffRequestProcessor createProcessor(@NotNull Project project) {
+            return null;
+        }
+    }
+
+    public void testAcceptCsvFile() {
+        assertTrue(CsvFileEditorProvider.acceptCsvFile(myFixture.getProject(), new LightVirtualFile(myFixture.getFile().getName())));
+        assertFalse(CsvFileEditorProvider.acceptCsvFile(myFixture.getProject(), new DiffVirtualFileDummy(myFixture.getFile().getName())));
+    }
 }