From b0ceea1831047f374278734f1d86ac94f5438fb4 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 18 Feb 2019 18:11:12 -0500
Subject: [PATCH] zig fmt: fix infix operator before multiline string literal

---
 std/zig/parser_test.zig | 9 +++++++++
 std/zig/render.zig      | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/std/zig/parser_test.zig b/std/zig/parser_test.zig
index 5b7b7aa2a..508813759 100644
--- a/std/zig/parser_test.zig
+++ b/std/zig/parser_test.zig
@@ -1,3 +1,12 @@
+test "zig fmt: infix operator and then multiline string literal" {
+    try testCanonical(
+        \\const x = "" ++
+        \\    \\ hi
+        \\;
+        \\
+    );
+}
+
 test "zig fmt: C pointers" {
     try testCanonical(
         \\const Ptr = [*c]i32;
diff --git a/std/zig/render.zig b/std/zig/render.zig
index 66aba75e1..1abc845b7 100644
--- a/std/zig/render.zig
+++ b/std/zig/render.zig
@@ -340,7 +340,6 @@ fn renderExpression(
         ast.Node.Id.InfixOp => {
             const infix_op_node = @fieldParentPtr(ast.Node.InfixOp, "base", base);
 
-            const op_token = tree.tokens.at(infix_op_node.op_token);
             const op_space = switch (infix_op_node.op) {
                 ast.Node.InfixOp.Op.Period, ast.Node.InfixOp.Op.ErrorUnion, ast.Node.InfixOp.Op.Range => Space.None,
                 else => Space.Space,
@@ -353,7 +352,9 @@ fn renderExpression(
             };
 
             try renderToken(tree, stream, infix_op_node.op_token, indent, start_col, after_op_space);
-            if (after_op_space == Space.Newline) {
+            if (after_op_space == Space.Newline and
+                tree.tokens.at(tree.nextToken(infix_op_node.op_token)).id != Token.Id.MultilineStringLiteralLine)
+            {
                 try stream.writeByteNTimes(' ', indent + indent_delta);
                 start_col.* = indent + indent_delta;
             }