|
Lines 267-280
Link Here
|
| 267 |
} |
267 |
} |
| 268 |
|
268 |
|
| 269 |
final int doVisit(ASTNode node) { |
269 |
final int doVisit(ASTNode node) { |
| 270 |
node.accept(this); |
270 |
// node.accept(this); |
| 271 |
return getExtendedEnd(node); |
271 |
// return getExtendedEnd(node); |
|
|
272 |
return doVisit(node, true); |
| 272 |
} |
273 |
} |
| 273 |
|
274 |
|
|
|
275 |
final int doVisit(ASTNode node, boolean extended) { |
| 276 |
node.accept(this); |
| 277 |
return extended ? getExtendedEnd(node) : node.getStartPosition()+node.getLength(); |
| 278 |
} |
| 279 |
|
| 274 |
private final int doVisit(ASTNode parent, StructuralPropertyDescriptor property, int offset) { |
280 |
private final int doVisit(ASTNode parent, StructuralPropertyDescriptor property, int offset) { |
|
|
281 |
return doVisit(parent, property, offset, true); |
| 282 |
} |
| 283 |
|
| 284 |
private final int doVisit(ASTNode parent, StructuralPropertyDescriptor property, int offset, boolean extended) { |
| 275 |
Object node= getOriginalValue(parent, property); |
285 |
Object node= getOriginalValue(parent, property); |
| 276 |
if (property.isChildProperty() && node != null) { |
286 |
if (property.isChildProperty() && node != null) { |
| 277 |
return doVisit((ASTNode) node); |
287 |
return doVisit((ASTNode) node, extended); |
| 278 |
} else if (property.isChildListProperty()) { |
288 |
} else if (property.isChildListProperty()) { |
| 279 |
return doVisitList((List) node, offset); |
289 |
return doVisitList((List) node, offset); |
| 280 |
} |
290 |
} |
|
Lines 549-556
Link Here
|
| 549 |
} |
559 |
} |
| 550 |
|
560 |
|
| 551 |
} |
561 |
} |
| 552 |
|
562 |
|
| 553 |
private int rewriteRequiredNode(ASTNode parent, StructuralPropertyDescriptor property) { |
563 |
private int rewriteRequiredNode(ASTNode parent, StructuralPropertyDescriptor property) { |
|
|
564 |
return rewriteRequiredNode(parent, property, true); |
| 565 |
} |
| 566 |
private int rewriteRequiredNode(ASTNode parent, StructuralPropertyDescriptor property, boolean extended) { |
| 554 |
RewriteEvent event= getEvent(parent, property); |
567 |
RewriteEvent event= getEvent(parent, property); |
| 555 |
if (event != null && event.getChangeKind() == RewriteEvent.REPLACED) { |
568 |
if (event != null && event.getChangeKind() == RewriteEvent.REPLACED) { |
| 556 |
ASTNode node= (ASTNode) event.getOriginalValue(); |
569 |
ASTNode node= (ASTNode) event.getOriginalValue(); |
|
Lines 562-568
Link Here
|
| 562 |
doTextInsert(offset, (ASTNode) event.getNewValue(), getIndent(offset), true, editGroup); |
575 |
doTextInsert(offset, (ASTNode) event.getNewValue(), getIndent(offset), true, editGroup); |
| 563 |
return offset + length; |
576 |
return offset + length; |
| 564 |
} |
577 |
} |
| 565 |
return doVisit(parent, property, 0); |
578 |
return doVisit(parent, property, 0, extended); |
| 566 |
} |
579 |
} |
| 567 |
|
580 |
|
| 568 |
private int rewriteNode(ASTNode parent, StructuralPropertyDescriptor property, int offset, Prefix prefix) { |
581 |
private int rewriteNode(ASTNode parent, StructuralPropertyDescriptor property, int offset, Prefix prefix) { |
|
Lines 1323-1329
Link Here
|
| 1323 |
} |
1336 |
} |
| 1324 |
|
1337 |
|
| 1325 |
// name |
1338 |
// name |
| 1326 |
pos= rewriteRequiredNode(node, TypeDeclaration.NAME_PROPERTY); |
1339 |
pos= rewriteRequiredNode(node, TypeDeclaration.NAME_PROPERTY, false/* do not use extended position*/); |
| 1327 |
|
1340 |
|
| 1328 |
if (apiLevel >= AST.JLS3) { |
1341 |
if (apiLevel >= AST.JLS3) { |
| 1329 |
pos= rewriteOptionalTypeParameters(node, TypeDeclaration.TYPE_PARAMETERS_PROPERTY, pos, "", false, true); //$NON-NLS-1$ |
1342 |
pos= rewriteOptionalTypeParameters(node, TypeDeclaration.TYPE_PARAMETERS_PROPERTY, pos, "", false, true); //$NON-NLS-1$ |
