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

Bug 559669 - Fix formatter on/off tags

Browse source 
Change-Id: Ia481703a0360ec5741d2fb079a75aa13a33bff39
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
This commit is contained in:
Marco Stornelli 2020-02-01 15:23:59 +01:00
parent 165fd275fb
commit 15479e9095
2 changed files with 18 additions and 1 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

@ -4920,7 +4920,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
} else if (onPos != -1 && onPos > offPos) { } else if (onPos != -1 && onPos > offPos) {
if (inInactiveCode) { if (inInactiveCode) {
int inactiveCodeEnd = nodeLocation.getNodeOffset() + nodeLocation.getNodeLength(); int inactiveCodeEnd = nodeLocation.getNodeOffset();
positions.add(new InactivePosition(inactiveCodeStart, inactiveCodeEnd - inactiveCodeStart, false)); positions.add(new InactivePosition(inactiveCodeStart, inactiveCodeEnd - inactiveCodeStart, false));
} }
inInactiveCode = false; inInactiveCode = false;

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

@ -4717,4 +4717,21 @@ public class CodeFormatterTest extends BaseUITestCase {
public void testEnumWithAttributes_Bug559545() throws Exception { public void testEnumWithAttributes_Bug559545() throws Exception {
assertFormatterResult(); assertFormatterResult();
} }
////@formatter:off
// int a;
//
////@formatter:on
// int b;
// int c;
////@formatter:off
// int a;
//
////@formatter:on
//int b;
//int c;
public void testFormatterOnOff_Bug559669() throws Exception {
assertFormatterResult();
}
} }