From be32ca5a0a826bca14e617628cdeb2c77dd2cee3 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 8 Sep 2004 15:47:39 +0000 Subject: [PATCH] 2004-09-08 Alain Magloire Fix for PR 73454. * src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java --- core/org.eclipse.cdt.ui/ChangeLog | 5 +++++ .../ui/text/folding/DefaultCFoldingStructureProvider.java | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 025f271742c..f1c957431fd 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,8 @@ +2004-09-08 Alain Magloire + + Fix for PR 73454. + * src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java + 2004-09-07 Alain Magloire Wrong icons * src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java index 887d01203d2..135cf3024e5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java @@ -219,7 +219,8 @@ public class DefaultCFoldingStructureProvider implements IProjectionListener, IC model.replaceAnnotations(null, additions); } } - + } catch (Exception e) { + e.printStackTrace(); } finally { fCachedDocument= null; fAllowCollapsing= false; @@ -302,7 +303,7 @@ public class DefaultCFoldingStructureProvider implements IProjectionListener, IC int start= fCachedDocument.getLineOfOffset(range.getStartPos()); int end= fCachedDocument.getLineOfOffset(range.getStartPos() + range.getLength()); - if (start != end) { + if (start < end) { int offset= fCachedDocument.getLineOffset(start); int endOffset= fCachedDocument.getLineOffset(end + 1); return new Position(offset, endOffset - offset);