From ee5f9ffad02b3cf263c13ca58c4d2e4526e29a84 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 16 May 2018 00:27:18 -0400
Subject: [PATCH] zig fmt: add comma on last switch prong

---
 std/zig/parse.zig       |  2 +-
 std/zig/parser_test.zig | 31 +++++++++++++++++++++++++++++++
 std/zig/render.zig      | 15 ++++++++++++++-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/std/zig/parse.zig b/std/zig/parse.zig
index f2376f0df3..4f1e3dcefe 100644
--- a/std/zig/parse.zig
+++ b/std/zig/parse.zig
@@ -1406,7 +1406,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
             },
 
             State.SwitchCaseCommaOrEnd => |list_state| {
-                switch (expectCommaOrEnd(&tok_it, &tree, Token.Id.RParen)) {
+                switch (expectCommaOrEnd(&tok_it, &tree, Token.Id.RBrace)) {
                     ExpectCommaOrEndResult.end_token => |maybe_end| if (maybe_end) |end| {
                         *list_state.ptr = end;
                         continue;
diff --git a/std/zig/parser_test.zig b/std/zig/parser_test.zig
index f95ecfaee3..129e62e6dd 100644
--- a/std/zig/parser_test.zig
+++ b/std/zig/parser_test.zig
@@ -1,3 +1,34 @@
+test "zig fmt: add comma on last switch prong" {
+    try testTransform(
+        \\test "aoeu" {
+        \\switch (self.init_arg_expr) {
+        \\    InitArg.Type => |t| { },
+        \\    InitArg.None,
+        \\    InitArg.Enum => { }
+        \\}
+        \\ switch (self.init_arg_expr) {
+        \\     InitArg.Type => |t| { },
+        \\     InitArg.None,
+        \\     InitArg.Enum => { }//line comment
+        \\ }
+        \\}
+    ,
+        \\test "aoeu" {
+        \\    switch (self.init_arg_expr) {
+        \\        InitArg.Type => |t| {},
+        \\        InitArg.None,
+        \\        InitArg.Enum => {},
+        \\    }
+        \\    switch (self.init_arg_expr) {
+        \\        InitArg.Type => |t| {},
+        \\        InitArg.None,
+        \\        InitArg.Enum => {}, //line comment
+        \\    }
+        \\}
+        \\
+    );
+}
+
 test "zig fmt: same-line doc comment on variable declaration" {
     try testTransform(
         \\pub const MAP_ANONYMOUS = 0x1000; /// allocated from memory, swap space
diff --git a/std/zig/render.zig b/std/zig/render.zig
index 13ef4607f4..5084c1d096 100644
--- a/std/zig/render.zig
+++ b/std/zig/render.zig
@@ -831,7 +831,20 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
             }
 
             try renderExpression(allocator, stream, tree, indent, switch_case.expr);
-            try renderToken(tree, stream, switch_case.lastToken() + 1, indent, true);
+            {
+                // Handle missing comma after last switch case
+                var index = switch_case.lastToken() + 1;
+                switch (tree.tokens.at(index).id) {
+                    Token.Id.RBrace => {
+                        try stream.write(",");
+                    },
+                    Token.Id.LineComment => {
+                        try stream.write(", ");
+                        try renderToken(tree, stream, index, indent, true);
+                    },
+                    else => try renderToken(tree, stream, index, indent, true),
+                }
+            }
         },
         ast.Node.Id.SwitchElse => {
             const switch_else = @fieldParentPtr(ast.Node.SwitchElse, "base", base);