Attachment 241849 Details for Bug 432539 – Workaround in ASTRewriteAnalyzer

[patch] Workaround in ASTRewriteAnalyzer

eclipse.jdt.core.patch (text/plain), 1.92 KB, created by Markus Keller

on 2014-04-10 12:50:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2014-04-10 12:50:08 EDT

Size: 1.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>diff --git dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
>index b539d8e..f729091 100644
>--- dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
>+++ dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
>@@ -813,6 +813,21 @@
> 		RewriteEvent event= getEvent(parent, property);
> 		if (event != null) {
> 			switch (event.getChangeKind()) {
>+				case RewriteEvent.REPLACED: {
>+					ASTNode node= (ASTNode) event.getOriginalValue();
>+					TextEditGroup editGroup= getEditGroup(event);
>+					SourceRange range= getExtendedRange(node);
>+					int nodeOffset= range.getStartPosition();
>+					int nodeLen= range.getLength();
>+					if (nodeLen == 0 && (node.getFlags() & ASTNode.RECOVERED) != 0) {
>+						// A recovered node. Assume the prefix was also missing. Fall through to case INSERTED.
>+					} else {
>+						doTextRemoveAndVisit(nodeOffset, nodeLen, node, editGroup);
>+						doTextInsert(nodeOffset, (ASTNode) event.getNewValue(), getIndent(offset), true, editGroup);
>+						return nodeOffset + nodeLen;
>+					}
>+				}
>+				//$FALL-THROUGH$
> 				case RewriteEvent.INSERTED: {
> 					ASTNode node= (ASTNode) event.getNewValue();
> 					TextEditGroup editGroup= getEditGroup(event);
>@@ -839,16 +854,6 @@
> 					}
> 					doTextRemoveAndVisit(offset, len, node, editGroup);
> 					return nodeEnd;
>-				}
>-				case RewriteEvent.REPLACED: {
>-					ASTNode node= (ASTNode) event.getOriginalValue();
>-					TextEditGroup editGroup= getEditGroup(event);
>-					SourceRange range= getExtendedRange(node);
>-					int nodeOffset= range.getStartPosition();
>-					int nodeLen= range.getLength();
>-					doTextRemoveAndVisit(nodeOffset, nodeLen, node, editGroup);
>-					doTextInsert(nodeOffset, (ASTNode) event.getNewValue(), getIndent(offset), true, editGroup);
>-					return nodeOffset + nodeLen;
> 				}
> 			}
> 		}

Actions: View | Diff

Attachments on bug 432539: 241849