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

Bug 361768 - Fix formatting of multiple empty macros

Browse source 
Change-Id: I9ba68533ce65de3309eb8d2186b2488985f457d2
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
This commit is contained in:
Marco Stornelli 2019-03-09 18:07:08 +01:00 • committed by Jonah Graham
parent 280c0190d2
commit d1bd979a00
2 changed files with 30 additions and 1 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

@ -4175,6 +4175,16 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
} }
private boolean isEmptyStatement(IASTNode node) {
IASTNodeLocation[] locations = node.getNodeLocations();
if (locations.length == 1 && node instanceof ASTNode) {
ASTNode statement = (ASTNode) node;
IASTFileLocation fileLocation = locations[0].asFileLocation();
return fileLocation.getNodeLength() == 1 && fileLocation.getNodeOffset() == statement.getOffset();
}
return false;
}
private boolean startsWithMacroExpansion(IASTNode node) { private boolean startsWithMacroExpansion(IASTNode node) {
if (fInsideMacroArguments) if (fInsideMacroArguments)
return false; return false;
@ -4388,7 +4398,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
final int indentLevel = scribe.indentationLevel; final int indentLevel = scribe.indentationLevel;
for (int i = 1; i < statementsLength - 1; i++) { for (int i = 1; i < statementsLength - 1; i++) {
final IASTStatement statement = statements.get(i); final IASTStatement statement = statements.get(i);
if (!(statement instanceof IASTNullStatement) if ((!(statement instanceof IASTNullStatement) || isEmptyStatement(statement))
&& !doNodeLocationsOverlap(statement, statements.get(i - 1))) { && !doNodeLocationsOverlap(statement, statements.get(i - 1))) {
scribe.startNewLine(); scribe.startNewLine();
} }

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

@ -3891,6 +3891,25 @@ public class CodeFormatterTest extends BaseUITestCase {
assertFormatterResult(); assertFormatterResult();
} }
//#define EMPTY1(x)
//#define EMPTY2(x)
//int main() {
// EMPTY1(bool x = true);
// EMPTY2(bool x = true);
// return 0;
//}
//#define EMPTY1(x)
//#define EMPTY2(x)
//int main() {
// EMPTY1(bool x = true);
// EMPTY2(bool x = true);
// return 0;
//}
public void testEmptyMacros_Bug361768() throws Exception {
assertFormatterResult();
}
//#define START_SECTION() do { int a = 0; } while (0) //#define START_SECTION() do { int a = 0; } while (0)
//void code() { //void code() {
// START_SECTION(); // START_SECTION();