From d8bd3edbcda9ef6382e9c2c5c571e610c77b345b Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 24 May 2017 20:03:36 +0200
Subject: [PATCH] fix PIEAE from structure view between PSI invalidation and
 delayed tree update

---
 .../structureView/TextEditorBasedStructureViewModel.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/editor-ui-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java b/platform/editor-ui-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java
index 326af0603696..247382d15b8e 100644
--- a/platform/editor-ui-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java
+++ b/platform/editor-ui-api/src/com/intellij/ide/structureView/TextEditorBasedStructureViewModel.java
@@ -125,9 +125,11 @@ public abstract class TextEditorBasedStructureViewModel implements StructureView
   @Override
   public Object getCurrentEditorElement() {
     if (myEditor == null) return null;
-    final int offset = myEditor.getCaretModel().getOffset();
-    final PsiFile file = getPsiFile();
+    
+    PsiFile file = getPsiFile();
+    if (!file.isValid()) return null;
 
+    int offset = myEditor.getCaretModel().getOffset();
     return findAcceptableElement(file.getViewProvider().findElementAt(offset, file.getLanguage()));
   }