mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Minor code cleanup.

Browse source
This commit is contained in:
Sergey Prigogin 2012-04-06 11:01:32 -07:00
parent 9c2b66cf03
commit 2ab852ece0
1 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
View file

@ -425,10 +425,8 @@ public class ChangeGenerator extends ASTVisitor {
edit2.moveTree(-delta); edit2.moveTree(-delta);
result.addChild(edit2); result.addChild(edit2);
edit2 = null; edit2 = null;
} else { } else if (edit2 == null) {
int d = TextEditUtil.delta(edit1); delta += TextEditUtil.delta(edit1);
if (edit2 == null) {
delta += d;
result.addChild(edit1); result.addChild(edit1);
edit1 = null; edit1 = null;
} else { } else {
@ -442,11 +440,13 @@ public class ChangeGenerator extends ASTVisitor {
piece.moveTree(-delta); piece.moveTree(-delta);
result.addChild(piece); result.addChild(piece);
} }
int d = TextEditUtil.delta(edit1);
Region region = new Region(edit1.getOffset() + delta, edit1.getLength() + d); Region region = new Region(edit1.getOffset() + delta, edit1.getLength() + d);
int end = endOffset(region); int end = endOffset(region);
MultiTextEdit format = new MultiTextEdit(); MultiTextEdit format = new MultiTextEdit();
while ((piece = clippedEdit(edit2, region)) != null) { while ((piece = clippedEdit(edit2, region)) != null) {
format.addChild(piece); format.addChild(piece);
// The warning "The variable edit2 may be null at this location" is bogus.
if (edit2.getExclusiveEnd() >= end || j >= formatEdits.length) { if (edit2.getExclusiveEnd() >= end || j >= formatEdits.length) {
break; break;
} }
@ -464,7 +464,6 @@ public class ChangeGenerator extends ASTVisitor {
} }
} }
} }
}
rootEdit = result; rootEdit = result;
} catch (MalformedTreeException e) { } catch (MalformedTreeException e) {
CCorePlugin.log(e); CCorePlugin.log(e);