Bug 520034 - [GE] Folding reconciler removes folds after editing

- Only remove outdated reconcilers

Change-Id: Ie0e2b86cd0b46d75bcdb4c0f7406f551a33b1e48
Signed-off-by: Lucas Bullen <lbullen@redhat.com>

1 files changed, 25 insertions, 11 deletions

diff --git a/org.eclipse.ui.genericeditor.examples/src/org/eclipse/ui/genericeditor/examples/dotproject/FoldingStrategy.java b/org.eclipse.ui.genericeditor.examples/src/org/eclipse/ui/genericeditor/examples/dotproject/FoldingStrategy.java
index 42c36be84bc..f0d573f4be3 100644
--- a/org.eclipse.ui.genericeditor.examples/src/org/eclipse/ui/genericeditor/examples/dotproject/FoldingStrategy.java
+++ b/org.eclipse.ui.genericeditor.examples/src/org/eclipse/ui/genericeditor/examples/dotproject/FoldingStrategy.java
@@ -30,8 +30,10 @@ import org.eclipse.jface.text.source.projection.ProjectionViewer;
 public class FoldingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension {
 
 	private IDocument document;
+	private String oldDocument;
 	private ProjectionViewer projectionViewer;
-	private Annotation[] oldAnnotations;
+	private List<Annotation> oldAnnotations = new ArrayList<>();
+	private List<Position> oldPositions = new ArrayList<>();
 
 	@Override
 	public void setDocument(IDocument document) {
@@ -54,20 +56,32 @@ public class FoldingStrategy implements IReconcilingStrategy, IReconcilingStrate
 
 	@Override
 	public void initialReconcile() {
+		if(document.get().equals(oldDocument)) return;
+		oldDocument = document.get();
+
 		List<Position> positions = getNewPositionsOfAnnotations();
-		Annotation[] annotations = new Annotation[positions.size()];
 
-		HashMap<Annotation, Position> newAnnotations = new HashMap<>();
+		List<Position> positionsToRemove = new ArrayList<>();
+		List<Annotation> annotationToRemove = new ArrayList<>();
 
-		for(int i =0;i<positions.size();i++)
-		{
-			ProjectionAnnotation annotation = new ProjectionAnnotation();
-			newAnnotations.put(annotation,positions.get(i));
-			annotations[i]=annotation;
+		for (Position position : oldPositions) {
+			if(!positions.contains(position)) {
+				projectionViewer.getProjectionAnnotationModel().removeAnnotation(oldAnnotations.get(oldPositions.indexOf(position)));
+				positionsToRemove.add(position);
+				annotationToRemove.add(oldAnnotations.get(oldPositions.indexOf(position)));
+			}else {
+				positions.remove(position);
+			}
+		}
+		oldPositions.removeAll(positionsToRemove);
+		oldAnnotations.removeAll(annotationToRemove);
+
+		for (Position position : positions) {
+			Annotation annotation = new ProjectionAnnotation();
+			projectionViewer.getProjectionAnnotationModel().addAnnotation(annotation, position);
+			oldPositions.add(position);
+			oldAnnotations.add(annotation);
 		}
-
-		projectionViewer.getProjectionAnnotationModel().modifyAnnotations(oldAnnotations,newAnnotations,null);
-		oldAnnotations=annotations;
 	}
 
 	private static enum SearchingFor {