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

Fix for Bug 173837 - source formatters do not work in .cpp files

Browse source
This commit is contained in:
Anton Leherbauer 2007-02-12 16:59:50 +00:00
parent c3d550f539
commit a6e6bc11d3
3 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
View file

@ -177,6 +177,8 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
public Scribe scribe; public Scribe scribe;
private String fTranslationUnitFile; private String fTranslationUnitFile;
private boolean fInsideFor;
public CodeFormatterVisitor(DefaultCodeFormatterOptions preferences, Map settings, int offset, int length) { public CodeFormatterVisitor(DefaultCodeFormatterOptions preferences, Map settings, int offset, int length) {
localScanner = new Scanner() { localScanner = new Scanner() {
public Token nextToken() { public Token nextToken() {
@ -740,6 +742,13 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
private int visit(ICPPASTFunctionDeclarator node) { private int visit(ICPPASTFunctionDeclarator node) {
visit((IASTStandardFunctionDeclarator)node); visit((IASTStandardFunctionDeclarator)node);
final IASTTypeId[] exceptionSpecification= node.getExceptionSpecification();
if (exceptionSpecification != null && exceptionSpecification.length > 0) {
// TLETODO [formatter] need special alignment for exception specification
scribe.printNextToken(Token.t_throw, true);
final ListAlignment align= new ListAlignment(Alignment.M_COMPACT_SPLIT);
formatList(Arrays.asList(exceptionSpecification), align, true, false);
}
final ICPPASTConstructorChainInitializer[] constructorChain= node.getConstructorChain(); final ICPPASTConstructorChainInitializer[] constructorChain= node.getConstructorChain();
if (constructorChain != null && constructorChain.length > 0) { if (constructorChain != null && constructorChain.length > 0) {
// TLETODO [formatter] need special constructor chain alignment // TLETODO [formatter] need special constructor chain alignment
@ -751,7 +760,7 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
formatList(Arrays.asList(constructorChain), align, false, false); formatList(Arrays.asList(constructorChain), align, false, false);
scribe.unIndent(); scribe.unIndent();
} }
// skip the rest (const, throw, etc.) // skip the rest (const, etc.)
skipNode(node); skipNode(node);
return PROCESS_SKIP; return PROCESS_SKIP;
} }
@ -855,7 +864,6 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
} }
scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon); scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon);
scribe.printTrailingComment(); scribe.printTrailingComment();
scribe.startNewLine();
return PROCESS_SKIP; return PROCESS_SKIP;
} }
@ -1339,9 +1347,9 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
private int visit(IASTDeclarationStatement node) { private int visit(IASTDeclarationStatement node) {
node.getDeclaration().accept(this); node.getDeclaration().accept(this);
// semicolon is already part of declaration if (!fInsideFor) {
// scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon); scribe.startNewLine();
// scribe.printTrailingComment(); }
return PROCESS_SKIP; return PROCESS_SKIP;
} }
@ -1361,7 +1369,9 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
scribe.space(); scribe.space();
} }
IASTStatement initializerStmt= node.getInitializerStatement(); IASTStatement initializerStmt= node.getInitializerStatement();
fInsideFor= true;
initializerStmt.accept(this); initializerStmt.accept(this);
fInsideFor= false;
final IASTExpression condition = node.getConditionExpression(); final IASTExpression condition = node.getConditionExpression();
if (condition != null) { if (condition != null) {
if (preferences.insert_space_after_semicolon_in_for) { if (preferences.insert_space_after_semicolon_in_for) {

13
core/org.eclipse.cdt.ui.tests/resources/formatter/bugs/After.cpp
View file

@ -5,3 +5,16 @@ struct x getX() {
} }
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171520 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=171520
int bug=sizeof(int); int bug=sizeof(int);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=173837
class ABaseClass {
protected:
ABaseClass(int x);
};
class AClass : public ABaseClass {
AClass(int x) throw(int);
};
AClass::AClass(int x) throw(int) :
ABaseClass(x) {
for (int i=0; i < 12;i++) {
}
}

4
core/org.eclipse.cdt.ui.tests/resources/formatter/bugs/Before.cpp
View file

@ -3,3 +3,7 @@ struct x {};
struct x getX() {} struct x getX() {}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171520 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=171520
int bug=sizeof(int); int bug=sizeof(int);
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=173837
class ABaseClass {protected:ABaseClass(int x);};
class AClass : public ABaseClass {AClass(int x) throw(int);};
AClass::AClass(int x)throw(int):ABaseClass(x){for (int i=0;i < 12;i++) {}}