Merge pull request #972 from SeeSharpSoft/copilot/fix-invalid-psi-element

Guard against invalid PSI elements in annotator, intentions, and inspection fixes

Author: SeeSharpSoft

CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### Fixed
 
+## 4.2.1 - Mar 29, 2026
+
+### Fixed
+
+- PluginException: Invalid PSI Element CsvFile when file is invalidated during annotation, intention actions, or inspection fixes
+
 ## 4.2.0 - Jan 26, 2026
 
 ### Fixed

gradlew

@@ -36,6 +36,9 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio
         }
 
         CsvFile csvFile = (CsvFile) element.getContainingFile();
+        if (!csvFile.isValid()) {
+            return;
+        }
         if (handleSeparatorElement(element, holder, elementType, csvFile)) {
             return;
         }

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

@@ -120,6 +120,7 @@ public String getFamilyName() {
         @Override
         public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
             PsiElement element = descriptor.getPsiElement();
+            if (element == null || !element.isValid()) return;
             Document document = PsiDocumentManager.getInstance(project).getDocument(element.getContainingFile());
             if (document == null) return;
 
@@ -147,6 +148,7 @@ public String getFamilyName() {
         public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
             try {
                 PsiElement element = descriptor.getPsiElement();
+                if (element == null || !element.isValid()) return;
                 Document document = PsiDocumentManager.getInstance(project).getDocument(element.getContainingFile());
                 if (document == null) return;
 
@@ -168,6 +170,7 @@ public String getFamilyName() {
         public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
             try {
                 PsiElement element = descriptor.getPsiElement();
+                if (element == null || !element.isValid()) return;
                 Document document = PsiDocumentManager.getInstance(project).getDocument(element.getContainingFile());
                 if (document == null) return;
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/inspection/CsvValidationInspection.java

@@ -26,6 +26,7 @@ public String getFamilyName() {
     public boolean isAvailable(@NotNull Project project, Editor editor, @Nullable PsiElement element) {
         final PsiFile containingFile = element == null ? null : element.getContainingFile();
         return containingFile != null
+                && containingFile.isValid()
                 && containingFile.getLanguage().isKindOf(CsvLanguage.INSTANCE)
                 && PsiDocumentManager.getInstance(project).getDocument(containingFile) != null;
     }

src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvIntentionAction.java

@@ -3,6 +3,7 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfo;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfoMap;
@@ -18,7 +19,14 @@ public CsvShiftColumnLeftIntentionAction() {
 
     @Override
     public void invoke(@NotNull Project project, Editor editor, @NotNull final PsiElement psiElement) throws IncorrectOperationException {
-        CsvFile csvFile = (CsvFile) psiElement.getContainingFile();
+        PsiFile containingFile = psiElement.getContainingFile();
+        if (!(containingFile instanceof CsvFile)) {
+            return;
+        }
+        CsvFile csvFile = (CsvFile) containingFile;
+        if (!csvFile.isValid()) {
+            return;
+        }
 
         PsiElement element = CsvHelper.getParentFieldElement(psiElement);
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvShiftColumnLeftIntentionAction.java

@@ -3,6 +3,7 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfo;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfoMap;
@@ -19,7 +20,14 @@ public CsvShiftColumnRightIntentionAction() {
     @Override
     public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement psiElement)
             throws IncorrectOperationException {
-        CsvFile csvFile = (CsvFile) psiElement.getContainingFile();
+        PsiFile containingFile = psiElement.getContainingFile();
+        if (!(containingFile instanceof CsvFile)) {
+            return;
+        }
+        CsvFile csvFile = (CsvFile) containingFile;
+        if (!csvFile.isValid()) {
+            return;
+        }
 
         PsiElement element = CsvHelper.getParentFieldElement(psiElement);