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

Bug 390324 - Fix cast operator containing func declarator

Browse source 
Change-Id: I935fe1daabd18372062916e5a896896f5cab604f
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
This commit is contained in:
Marco Stornelli 2019-04-14 15:23:43 +02:00
parent db0cc1f9a4
commit 5b869afec3
2 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2504,13 +2504,19 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
}
private int visit(IASTCastExpression node) {
Runnable tailFormatter = null;
switch (node.getOperator()) {
case IASTCastExpression.op_cast:
scribe.printNextToken(Token.tLPAREN, false);
if (preferences.insert_space_after_opening_paren_in_cast) {
scribe.space();
}
node.getTypeId().accept(this);
tailFormatter = scribe.takeTailFormatter();
try {
node.getTypeId().accept(this);
} finally {
scribe.setTailFormatter(tailFormatter);
}
try {
if (node.getTypeId().getTrailingSyntax().getType() == IToken.tRPAREN) {
scribe.printNextToken(Token.tRPAREN, preferences.insert_space_before_closing_paren_in_cast);
@ -2535,7 +2541,12 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
if (preferences.insert_space_after_opening_angle_bracket_in_template_arguments) {
scribe.space();
}
node.getTypeId().accept(this);
tailFormatter = scribe.takeTailFormatter();
try {
node.getTypeId().accept(this);
} finally {
scribe.setTailFormatter(tailFormatter);
}
scribe.printNextToken(Token.tGT,
preferences.insert_space_before_closing_angle_bracket_in_template_arguments);
if (preferences.insert_space_before_opening_paren_in_method_invocation) {
@ -2546,7 +2557,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
if (preferences.insert_space_after_opening_paren_in_method_invocation) {
scribe.space();
}
Runnable tailFormatter = scribe.takeTailFormatter();
tailFormatter = scribe.takeTailFormatter();
try {
node.getOperand().accept(this);
} finally {

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

@ -4093,4 +4093,34 @@ public class CodeFormatterTest extends BaseUITestCase {
public void testNestedNamespace_Bug546221() throws Exception {
assertFormatterResult();
}
//void someAction(int i) {
//}
//int foo() {
// auto f = static_cast<void (*)(int)>(&someAction);
//}
//void someAction(int i) {
//}
//int foo() {
// auto f = static_cast<void (*)(int)>(&someAction);
//}
public void testCastFuncDeclarator1_Bug390324() throws Exception {
assertFormatterResult();
}
//void someAction(int i) {
//}
//int foo() {
// auto f = (void (*)(int)) (&someAction);
//}
//void someAction(int i) {
//}
//int foo() {
// auto f = (void (*)(int)) (&someAction);
//}
public void testCastFuncDeclarator2_Bug390324() throws Exception {
assertFormatterResult();
}
}