From 2efe62ce99e902655c5c3ef2011c7a1e82823ab9 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <Denis.Zhdanov@jetbrains.com>
Date: Tue, 12 Jul 2011 14:43:23 +0400
Subject: [PATCH] Corrected folding processing

---
 .../com/intellij/codeInsight/folding/impl/FoldingUtil.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUtil.java
index 8fbfea96ee1d..9ba52851e4e6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUtil.java
@@ -44,13 +44,17 @@ class FoldingUtil {
     return null;
   }
 
+  @Nullable
   public static FoldRegion findFoldRegionStartingAtLine(Editor editor, int line){
     FoldRegion result = null;
-    if (line >= editor.getDocument().getLineCount()) {
+    if (line < 0 || line >= editor.getDocument().getLineCount()) {
       return result;
     }
     FoldRegion[] regions = editor.getFoldingModel().getAllFoldRegions();
     for (FoldRegion region : regions) {
+      if (!region.isValid()) {
+        continue;
+      }
       if (region.getDocument().getLineNumber(region.getStartOffset()) == line) {
         if (result != null) return null;
         result = region;