From 7316d13f0541c5ef9de95bef7cae72c81ddfc522 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Sat, 25 Feb 2017 20:02:45 +0100
Subject: [PATCH] fix EA-97656 - NPE: SingleRootFileViewProvider.findElementAt

---
 .../src/com/intellij/psi/SingleRootFileViewProvider.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
index 0aa296ff35e3..085efcdfa2ce 100644
--- a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
+++ b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
@@ -447,6 +447,7 @@ public class SingleRootFileViewProvider extends UserDataHolderBase implements Fi
     return document;
   }
 
+  @SuppressWarnings("MethodDoesntCallSuperMethod")
   @Override
   public FileViewProvider clone() {
     final VirtualFile origFile = getVirtualFile();
@@ -513,10 +514,8 @@ public class SingleRootFileViewProvider extends UserDataHolderBase implements Fi
 
   @Nullable
   public static PsiElement findElementAt(@Nullable PsiElement psiFile, final int offset) {
-    if (psiFile == null) return null;
-
-    ASTNode treeElement = psiFile.getNode().findLeafElementAt(offset);
-    return SourceTreeToPsiMap.treeElementToPsi(treeElement);
+    ASTNode node = psiFile == null ? null : psiFile.getNode();
+    return node == null ? null : SourceTreeToPsiMap.treeElementToPsi(node.findLeafElementAt(offset));
   }
 
   public void forceCachedPsi(@NotNull PsiFile psiFile) {