mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 01:35:39 +02:00
Code Issues Wiki Activity

Comments in ChangeGenerator, by Emanuel Graf, bug 226251.

Browse source
This commit is contained in:
Markus Schorn 2008-04-09 11:51:43 +00:00
parent e4ae8a89a7
commit d5ad391d97
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/insertbefore/ExceptionTest.java
View file

@ -35,8 +35,8 @@ public class ExceptionTest extends ChangeGeneratorTest {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
source = "void foo(int parameter) throw (float){\n}\n\n"; //$NON-NLS-1$ source = "void foo(int parameter) throw (/*Test*/float) /*Test2*/{\n}\n\n"; //$NON-NLS-1$
expectedSource = "void foo(int parameter) throw (int, float){\n}\n\n"; //$NON-NLS-1$ expectedSource = "void foo(int parameter) throw (int, /*Test*/float) /*Test2*/{\n}\n\n"; //$NON-NLS-1$
super.setUp(); super.setUp();
} }

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

@ -33,6 +33,8 @@ import org.eclipse.cdt.internal.core.dom.rewrite.ASTModificationStore;
import org.eclipse.cdt.internal.core.dom.rewrite.ASTRewriteAnalyzer; import org.eclipse.cdt.internal.core.dom.rewrite.ASTRewriteAnalyzer;
import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ASTWriter; import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ASTWriter;
import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ProblemRuntimeException; import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ProblemRuntimeException;
import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.ASTCommenter;
import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap;
import org.eclipse.cdt.internal.core.dom.rewrite.util.FileContentHelper; import org.eclipse.cdt.internal.core.dom.rewrite.util.FileContentHelper;
import org.eclipse.cdt.internal.core.dom.rewrite.util.FileHelper; import org.eclipse.cdt.internal.core.dom.rewrite.util.FileHelper;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
@ -56,6 +58,7 @@ public class ChangeGenerator extends CPPASTVisitor {
private CompositeChange change; private CompositeChange change;
private final ASTModificationStore modificationStore; private final ASTModificationStore modificationStore;
private NodeCommentMap commentMap;
{ {
shouldVisitExpressions = true; shouldVisitExpressions = true;
@ -97,6 +100,7 @@ public class ChangeGenerator extends CPPASTVisitor {
throws ProblemRuntimeException { throws ProblemRuntimeException {
change = new CompositeChange(Messages.ChangeGenerator_compositeChange); change = new CompositeChange(Messages.ChangeGenerator_compositeChange);
initParentModList(); initParentModList();
commentMap = ASTCommenter.getCommentedNodeMap(rootNode.getTranslationUnit());
rootNode.accept(pathProvider); rootNode.accept(pathProvider);
for (IFile currentFile : changes.keySet()) { for (IFile currentFile : changes.keySet()) {
@ -161,12 +165,13 @@ public class ChangeGenerator extends CPPASTVisitor {
String indent = getIndent(synthNode); String indent = getIndent(synthNode);
ASTWriter synthWriter = new ASTWriter(indent); ASTWriter synthWriter = new ASTWriter(indent);
synthWriter.setModificationStore(modificationStore); synthWriter.setModificationStore(modificationStore);
String synthSource = synthWriter.write(synthNode);
String synthSource = synthWriter.write(synthNode, fileScope, commentMap);
reformatSynthCode(synthNode, synthSource); /*XXX resultat wird nicht verwendet?*/ reformatSynthCode(synthNode, synthSource); /*XXX resultat wird nicht verwendet?*/
int newOffset = synthNode.getFileLocation().getNodeOffset() int newOffset = synthNode.getFileLocation().getNodeOffset()
+ synthNode.getFileLocation().getNodeLength(); + synthNode.getFileLocation().getNodeLength();
sourceOffsets.put(synthNode.getFileLocation().getFileName(), Integer.valueOf(newOffset)); sourceOffsets.put(synthNode.getFileLocation().getFileName(), Integer.valueOf(newOffset));
} }
@ -177,11 +182,11 @@ public class ChangeGenerator extends CPPASTVisitor {
for (ASTModification modification : modificationParent.get(synthTU)) { for (ASTModification modification : modificationParent.get(synthTU)) {
IASTFileLocation targetLocation = modification.getTargetNode() IASTFileLocation targetLocation = modification.getTargetNode()
.getFileLocation(); .getFileLocation();
String currentFile = targetLocation.getFileName(); String currentFile = targetLocation.getFileName();
IPath implPath = new Path(currentFile); IPath implPath = new Path(currentFile);
IFile relevantFile = ResourcesPlugin.getWorkspace().getRoot() IFile relevantFile = ResourcesPlugin.getWorkspace().getRoot()
.getFileForLocation(implPath); .getFileForLocation(implPath);
MultiTextEdit edit; MultiTextEdit edit;
if (changes.containsKey(relevantFile)) { if (changes.containsKey(relevantFile)) {
edit = changes.get(relevantFile); edit = changes.get(relevantFile);
@ -189,8 +194,8 @@ public class ChangeGenerator extends CPPASTVisitor {
edit = new MultiTextEdit(); edit = new MultiTextEdit();
changes.put(relevantFile, edit); changes.put(relevantFile, edit);
} }
String newNodeCode = synthWriter.write(modification.getNewNode(), null, commentMap);
String newNodeCode = synthWriter.write(modification.getNewNode());
switch (modification.getKind()) { switch (modification.getKind()) {
case REPLACE: case REPLACE:
edit.addChild(new ReplaceEdit(targetLocation.getNodeOffset(), edit.addChild(new ReplaceEdit(targetLocation.getNodeOffset(),
@ -555,9 +560,8 @@ public class ChangeGenerator extends CPPASTVisitor {
: synthCode.length()); : synthCode.length());
if (replacementStart < replacementEnd) { if (replacementStart < replacementEnd) {
return synthCode.substring(replacementStart, replacementEnd); return synthCode.substring(replacementStart, replacementEnd);
} else {
return ""; //$NON-NLS-1$
} }
return ""; //$NON-NLS-1$
} }
} }