2424
2525public class CsvPsiTreeUpdater implements PsiFileHolder , Suspendable {
2626
27- private final PsiFileHolder myPsiFileHolder ;
27+ protected final EventListenerList myEventListenerList = new EventListenerList () ;
2828
29- private final PsiFileFactory myFileFactory ;
29+ private final PsiFileHolder myPsiFileHolder ;
3030
31- private final CsvPsiParserFileType myFileType ;
31+ private PsiFileFactory myFileFactory ;
3232
33- protected final EventListenerList myEventListenerList = new EventListenerList () ;
33+ private CsvPsiParserFileType myFileType ;
3434
3535 private List <PsiAction > myUncommittedActions = new ArrayList <>();
3636
3737 public CsvPsiTreeUpdater (@ NotNull PsiFileHolder psiFileHolder ) {
3838 myPsiFileHolder = psiFileHolder ;
39- myFileFactory = PsiFileFactory .getInstance (getPsiFile ().getProject ());
40- myFileType = new CsvPsiParserFileType (CsvHelper .getValueSeparator (psiFileHolder .getPsiFile ()), CsvHelper .getEscapeCharacter (psiFileHolder .getPsiFile ()));
4139 }
4240
4341 private FileType getFileType () {
44- myFileType .setSeparator (CsvHelper .getValueSeparator (getPsiFile ()));
45- myFileType .setEscapeCharacter (CsvHelper .getEscapeCharacter (getPsiFile ()));
42+ PsiFile psiFile = getPsiFile ();
43+ if (psiFile == null ) return null ;
44+
45+ if (myFileType == null ) {
46+ myFileType = new CsvPsiParserFileType (CsvHelper .getValueSeparator (psiFile ), CsvHelper .getEscapeCharacter (psiFile ));
47+ } else {
48+ myFileType .setSeparator (CsvHelper .getValueSeparator (psiFile ));
49+ myFileType .setEscapeCharacter (CsvHelper .getEscapeCharacter (psiFile ));
50+ }
4651 return myFileType ;
4752 }
4853
54+ private PsiFileFactory getFileFactory () {
55+ PsiFile psiFile = getPsiFile ();
56+ if (psiFile == null ) return null ;
57+
58+ if (myFileFactory == null ) {
59+ myFileFactory = PsiFileFactory .getInstance (getPsiFile ().getProject ());
60+ }
61+ return myFileFactory ;
62+ }
63+
4964 private PsiFile createFile (@ NotNull String text ) {
50- return myFileFactory .createFileFromText ("a.csv" , getFileType (), text );
65+ PsiFileFactory fileFactory = getFileFactory ();
66+ return fileFactory == null ? null : getFileFactory ().createFileFromText ("a.csv" , getFileType (), text );
5167 }
5268
5369 private boolean isIndicatingComment (@ NotNull String text ) {
@@ -63,7 +79,7 @@ private boolean isIndicatingComment(@NotNull String text) {
6379 return SyntaxTraverser .psiTraverser (createFile (sanitizedValue )).filter (CsvField .class ).first ();
6480 }
6581
66- public @ NotNull CsvRecord createRecord () {
82+ public @ Nullable CsvRecord createRecord () {
6783 return SyntaxTraverser .psiTraverser (createFile ("\n " )).filter (CsvRecord .class ).first ();
6884 }
6985
@@ -73,6 +89,8 @@ private boolean isIndicatingComment(@NotNull String text) {
7389
7490 public Document getDocument () {
7591 PsiFile psiFile = getPsiFile ();
92+ if (psiFile == null ) return null ;
93+
7694 return PsiDocumentManager .getInstance (psiFile .getProject ()).getDocument (psiFile );
7795 }
7896
@@ -244,12 +262,16 @@ public void deleteRow(@NotNull PsiElement row) {
244262 }
245263
246264 public void deleteRows (Collection <Integer > indices ) {
247- Set <PsiElement > toDelete = new HashSet <>();
248265 PsiFile psiFile = getPsiFile ();
266+ if (psiFile == null ) return ;
267+
268+ Set <PsiElement > toDelete = new HashSet <>();
249269 List <Integer > sortedIndices = new ArrayList <>(indices );
250270 Collections .sort (sortedIndices );
251271 for (int rowIndex : sortedIndices ) {
252272 CsvRecord row = PsiHelper .getNthChildOfType (psiFile , rowIndex , CsvRecord .class );
273+ if (row == null ) continue ;
274+
253275 boolean removePreviousLF = rowIndex > 0 ;
254276 PsiElement lf = PsiHelper .getSiblingOfType (row , CsvTypes .CRLF , removePreviousLF );
255277 if (lf == null || toDelete .contains (lf )) {
@@ -318,34 +340,34 @@ private void doAddField(@NotNull PsiElement anchor, @Nullable String text, boole
318340 public synchronized void commit () {
319341 if (isSuspended () || myUncommittedActions == null || myUncommittedActions .size () == 0 ) return ;
320342
321- suspend ();
322343 List <PsiAction > actionsToCommit = new ArrayList <>(myUncommittedActions );
323- if (!doCommit (() -> {
324- try {
325- actionsToCommit .forEach (PsiAction ::execute );
326- } finally {
327- resume ();
328- fireCommitted ();
329- }
330- })) {
331- resume ();
332- } else {
333- myUncommittedActions .clear ();
334- }
344+ myUncommittedActions .clear ();
345+
346+ doCommit (() -> actionsToCommit .forEach (PsiAction ::execute ));
335347 }
336348
337349 private boolean doCommit (@ NotNull Runnable runnable ) {
338- if (!getPsiFile ().isWritable ()) return false ;
339-
350+ PsiFile psiFile = getPsiFile ();
340351 Document document = getDocument ();
341352
353+ if (psiFile == null || !psiFile .isWritable () || document == null || !document .isWritable ())
354+ {
355+ return false ;
356+ }
357+
358+ suspend ();
342359 ApplicationManager .getApplication ().runWriteAction (() -> {
343- CommandProcessor .getInstance ().executeCommand (
344- getPsiFile ().getProject (),
345- () -> DocumentUtil .executeInBulk (document , runnable ),
346- "CSV Editor changes" ,
347- null ,
348- document );
360+ try {
361+ CommandProcessor .getInstance ().executeCommand (
362+ getPsiFile ().getProject (),
363+ () -> DocumentUtil .executeInBulk (document , runnable ),
364+ "CSV Editor changes" ,
365+ null ,
366+ document );
367+ } finally {
368+ resume ();
369+ fireCommitted ();
370+ }
349371 });
350372
351373 return true ;
@@ -394,18 +416,20 @@ private static class AddSiblingPsiAction extends PsiAction {
394416 private final PsiElement myElementToAdd ;
395417 private final boolean myBefore ;
396418
397- AddSiblingPsiAction (@ NotNull PsiElement anchor , @ NotNull PsiElement elementToAdd ) {
419+ AddSiblingPsiAction (@ NotNull PsiElement anchor , @ Nullable PsiElement elementToAdd ) {
398420 this (anchor , elementToAdd , false );
399421 }
400422
401- AddSiblingPsiAction (@ NotNull PsiElement anchor , @ NotNull PsiElement elementToAdd , boolean before ) {
423+ AddSiblingPsiAction (@ NotNull PsiElement anchor , @ Nullable PsiElement elementToAdd , boolean before ) {
402424 super (anchor );
403425 myElementToAdd = elementToAdd ;
404426 myBefore = before ;
405427 }
406428
407429 @ Override
408430 public void execute () {
431+ if (myElementToAdd == null ) return ;
432+
409433 PsiElement anchor = getAnchor ();
410434 if (anchor .getParent () == null ) return ;
411435 if (myBefore ) {
@@ -420,13 +444,15 @@ private static class AddChildPsiAction extends PsiAction {
420444
421445 private final PsiElement myElementToAdd ;
422446
423- AddChildPsiAction (@ NotNull PsiElement parent , @ NotNull PsiElement elementToAdd ) {
447+ AddChildPsiAction (@ NotNull PsiElement parent , @ Nullable PsiElement elementToAdd ) {
424448 super (parent );
425449 myElementToAdd = elementToAdd ;
426450 }
427451
428452 @ Override
429453 public void execute () {
454+ if (myElementToAdd == null ) return ;
455+
430456 PsiElement anchor = getAnchor ();
431457 anchor .add (myElementToAdd );
432458 }
@@ -436,13 +462,15 @@ private static class ReplacePsiAction extends PsiAction {
436462
437463 private final PsiElement myReplacement ;
438464
439- ReplacePsiAction (@ NotNull PsiElement anchor , @ NotNull PsiElement replacement ) {
465+ ReplacePsiAction (@ NotNull PsiElement anchor , @ Nullable PsiElement replacement ) {
440466 super (anchor );
441467 myReplacement = replacement ;
442468 }
443469
444470 @ Override
445471 public void execute () {
472+ if (myReplacement == null ) return ;
473+
446474 getAnchor ().replace (myReplacement );
447475 }
448476 }
@@ -491,6 +519,8 @@ public void execute() {
491519
492520 PsiDocumentManager manager = PsiDocumentManager .getInstance (psiFile .getProject ());
493521 Document document = manager .getDocument (psiFile );
522+ if (document == null ) return ;
523+
494524 manager .doPostponedOperationsAndUnblockDocument (document );
495525
496526 int offset = 0 ;
0 commit comments