zig

commit 7f618184ade7f5fbe906973e3ca79924fd196641 (tree)
parent 9471f16c799e0cc60a3d6465cc3bee0a13bd5617
Author: hryx <codroid@gmail.com>
Date:   Fri,  5 Jul 2019 00:36:34 -0700

Prevent unreachable when file ends with struct field

Diffstat:
M
std/zig/parser_test.zig
 | 
9
+++++++++
M
std/zig/render.zig
 | 
2
+-

2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/std/zig/parser_test.zig b/std/zig/parser_test.zig
@@ -2258,6 +2258,15 @@ test "zig fmt: if type expr" {
     );
 }
 
+test "zig fmt: file ends with struct field" {
+    try testTransform(
+        \\a: bool
+    ,
+        \\a: bool,
+        \\
+    );
+}
+
 const std = @import("std");
 const mem = std.mem;
 const warn = std.debug.warn;
diff --git a/std/zig/render.zig b/std/zig/render.zig
@@ -1899,7 +1899,7 @@ fn renderTokenOffset(
             return renderToken(tree, stream, token_index + 1, indent, start_col, Space.Newline);
         },
         else => {
-            if (tree.tokens.at(token_index + 2).id == Token.Id.MultilineStringLiteralLine) {
+            if (token_index + 2 < tree.tokens.len and tree.tokens.at(token_index + 2).id == Token.Id.MultilineStringLiteralLine) {
                 try stream.write(",");
                 return;
             } else {