Improve indentation of blocks inside if/while headers

Fixes #1665

2 files changed, 21 insertions, 1 deletions

diff --git a/tests/indent.in b/tests/indent.in
index c770f10c..226db14e 100644
--- a/tests/indent.in
+++ b/tests/indent.in
@@ -75,4 +75,11 @@ echo hi
 else
 echo bye
 end; echo alpha "
-' | ../fish_indent
\ No newline at end of file
+' | ../fish_indent
+
+echo \nTest7
+# issue 1665
+echo -n '
+if begin ; false; end; echo hi ; end
+while begin ; false; end; echo hi ; end
+' | ../fish_indent
diff --git a/tests/indent.out b/tests/indent.out
index cd13ba88..b2eaf08a 100644
--- a/tests/indent.out
+++ b/tests/indent.out
@@ -78,3 +78,16 @@ else
 echo bye
 end
 echo alpha "
+
+Test7
+
+if begin
+        false
+    end
+    echo hi
+end
+while begin
+        false
+    end
+    echo hi
+end