mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Fix for 183220: line wrapping stops working for some expressions

Browse source
This commit is contained in:
Anton Leherbauer 2007-05-23 15:17:00 +00:00
parent 75a3ae8890
commit cada57636c
4 changed files with 138 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@ import org.eclipse.cdt.core.dom.ast.IASTForStatement;
import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
import org.eclipse.cdt.core.dom.ast.IASTInitializer;
import org.eclipse.cdt.core.dom.ast.IASTInitializerExpression;
@ -79,6 +80,7 @@ import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IASTTypeId;
import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
import org.eclipse.cdt.core.dom.ast.c.ICASTCompositeTypeSpecifier;
@ -531,6 +533,10 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
visit((IASTBinaryExpression)node);
} else if (node instanceof IASTLiteralExpression) {
visit((IASTLiteralExpression)node);
} else if (node instanceof IASTUnaryExpression) {
visit((IASTUnaryExpression)node);
} else if (node instanceof IASTIdExpression) {
visit((IASTIdExpression)node);
} else if (node instanceof IASTProblemExpression) {
visit((IASTProblemExpression)node);
} else {
@ -1258,7 +1264,9 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
paramExpr.accept(this);
}
scribe.printNextToken(Token.tRPAREN, preferences.insert_space_before_closing_paren_in_method_invocation);
scribe.printTrailingComment();
if (scribe.printComment()) {
scribe.space();
}
return PROCESS_SKIP;
}
@ -1273,6 +1281,14 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
return PROCESS_SKIP;
}
private int visit(IASTIdExpression node) {
node.getName().accept(this);
if (scribe.printComment()) {
scribe.space();
}
return PROCESS_SKIP;
}
private int visit(IASTTypeIdExpression node) {
scribe.printNextToken(peekNextToken());
scribe.printNextToken(Token.tLPAREN);
@ -1328,19 +1344,104 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
return PROCESS_SKIP;
}
private int visit(IASTUnaryExpression node) {
final IASTExpression operand= node.getOperand();
final int operator= node.getOperator();
switch (operator) {
case IASTUnaryExpression.op_bracketedPrimary:
scribe.printNextToken(Token.tLPAREN, scribe.printComment());
operand.accept(this);
scribe.printNextToken(Token.tRPAREN, scribe.printComment());
break;
case IASTUnaryExpression.op_prefixIncr:
scribe.printNextToken(Token.tINCR, scribe.printComment());
operand.accept(this);
break;
case IASTUnaryExpression.op_prefixDecr:
scribe.printNextToken(Token.tDECR, scribe.printComment());
operand.accept(this);
break;
case IASTUnaryExpression.op_postFixIncr:
operand.accept(this);
scribe.printNextToken(Token.tINCR, scribe.printComment());
break;
case IASTUnaryExpression.op_postFixDecr:
operand.accept(this);
scribe.printNextToken(Token.tDECR, scribe.printComment());
break;
case IASTUnaryExpression.op_minus:
scribe.printNextToken(Token.tMINUS, scribe.printComment());
operand.accept(this);
break;
case IASTUnaryExpression.op_plus:
scribe.printNextToken(Token.tPLUS, scribe.printComment());
operand.accept(this);
break;
case IASTUnaryExpression.op_not:
scribe.printNextToken(Token.tNOT, scribe.printComment());
operand.accept(this);
break;
case IASTUnaryExpression.op_amper:
scribe.printNextToken(Token.tAMPER, scribe.printComment());
operand.accept(this);
break;
case IASTUnaryExpression.op_star:
scribe.printNextToken(Token.tSTAR, scribe.printComment());
operand.accept(this);
break;
case IASTUnaryExpression.op_tilde:
scribe.printNextToken(Token.tCOMPL, scribe.printComment());
operand.accept(this);
break;
case IASTUnaryExpression.op_sizeof:
scribe.printNextToken(Token.t_sizeof, scribe.printComment());
scribe.printNextToken(Token.tLPAREN, scribe.printComment());
operand.accept(this);
if (peekNextToken() != Token.tRPAREN) {
scribe.skipToToken(Token.tRPAREN);
}
scribe.printNextToken(Token.tRPAREN, scribe.printComment());
break;
default:
formatNode(node);
}
return PROCESS_SKIP;
}
private int visit(IASTBinaryExpression node) {
// TODO binary expression alignment!
final IASTExpression op1= node.getOperand1();
// operand 1
op1.accept(this);
// operator
scribe.printNextToken(peekNextToken(), scribe.printComment());
if (scribe.printComment()) {
scribe.space();
}
// operand 2
final IASTExpression op2= node.getOperand2();
op2.accept(this);
Alignment expressionAlignment =scribe.createAlignment(
"binaryExpression", //$NON-NLS-1$
// need configurable alignment
Alignment.M_COMPACT_SPLIT,
1,
scribe.scanner.getCurrentPosition());
scribe.enterAlignment(expressionAlignment);
boolean ok = false;
do {
try {
scribe.alignFragment(expressionAlignment, 0);
// operator
scribe.printNextToken(peekNextToken(), scribe.printComment());
if (scribe.printComment()) {
scribe.space();
}
// operand 2
final IASTExpression op2= node.getOperand2();
op2.accept(this);
scribe.printTrailingComment();
ok = true;
} catch (AlignmentException e) {
scribe.redoAlignment(e);
}
} while (!ok);
scribe.exitAlignment(expressionAlignment, true);
return PROCESS_SKIP;
}

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

