From 9e25538028878eb238d47f40e773cf21e9ad020d Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 1 Dec 2009 16:06:43 +0300
Subject: [PATCH] http://ea.jetbrains.com/browser/ea_problems/14879

---
 .../com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
index abc92534ba..bdea5103dc 100644
--- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
@@ -63,7 +63,7 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
       PsiImportStatementBase[] statements = importList.getAllImportStatements();
       if (statements.length > 1) {
         final TextRange rangeToFold = getRangeToFold(importList);
-        if (rangeToFold != null && rangeToFold.getEndOffset() > rangeToFold.getStartOffset()) {
+        if (rangeToFold != null && rangeToFold.getLength() > 1) {
           result.add(new FoldingDescriptor(importList, rangeToFold));
         }
       }
@@ -76,7 +76,7 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
     }
 
     TextRange range = getFileHeader(file);
-    if (range != null && document.getLineNumber(range.getEndOffset()) > document.getLineNumber(range.getStartOffset())) {
+    if (range != null && range.getLength() > 1 && document.getLineNumber(range.getEndOffset()) > document.getLineNumber(range.getStartOffset())) {
       result.add(new FoldingDescriptor(file, range));
     }
 
@@ -640,14 +640,14 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
     if (!allowOneLiners) {
       int startLine = document.getLineNumber(range.getStartOffset());
       int endLine = document.getLineNumber(range.getEndOffset() - 1);
-      if (startLine < endLine) {
+      if (startLine < endLine && range.getLength() > 1) {
         list.add(new FoldingDescriptor(elementToFold, range));
         return true;
       }
       return false;
     }
     else {
-      if (range.getEndOffset() - range.getStartOffset() > getPlaceholderText(elementToFold).length()) {
+      if (range.getLength() > getPlaceholderText(elementToFold).length()) {
         list.add(new FoldingDescriptor(elementToFold, range));
         return true;
       }
-- 
2.11.4.GIT