Auto-format commas #187

src/main/java/intellij_awk/AwkFormattingModelBuilder.java

@@ -9,6 +9,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.tree.TokenSet;
+import intellij_awk.psi.AwkTypes;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -43,6 +44,7 @@ public class AwkFormattingModelBuilder implements FormattingModelBuilder {
 
   private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) {
     TokenSet ternaryExpr = TokenSet.create(TERNARY_EXPR, TERNARY_PRINT_EXPR);
+    TokenSet commaParents = TokenSet.create(GAWK_FUNC_CALL_LIST, EXPR_LST);
     return new SpacingBuilder(settings, AwkLanguage.INSTANCE)
         .around(binaryOps)
         .spaces(1)
@@ -84,10 +86,10 @@ private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) {
         .spaces(1)
         .between(RPAREN, TokenSet.create(STATEMENT, ACTION)) // ) {
         .spaces(1)
-        //        .before(COMMA) // TODO taking into account function local params
-        //        .none()
-        //        .after(COMMA)
-        //        .spaces(1)
+        .beforeInside(COMMA, commaParents)
+        .none()
+        .afterInside(COMMA, commaParents)
+        .spaces(1)
         .after(TokenSet.create(PRINT, PRINTF))
         .spaces(1)
         .between(SIMPLE_PRINT_STATEMENT, OUTPUT_REDIRECTION)

src/test/java/intellij_awk/AwkAutoFormatTests.java

@@ -29,6 +29,10 @@ public class AwkAutoFormatTests extends BasePlatformTestCase {
   public void testFile13_2(){ checkByFile(); }
   public void testGawk_switch1(){ checkByFile(); }
   public void testGawk_switch2(){ checkByFile(); }
+  public void testCommaInArrIndex(){ checkByFile(); }
+  public void testCommaInFuncCall(){ checkByFile(); }
+  public void testCommaInIfIn(){ checkByFile(); }
+  public void testCommaInFuncParamsNoChange(){ checkByFile(); }
   public void testIssue100(){ checkByFile(); }
 
   @Override

src/test/testData/auto_format/commaInArrIndex.awk

@@ -0,0 +1,3 @@
+{
+    A[a ,b,   c]
+}

src/test/testData/auto_format/commaInArrIndexAfter.awk

@@ -0,0 +1,3 @@
+{
+    A[a, b, c]
+}

src/test/testData/auto_format/commaInFuncCall.awk

@@ -0,0 +1,3 @@
+{
+    ff(a ,b,   c)
+}

src/test/testData/auto_format/commaInFuncCallAfter.awk

@@ -0,0 +1,3 @@
+{
+    ff(a, b, c)
+}

src/test/testData/auto_format/commaInFuncParamsNoChange.awk

@@ -0,0 +1,2 @@
+function f(a ,b,   c) {
+}

src/test/testData/auto_format/commaInFuncParamsNoChangeAfter.awk

@@ -0,0 +1,2 @@
+function f(a ,b,   c) {
+}

src/test/testData/auto_format/commaInIfIn.awk

@@ -0,0 +1,3 @@
+{
+    if ((a ,b,   c) in A) {}
+}

src/test/testData/auto_format/commaInIfInAfter.awk

@@ -0,0 +1,3 @@
+{
+    if ((a, b, c) in A) {}
+}

src/test/testData/inspection/enforceGlobalVarNaming3.awk

@@ -4,5 +4,5 @@ BEGIN {
     arr["key3"] = "val3"
 }
 function f() {
-    split("",arr)
+    split("", arr)
 }

src/test/testData/inspection/enforceGlobalVarNaming3After.awk

@@ -4,5 +4,5 @@ BEGIN {
     Arr["key3"] = "val3"
 }
 function f() {
-    split("",Arr)
+    split("", Arr)
 }