diff options
| author | Kai Maetzel | 2004-06-11 09:17:13 +0000 |
|---|---|---|
| committer | Kai Maetzel | 2004-06-11 09:17:13 +0000 |
| commit | ed855734643d4975e1762ff7a0160e76b7976a54 (patch) | |
| tree | b25d81c302bd7d2043d6a00f133ef618fae63027 /org.eclipse.text/projection | |
| parent | 630743f74a40c0329c86fd636309be3fe0253bf5 (diff) | |
| download | eclipse.platform.text-ed855734643d4975e1762ff7a0160e76b7976a54.tar.gz eclipse.platform.text-ed855734643d4975e1762ff7a0160e76b7976a54.tar.xz eclipse.platform.text-ed855734643d4975e1762ff7a0160e76b7976a54.zip | |
#66632
Diffstat (limited to 'org.eclipse.text/projection')
| -rw-r--r-- | org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java index 98838e2e1d4..8811c0d08d8 100644 --- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java +++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionMapping.java @@ -510,7 +510,11 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen result[resultLength - 1]= lastRegion; } else { // merge first and last - result[0]= getIntersectingRegion(result[0], lastRegion); + IRegion intersection= getIntersectingRegion(result[0], lastRegion); + if (intersection == null) + result= new IRegion[0]; + else + result[0]= intersection; } return result; @@ -562,7 +566,10 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen result[resultLength - 1]= lastRegion; } else { // merge first and last - result[0]= getIntersectingRegion(result[0], lastRegion); + IRegion intersection= getIntersectingRegion(result[0], lastRegion); + if (intersection == null) + return null; + result[0]= intersection; } return result; @@ -606,7 +613,10 @@ public class ProjectionMapping implements IDocumentInformationMapping , IDocumen result[resultLength - 1]= lastRegion; } else { // merge first and last - result[0]= getIntersectingRegion(result[0], lastRegion); + IRegion intersection= getIntersectingRegion(result[0], lastRegion); + if (intersection == null) + return null; + result[0]= intersection; } return result; |