From 00a20bceff40e98034a7346e5cc6319cbd2d21b7 Mon Sep 17 00:00:00 2001
From: Ivan Komarov <Ivan.Komarov@dfyz.info>
Date: Sat, 27 Oct 2018 04:01:37 +0300
Subject: Fix formatting failures on Windows

When newline_style is set to Windows, an empty line inside of a macro
results in `\r` being passed to the `fold()` in `MacroBranch::rewrite()`.

`\r` is technically not an empty string, so we try to indent it, leaving
trailing whitespaces behind, even though that was not intended
(as far as I can see).

This commit replaces the `!l.is_empty()` check with calling
`is_empty_line()`, since trying to indent any whitespace-only string
will probably result in problematic trailing whitespaces.

Fixes: #2810
---
 src/macros.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/macros.rs b/src/macros.rs
index d378bb8ffb1..43f3071b70a 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -1347,7 +1347,7 @@ impl MacroBranch {
             .fold(
                 (String::new(), true),
                 |(mut s, need_indent), (i, (kind, ref l))| {
-                    if !l.is_empty()
+                    if !is_empty_line(l)
                         && need_indent
                         && !new_body_snippet.is_line_non_formatted(i + 1)
                     {
-- 
cgit 1.4.1-3-g733a5