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

Bug 535266: Formatter error CaseStatement with attributes

Browse source 
Fix and test.

Also fixes formatting errors with DefaultStatements.

Change-Id: Idac4a7105d7ae86db40755bd27cef60e197de664
Signed-off-by: Hansruedi Patzen <hansruedi.patzen@hsr.ch>
Signed-off-by: Thomas Corbat <tcorbat@hsr.ch>
This commit is contained in:
Hansruedi Patzen 2018-05-29 12:03:34 +02:00 • committed by Thomas Corbat
parent 8792d9d5a6
commit 3f98811f73
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3615,6 +3615,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
private int visit(IASTCaseStatement node) {
IASTExpression constant = node.getExpression();
formatLeadingAttributes(node);
if (constant == null) {
scribe.printNextToken(Token.t_default);
scribe.printNextToken(Token.tCOLON, preferences.insert_space_before_colon_in_default);
@ -3628,6 +3629,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
}
private int visit(IASTDefaultStatement node) {
formatLeadingAttributes(node);
scribe.printNextToken(Token.t_default);
scribe.printNextToken(Token.tCOLON, preferences.insert_space_before_colon_in_default);
return PROCESS_SKIP;

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

@ -3384,4 +3384,25 @@ public class CodeFormatterTest extends BaseUITestCase {
public void testInlineNamespace_Bug532849() throws Exception {
assertFormatterResult();
}
//void f() {
// switch (1) {
// [[foo]] case 1:
// break;
// [[foo]] default:
// break;
// }
//}
//void f() {
// switch (1) {
// [[foo]] case 1:
// break;
// [[foo]] default:
// break;
// }
//}
public void testFormatAttributedLabelStatements_Bug535266() throws Exception {
assertFormatterResult();
}
}