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

Let formatter know about the translation unit so that it can resolve

Browse source 
includes.
This commit is contained in:
Sergey Prigogin 2012-02-11 10:36:01 -08:00
parent 5db78a20c8
commit 12c72ed17e
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,9 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition;
import org.eclipse.cdt.core.formatter.CodeFormatter; import org.eclipse.cdt.core.formatter.CodeFormatter;
import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.internal.core.dom.rewrite.ASTModification; import org.eclipse.cdt.internal.core.dom.rewrite.ASTModification;
import org.eclipse.cdt.internal.core.dom.rewrite.ASTModification.ModificationKind; import org.eclipse.cdt.internal.core.dom.rewrite.ASTModification.ModificationKind;
import org.eclipse.cdt.internal.core.dom.rewrite.ASTModificationMap; import org.eclipse.cdt.internal.core.dom.rewrite.ASTModificationMap;
@ -63,7 +65,6 @@ import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ProblemRuntimeExcepti
import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap; import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap;
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;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document; import org.eclipse.jface.text.Document;
@ -122,10 +123,12 @@ public class ChangeGenerator extends ASTVisitor {
change = new CompositeChange(ChangeGeneratorMessages.ChangeGenerator_compositeChange); change = new CompositeChange(ChangeGeneratorMessages.ChangeGenerator_compositeChange);
classifyModifications(); classifyModifications();
rootNode.accept(pathProvider); rootNode.accept(pathProvider);
for (IFile currentFile : changes.keySet()) { for (IFile file : changes.keySet()) {
MultiTextEdit edit = changes.get(currentFile); MultiTextEdit edit = changes.get(file);
edit = formatChangedCode(edit, rootNode.getTranslationUnit().getRawSignature(), currentFile.getProject()); IASTTranslationUnit ast = rootNode.getTranslationUnit();
TextFileChange subchange= ASTRewriteAnalyzer.createCTextFileChange(currentFile); ITranslationUnit tu = (ITranslationUnit) CoreModel.getDefault().create(file);
edit = formatChangedCode(edit, ast.getRawSignature(), tu);
TextFileChange subchange= ASTRewriteAnalyzer.createCTextFileChange(file);
subchange.setEdit(edit); subchange.setEdit(edit);
change.add(subchange); change.add(subchange);
} }
@ -317,11 +320,11 @@ public class ChangeGenerator extends ASTVisitor {
* *
* @param multiEdit The text edit produced by refactoring. * @param multiEdit The text edit produced by refactoring.
* @param code The code being modified. * @param code The code being modified.
* @param project The project containing the code. * @param tu The translation unit containing the code.
* @return The text edit containing formatted refactoring changes, or the original text edit * @return The text edit containing formatted refactoring changes, or the original text edit
* in case of errors. * in case of errors.
*/ */
private MultiTextEdit formatChangedCode(MultiTextEdit multiEdit, String code, IProject project) { private MultiTextEdit formatChangedCode(MultiTextEdit multiEdit, String code, ITranslationUnit tu) {
IDocument document = new Document(code); IDocument document = new Document(code);
try { try {
// Apply refactoring changes to a temporary document. // Apply refactoring changes to a temporary document.
@ -364,8 +367,9 @@ public class ChangeGenerator extends ASTVisitor {
} }
// Calculate formatting changes for the regions after the refactoring changes. // Calculate formatting changes for the regions after the refactoring changes.
ICProject proj = CCorePlugin.getDefault().getCoreModel().create(project); ICProject project = tu.getCProject();
Map<String, String> options = proj.getOptions(true); Map<String, Object> options = new HashMap<String, Object>(project.getOptions(true));
options.put(DefaultCodeFormatterConstants.FORMATTER_TRANSLATION_UNIT, tu);
// Allow all comments to be indented. // Allow all comments to be indented.
options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_NEVER_INDENT_LINE_COMMENTS_ON_FIRST_COLUMN, options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_NEVER_INDENT_LINE_COMMENTS_ON_FIRST_COLUMN,
DefaultCodeFormatterConstants.FALSE); DefaultCodeFormatterConstants.FALSE);