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

Bug 453385 - Fix for loop formatting

Browse source 
When "before semicolon" was selected the space was inserted only
if the init clause was a declaration. If it was an expression
the formatter was skipped.

Change-Id: I54605591b9a0829338dadb51e59460064b060697
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
This commit is contained in:
Marco Stornelli 2019-03-10 17:25:45 +01:00 • committed by Jonah Graham
parent 77592ee87a
commit 280c0190d2
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3255,15 +3255,11 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
private int visit(IASTExpressionStatement node) { private int visit(IASTExpressionStatement node) {
Runnable semicolonFormatter = null; Runnable semicolonFormatter = null;
if (!fHasClauseInitStatement) { semicolonFormatter = new TrailingSemicolonFormatter(node);
semicolonFormatter = new TrailingSemicolonFormatter(node); scribe.setTailFormatter(semicolonFormatter);
scribe.setTailFormatter(semicolonFormatter);
}
node.getExpression().accept(this); node.getExpression().accept(this);
if (semicolonFormatter != null) { semicolonFormatter.run();
semicolonFormatter.run(); scribe.setTailFormatter(null);
scribe.setTailFormatter(null);
}
if (!fHasClauseInitStatement) { if (!fHasClauseInitStatement) {
scribe.startNewLine(); scribe.startNewLine();
} }

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

@ -3903,4 +3903,23 @@ public class CodeFormatterTest extends BaseUITestCase {
public void testFormmatterWithMacroFuncStyle_Bug475349() throws Exception { public void testFormmatterWithMacroFuncStyle_Bug475349() throws Exception {
assertFormatterResult(); assertFormatterResult();
} }
//int main() {
// int i = 0;
// for(i = 0;i<3;i++){
// }
// return 0;
//}
//int main() {
// int i = 0;
// for (i = 0 ; i < 3 ; i++) {
// }
// return 0;
//}
public void testSpaceAfterSemicolonInFor_Bug453385() throws Exception {
fOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_SEMICOLON_IN_FOR, CCorePlugin.INSERT);
fOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_SEMICOLON_IN_FOR, CCorePlugin.INSERT);
assertFormatterResult();
}
} }