[formatting] add space between empty statements inside for clause

go-lang-plugin-org · Mar 28, 2016 · af33ebb · af33ebb
1 parent dc09990
commit af33ebb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/src/com/goide/formatter/GoFormattingModelBuilder.java b/src/com/goide/formatter/GoFormattingModelBuilder.java
@@ -46,6 +46,7 @@ private static SpacingBuilder createSpacingBuilder(@NotNull CodeStyleSettings se
     return new SpacingBuilder(settings, GoLanguage.INSTANCE)
       .before(COMMA).spaceIf(false)
       .after(COMMA).spaceIf(true)
+      .betweenInside(SEMICOLON, SEMICOLON, FOR_CLAUSE).spaces(1)
       .before(SEMICOLON).spaceIf(false)
       .after(SEMICOLON).spaceIf(true)
       .beforeInside(DOT, IMPORT_SPEC).none()

diff --git a/testData/formatting/emptyStatementInForClause-after.go b/testData/formatting/emptyStatementInForClause-after.go
@@ -0,0 +1,6 @@
+package bar
+
+func main() {
+	for position, positionReported := 0, false; ; position++ {
+	}
+}
diff --git a/testData/formatting/emptyStatementInForClause.go b/testData/formatting/emptyStatementInForClause.go
@@ -0,0 +1,6 @@
+package bar
+
+func main() {
+	for position,positionReported := 0,false;;position++ {
+	}
+}
diff --git a/tests/com/goide/formatter/GoFormatterTest.java b/tests/com/goide/formatter/GoFormatterTest.java
@@ -41,6 +41,7 @@ protected String getBasePath() {
   public void testBreakLines()                      { doTest(); }
   public void testCommentIndentation()              { doTest(); }
   public void testElseStatement()                   { doTest(); }
+  public void testEmptyStatementInForClause()       { doTest(); }
 
   private void doTest() { doTest(null); }