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

Bug 371165 - Invalid formatting of newly created classes.

Browse source
This commit is contained in:
Sergey Prigogin 2012-02-10 15:36:32 -08:00
parent bca4d2f4f4
commit 8ae8121492
1 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CCodeFormatter.java
View file

@ -22,6 +22,7 @@ import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage;
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.index.IIndex; import org.eclipse.cdt.core.index.IIndex;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ILanguage;
import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.ITranslationUnit;
@ -33,8 +34,8 @@ import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.text.edits.TextEdit;
import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.IRegion;
import org.eclipse.text.edits.TextEdit;
public class CCodeFormatter extends CodeFormatter { public class CCodeFormatter extends CodeFormatter {
private DefaultCodeFormatterOptions preferences; private DefaultCodeFormatterOptions preferences;
@ -121,13 +122,6 @@ public class CCodeFormatter extends CodeFormatter {
@Override @Override
public TextEdit format(int kind, String source, int offset, int length, int indentationLevel, String lineSeparator) { public TextEdit format(int kind, String source, int offset, int length, int indentationLevel, String lineSeparator) {
TextEdit edit= null; TextEdit edit= null;
ITranslationUnit tu= (ITranslationUnit) options.get(DefaultCodeFormatterConstants.FORMATTER_TRANSLATION_UNIT);
if (tu == null) {
IFile file= (IFile) options.get(DefaultCodeFormatterConstants.FORMATTER_CURRENT_FILE);
if (file != null) {
tu= (ITranslationUnit) CoreModel.getDefault().create(file);
}
}
if (lineSeparator != null) { if (lineSeparator != null) {
preferences.line_separator = lineSeparator; preferences.line_separator = lineSeparator;
} else { } else {
@ -135,6 +129,7 @@ public class CCodeFormatter extends CodeFormatter {
} }
preferences.initial_indentation_level = indentationLevel; preferences.initial_indentation_level = indentationLevel;
ITranslationUnit tu = getTranslationUnit(source);
if (tu != null) { if (tu != null) {
IIndex index; IIndex index;
try { try {
@ -148,7 +143,7 @@ public class CCodeFormatter extends CodeFormatter {
IASTTranslationUnit ast; IASTTranslationUnit ast;
try { try {
try { try {
ast= tu.getAST(index, ITranslationUnit.AST_SKIP_ALL_HEADERS); ast= tu.getAST(index, ITranslationUnit.AST_SKIP_INDEXED_HEADERS);
} catch (CoreException exc) { } catch (CoreException exc) {
throw new AbortFormatting(exc); throw new AbortFormatting(exc);
} }
@ -190,19 +185,13 @@ public class CCodeFormatter extends CodeFormatter {
@Override @Override
public TextEdit[] format(int kind, String source, IRegion[] regions, String lineSeparator) { public TextEdit[] format(int kind, String source, IRegion[] regions, String lineSeparator) {
TextEdit[] edits= new TextEdit[regions.length]; TextEdit[] edits= new TextEdit[regions.length];
ITranslationUnit tu= (ITranslationUnit) options.get(DefaultCodeFormatterConstants.FORMATTER_TRANSLATION_UNIT);
if (tu == null) {
IFile file= (IFile) options.get(DefaultCodeFormatterConstants.FORMATTER_CURRENT_FILE);
if (file != null) {
tu= (ITranslationUnit) CoreModel.getDefault().create(file);
}
}
if (lineSeparator != null) { if (lineSeparator != null) {
preferences.line_separator = lineSeparator; preferences.line_separator = lineSeparator;
} else { } else {
preferences.line_separator = System.getProperty("line.separator"); //$NON-NLS-1$ preferences.line_separator = System.getProperty("line.separator"); //$NON-NLS-1$
} }
ITranslationUnit tu = getTranslationUnit(source);
if (tu != null) { if (tu != null) {
IIndex index; IIndex index;
try { try {
@ -216,20 +205,11 @@ public class CCodeFormatter extends CodeFormatter {
IASTTranslationUnit ast; IASTTranslationUnit ast;
try { try {
try { try {
ast= tu.getAST(index, ITranslationUnit.AST_SKIP_ALL_HEADERS); ast= tu.getAST(index, ITranslationUnit.AST_SKIP_INDEXED_HEADERS);
} catch (CoreException exc) { } catch (CoreException e) {
throw new AbortFormatting(exc); throw new AbortFormatting(e);
}
for (int i = 0; i < regions.length; i++) {
IRegion region = regions[i];
CodeFormatterVisitor codeFormatter =
new CodeFormatterVisitor(preferences, region.getOffset(), region.getLength());
edits[i] = codeFormatter.format(source, ast);
IStatus status= codeFormatter.getStatus();
if (!status.isOK()) {
CCorePlugin.log(status);
}
} }
formatRegions(source, regions, edits, ast);
} finally { } finally {
index.releaseReadLock(); index.releaseReadLock();
} }
@ -246,20 +226,44 @@ public class CCodeFormatter extends CodeFormatter {
try { try {
ast= language.getASTTranslationUnit(content, scanInfo, contentProvider, null, 0, ast= language.getASTTranslationUnit(content, scanInfo, contentProvider, null, 0,
ParserUtil.getParserLogService()); ParserUtil.getParserLogService());
for (int i = 0; i < regions.length; i++) { formatRegions(source, regions, edits, ast);
IRegion region = regions[i];
CodeFormatterVisitor codeFormatter =
new CodeFormatterVisitor(preferences, region.getOffset(), region.getLength());
edits[i]= codeFormatter.format(source, ast);
IStatus status= codeFormatter.getStatus();
if (!status.isOK()) {
CCorePlugin.log(status);
}
}
} catch (CoreException e) { } catch (CoreException e) {
throw new AbortFormatting(e); throw new AbortFormatting(e);
} }
} }
return edits; return edits;
} }
private void formatRegions(String source, IRegion[] regions, TextEdit[] edits,
IASTTranslationUnit ast) {
for (int i = 0; i < regions.length; i++) {
IRegion region = regions[i];
CodeFormatterVisitor codeFormatter =
new CodeFormatterVisitor(preferences, region.getOffset(), region.getLength());
edits[i] = codeFormatter.format(source, ast);
IStatus status= codeFormatter.getStatus();
if (!status.isOK()) {
CCorePlugin.log(status);
}
}
}
private ITranslationUnit getTranslationUnit(String source) {
ITranslationUnit tu= (ITranslationUnit) options.get(DefaultCodeFormatterConstants.FORMATTER_TRANSLATION_UNIT);
if (tu == null) {
IFile file= (IFile) options.get(DefaultCodeFormatterConstants.FORMATTER_CURRENT_FILE);
if (file != null) {
tu= (ITranslationUnit) CoreModel.getDefault().create(file);
}
}
if (tu != null && source != null) {
try {
tu = tu.getWorkingCopy();
tu.getBuffer().setContents(source);
} catch (CModelException e) {
throw new AbortFormatting(e);
}
}
return tu;
}
} }