Don't add extra space after final else in if-else statement.

v0.2
hugheaves · Dec 15, 2023 · 2cf85db · 2cf85db
1 parent 867a107
commit 2cf85db
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/internal/formatter/formattingvisitor.go b/internal/formatter/formattingvisitor.go
@@ -321,8 +321,11 @@ func (v *FormattingVisitor) VisitIfStatement(ctx *parser.IfStatementContext) int
 }
 
 func (v *FormattingVisitor) VisitElseStatement(ctx *parser.ElseStatementContext) interface{} {
-	v.VisitChildren(ctx)
-	v.formatter.printSpace()
+	v.Visit(ctx.ELSE())
+	nextToken := v.tokenStream.Get(ctx.ELSE().GetSymbol().GetTokenIndex() + 1)
+	if nextToken.GetTokenType() == parser.OpenSCADLexerIF {
+		v.formatter.printSpace()
+	}
 	return nil
 }
 

diff --git a/internal/formatter/testdata/if-else-statement.scad b/internal/formatter/testdata/if-else-statement.scad
@@ -0,0 +1,6 @@
+if (part == "adapter") {
+  adapter();
+} else {
+  side_weight();
+  translate([0,20,0]) mirror([1,0,0]) side_weight();
+}
diff --git a/internal/formatter/testdata/if-else-statement.scad.expected b/internal/formatter/testdata/if-else-statement.scad.expected
@@ -0,0 +1,8 @@
+if (part == "adapter") {
+  adapter();
+} else {
+  side_weight();
+  translate([0, 20, 0])
+    mirror([1, 0, 0])
+      side_weight();
+}