From 5ac9f92a8b288caa5deddb1d5adaf3ead09f9ec8 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Tue, 31 Jan 2017 15:19:34 +0300
Subject: [PATCH] EA-86752 - NPE: OffsetsElementSignatureProvider.findElement

---
 .../folding/impl/OffsetsElementSignatureProvider.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java
index 5a9defd95d0c..cc933b3862e1 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,6 +133,12 @@ public class OffsetsElementSignatureProvider extends AbstractElementSignaturePro
     }
     while (range != null && range.getStartOffset() == start && range.getEndOffset() < end) {
       element = element.getParent();
+      if (element == null) {
+        if (processingInfoStorage != null) {
+          processingInfoStorage.append("Reached top of PSI tree");
+        }
+        return null;
+      }
       range = element.getTextRange();
       if (processingInfoStorage != null) {
         processingInfoStorage.append(String.format("Expanding element to '%s' and range to '%s'%n", element, range));