Fix: Access is allowed with explicit read lock #898 #901

Author: SeeSharpSoft

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

@@ -2,6 +2,7 @@
 
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.EditorFontType;
@@ -213,12 +214,11 @@ public final CsvFile getCsvFile() {
             return null;
         }
         if (this.psiFile == null || !this.psiFile.isValid()) {
-            this.document = FileDocumentManager.getInstance().getDocument(this.file);
-
-            PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);
-
-            this.psiFile = documentManager.getPsiFile(this.document);
-
+            this.psiFile = ReadAction.compute(() -> {
+                this.document = FileDocumentManager.getInstance().getDocument(this.file);
+                PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);
+                return documentManager.getPsiFile(this.document);
+            });
             this.currentSeparator = CsvHelper.getValueSeparator(this.psiFile);
             this.currentEscapeCharacter = CsvHelper.getEscapeCharacter(this.psiFile);
         }

src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvPsiTreeUpdater.java

@@ -1,6 +1,7 @@
 package net.seesharpsoft.intellij.plugins.csv.psi;
 
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileTypes.FileType;
@@ -515,27 +516,25 @@ private static class DocumentPsiAction extends PsiAction {
 
         @Override
         public void execute() {
-            ApplicationManager.getApplication().runWriteAction(
-                    () -> {
-                        PsiFile psiFile = (PsiFile) getAnchor();
+            WriteAction.run(() -> {
+                PsiFile psiFile = (PsiFile) getAnchor();
 
-                        PsiDocumentManager manager = PsiDocumentManager.getInstance(psiFile.getProject());
-                        Document document = manager.getDocument(psiFile);
-                        if (document == null) return;
+                PsiDocumentManager manager = PsiDocumentManager.getInstance(psiFile.getProject());
+                Document document = manager.getDocument(psiFile);
+                if (document == null) return;
 
-                        manager.doPostponedOperationsAndUnblockDocument(document);
+                manager.doPostponedOperationsAndUnblockDocument(document);
 
-                        int offset = 0;
-                        for (Pair<TextRange, String> replacement : myReplacements) {
-                            TextRange textRange = replacement.getFirst().shiftRight(offset);
-                            String text = replacement.getSecond();
-                            document.replaceString(textRange.getStartOffset(), textRange.getEndOffset(), text);
-                            offset += text.length() - textRange.getLength();
-                        }
+                int offset = 0;
+                for (Pair<TextRange, String> replacement : myReplacements) {
+                    TextRange textRange = replacement.getFirst().shiftRight(offset);
+                    String text = replacement.getSecond();
+                    document.replaceString(textRange.getStartOffset(), textRange.getEndOffset(), text);
+                    offset += text.length() - textRange.getLength();
+                }
 
-                        manager.commitDocument(document);
-                    }
-            );
+                manager.commitDocument(document);
+            });
         }
     }
 }