mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for 229774: Code Formatter makes invalid code for throw

Browse source
This commit is contained in:
Anton Leherbauer 2008-05-05 14:39:04 +00:00
parent 20896516c8
commit 518b582cd0
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTWhileStatement;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier;
import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator;
import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants;
import org.eclipse.cdt.core.parser.IToken;
import org.eclipse.cdt.internal.formatter.align.Alignment; import org.eclipse.cdt.internal.formatter.align.Alignment;
import org.eclipse.cdt.internal.formatter.align.AlignmentException; import org.eclipse.cdt.internal.formatter.align.AlignmentException;
import org.eclipse.cdt.internal.formatter.scanner.Scanner; import org.eclipse.cdt.internal.formatter.scanner.Scanner;
@ -1983,10 +1982,29 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
} }
operand.accept(this); operand.accept(this);
break; break;
case IASTUnaryExpression.op_throw:
scribe.printNextToken(Token.t_throw, scribe.printComment());
if (peekNextToken() != Token.tLPAREN) {
scribe.space();
}
operand.accept(this);
break;
case IASTUnaryExpression.op_typeid:
scribe.printNextToken(Token.t_typeid, scribe.printComment());
if (peekNextToken() != Token.tLPAREN) {
scribe.space();
}
operand.accept(this);
break;
case IASTUnaryExpression.op_typeof:
case IASTUnaryExpression.op_alignOf:
default: default:
scribe.printNextToken(peekNextToken(), preferences.insert_space_before_unary_operator); int operatorToken= peekNextToken();
scribe.printNextToken(operatorToken, preferences.insert_space_before_unary_operator);
if (preferences.insert_space_after_unary_operator) { if (preferences.insert_space_after_unary_operator) {
scribe.space(); scribe.space();
} else if (operatorToken == Token.tIDENTIFIER && peekNextToken() != Token.tLPAREN) {
scribe.space();
} }
operand.accept(this); operand.accept(this);
break; break;
@ -2493,7 +2511,7 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
if (preferences.insert_space_after_closing_angle_bracket_in_template_arguments) { if (preferences.insert_space_after_closing_angle_bracket_in_template_arguments) {
// avoid explicit space if followed by pointer operator // avoid explicit space if followed by pointer operator
int nextToken= peekNextToken(); int nextToken= peekNextToken();
if (nextToken != IToken.tSTAR && nextToken != IToken.tAMPER) { if (nextToken != Token.tSTAR && nextToken != Token.tAMPER) {
scribe.space(); scribe.space();
} }
} else { } else {
@ -2509,7 +2527,9 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
scribe.printNextToken(Token.t_return); scribe.printNextToken(Token.t_return);
final IASTExpression expression = node.getReturnValue(); final IASTExpression expression = node.getReturnValue();
if (expression != null) { if (expression != null) {
scribe.space(); // if (peekNextToken() != Token.tLPAREN) {
scribe.space();
// }
expression.accept(this); expression.accept(this);
} }
// sometimes the return expression is null, when it should not // sometimes the return expression is null, when it should not

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

@ -636,4 +636,14 @@ public class CodeFormatterTest extends BaseUITestCase {
public void testPreserveWhitespaceInParameterDecl_Bug228997() throws Exception { public void testPreserveWhitespaceInParameterDecl_Bug228997() throws Exception {
assertFormatterResult(); assertFormatterResult();
} }
//void f() { throw 42; }
//void f() {
// throw 42;
//}
public void testSpaceAfterThrowKeyword_Bug229774() throws Exception {
assertFormatterResult();
}
} }