mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 561559 - Fix formatting def capture lambda expressions

Browse source 
We missed a space before the closing brackets if the proper option
was selected.

Change-Id: Ibbb09c3c961dc1b5e22aaa65ffb5d9878c2bb08b
This commit is contained in:
Marco Stornelli 2020-03-29 16:23:48 +02:00
parent f4951d8086
commit f20570a200
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2492,8 +2492,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
final int elementsLength = elements.size(); final int elementsLength = elements.size();
if (encloseInParen) { if (encloseInParen) {
boolean spaceBeforeClosingParen = elements.isEmpty() && !addEllipsis ? options.fSpaceBetweenEmptyParen boolean spaceBeforeClosingParen = elements.isEmpty() && !addEllipsis
: options.fSpaceBeforeClosingParen; && options.captureDefault == CaptureDefault.UNSPECIFIED ? options.fSpaceBetweenEmptyParen
: options.fSpaceBeforeClosingParen;
tailFormatter = new ClosingParensesisTailFormatter(spaceBeforeClosingParen, tailFormatter, tailFormatter = new ClosingParensesisTailFormatter(spaceBeforeClosingParen, tailFormatter,
options.rightToken); options.rightToken);
} }

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

@ -4734,4 +4734,23 @@ public class CodeFormatterTest extends BaseUITestCase {
public void testFormatterOnOff_Bug559669() throws Exception { public void testFormatterOnOff_Bug559669() throws Exception {
assertFormatterResult(); assertFormatterResult();
} }
//int main() {
// auto f = [&](){
// };
// return 0;
//}
//int main() {
// auto f = [ & ]() {
// };
// return 0;
//}
public void testLambdaExpressionOnlyDefCapture_Bug561559() throws Exception {
fOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_DECLARATION,
CCorePlugin.INSERT);
fOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_DECLARATION,
CCorePlugin.INSERT);
assertFormatterResult();
}
} }