Fix Difference.apply() with redundant Unindent

Redundant unindent may be discarded just like other whitespaces
javaparser · May 29, 2018 · 0a54807 · 0a54807
1 parent f1faa07
commit 0a54807
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/...er/printer/lexicalpreservation/transformations/ast/body/StatementTransformationsTest.java b/...er/printer/lexicalpreservation/transformations/ast/body/StatementTransformationsTest.java
@@ -26,9 +26,12 @@
 import org.junit.Test;
 
 import com.github.javaparser.JavaParser;
+import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.IntegerLiteralExpr;
 import com.github.javaparser.ast.expr.NameExpr;
+import com.github.javaparser.ast.stmt.ExpressionStmt;
 import com.github.javaparser.ast.stmt.Statement;
+import com.github.javaparser.ast.visitor.ModifierVisitor;
 import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest;
 import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter;
 
@@ -45,9 +48,17 @@ Statement consider(String code) {
 
     @Test
     public void ifStmtTransformation() throws IOException {
-        Statement ifStmt = consider("if (a) {} else {}");
+        Statement stmt = consider("if (a) {} else {}");
-        ifStmt.asIfStmt().setCondition(new NameExpr("b"));
+        stmt.asIfStmt().setCondition(new NameExpr("b"));
-        assertTransformedToString("if (b) {} else {}", ifStmt);
+        assertTransformedToString("if (b) {} else {}", stmt);
+    }
+
+    @Test
+    public void switchEntryCsmHasTrailingUnindent() throws IOException {
+        Statement stmt = consider("switch (a) { case 1: a; a; }");
+        NodeList<Statement> statements = stmt.asSwitchStmt().getEntry(0).getStatements();
+        statements.set(1, statements.get(1).clone()); // clone() to force replacement
+        assertTransformedToString("switch (a) { case 1: a; a; }", stmt);
     }
 
 }
diff --git a/...rser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java b/...rser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java
@@ -127,7 +127,7 @@ void apply() {
                 if (diffElement instanceof Kept) {
                     Kept kept = (Kept) diffElement;
 
-                    if (kept.isWhiteSpaceOrComment()) {
+                    if (kept.isWhiteSpaceOrComment() || kept.isIndent() || kept.isUnindent()) {
                         diffIndex++;
                     } else {
                         throw new IllegalStateException("Cannot keep element because we reached the end of nodetext: "