mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Bug 290630 - [formatter] More heuristics for if-else in macros

Browse source
This commit is contained in:
Anton Leherbauer 2009-10-02 11:59:19 +00:00
parent dc18c3165d
commit e5d01853a5
2 changed files with 90 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2494,6 +2494,8 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
if (elseStatement != null) { if (elseStatement != null) {
scribe.startNewLine(); scribe.startNewLine();
} }
} else if (thenStatement instanceof IASTCompoundStatement && !enclosedInMacroExpansion(thenStatement)) {
thenStatement.accept(this);
} else { } else {
scribe.printTrailingComment(); scribe.printTrailingComment();
scribe.startNewLine(); scribe.startNewLine();
@ -2508,11 +2510,13 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
} }
if (elseStatement != null) { if (elseStatement != null) {
if (!startsWithMacroExpansion(elseStatement)) {
if (thenStatementIsBlock) { if (thenStatementIsBlock) {
scribe.printNextToken(Token.t_else, preferences.insert_space_after_closing_brace_in_block); scribe.printNextToken(Token.t_else, preferences.insert_space_after_closing_brace_in_block);
} else { } else {
scribe.printNextToken(Token.t_else, true); scribe.printNextToken(Token.t_else, true);
} }
}
if (elseStatement instanceof IASTCompoundStatement) { if (elseStatement instanceof IASTCompoundStatement) {
elseStatement.accept(this); elseStatement.accept(this);
} else if (elseStatement instanceof IASTIfStatement) { } else if (elseStatement instanceof IASTIfStatement) {

82
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java
View file

@ -1228,4 +1228,86 @@ public class CodeFormatterTest extends BaseUITestCase {
assertFormatterResult(); assertFormatterResult();
} }
//#define If if (1 == 1){
//#define Else } else {
//#define EndElse }
//
//#define Try try{
//#define Catch } catch(...) {
//#define EndCatch }
//
//int main() {
// Try
// cout << "OK2" << endl;
// Catch
// cout << "Exception" << endl;
// EndCatch
// Try
// cout << "OK2" << endl;
// Catch
// cout << "Exception" << endl;
// EndCatch
//
// If
// cout << "OK" << endl;
// Else
// cout << "Strange" << endl;
// EndElse
//
// Try
// cout << "OK2" << endl;
// Catch
// cout << "Exception" << endl;
// EndCatch
// Try
// cout << "OK2" << endl;
// Catch
// cout << "Exception" << endl;
// EndCatch
//
// return 0;
//}
//#define If if (1 == 1){
//#define Else } else {
//#define EndElse }
//
//#define Try try{
//#define Catch } catch(...) {
//#define EndCatch }
//
//int main() {
// Try
// cout << "OK2" << endl;
// Catch
// cout << "Exception" << endl;
// EndCatch
// Try
// cout << "OK2" << endl;
// Catch
// cout << "Exception" << endl;
// EndCatch
//
// If
// cout << "OK" << endl;
// Else
// cout << "Strange" << endl;
// EndElse
//
// Try
// cout << "OK2" << endl;
// Catch
// cout << "Exception" << endl;
// EndCatch
// Try
// cout << "OK2" << endl;
// Catch
// cout << "Exception" << endl;
// EndCatch
//
// return 0;
//}
public void testControlStatementsAsMacro_Bug290630() throws Exception {
assertFormatterResult();
}
} }