@ -37,3 +37,19 @@ void g() {
for (int i=0; i<10; ++i) {
}
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=183220
void bug183220() {
int rtc_hdw_cr_sync_next, rtc_hdw_cr_sync, rtc_hdw_cr_resync_enable,
rtc_s2000_src_pending, rtc_s2000_cr_sync_pending,
rtc_hdw_cr_sync_next, rtc_hdw_current_clock;
int rtc_s2000_clock_source_state, RTC_CLOCK_PLL;
if (( (rtc_hdw_cr_sync_next != rtc_hdw_cr_sync )
|| rtc_hdw_cr_resync_enable )&& !rtc_s2000_src_pending
&& !rtc_s2000_cr_sync_pending) {
if (!identify_hdw_fvr_master() || !rtc_hdw_current_clock->external
|| !rtc_hdw_cr_sync_next ||( (rtc_hdw_current_clock->external
&& rtc_hdw_cr_sync_next && rtc_s2000_clock_source_state
!= RTC_CLOCK_PLL ) )) {
}
}
}

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

@ -19,3 +19,12 @@ char* s2= "this " "is "
int main() {return ID(0);}
// semicolons inside for
void g() {for(int i=0;i<10;++i){}}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=183220
void bug183220()
{
int rtc_hdw_cr_sync_next,rtc_hdw_cr_sync,rtc_hdw_cr_resync_enable,rtc_s2000_src_pending,rtc_s2000_cr_sync_pending,rtc_hdw_cr_sync_next,rtc_hdw_current_clock;
int rtc_s2000_clock_source_state,RTC_CLOCK_PLL;
if (( ( rtc_hdw_cr_sync_next != rtc_hdw_cr_sync ) || rtc_hdw_cr_resync_enable )&& !rtc_s2000_src_pending && !rtc_s2000_cr_sync_pending) { if (!identify_hdw_fvr_master() || !rtc_hdw_current_clock->external || !rtc_hdw_cr_sync_next ||( ( rtc_hdw_current_clock->external && rtc_hdw_cr_sync_next && rtc_s2000_clock_source_state != RTC_CLOCK_PLL ) )) {
}
}
}

4
core/org.eclipse.cdt.ui.tests/resources/formatter/preview/After.cpp
View file

@ -47,8 +47,8 @@ int foo(int bar) const {
int array[]= { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 1000,
2000, 3000, 4000, 5000 };
int compare(int argument, int otherArgument) {
return argument+otherArgument > argument*otherArgument+1000000 ? 100000+50000
: 200000-30000;
return argument+otherArgument > argument*otherArgument+1000000 ? 100000
+50000 : 200000-30000;
}
class Other {
static void bar(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6,