From 66761d7ecfade3c81c09f9b77afc5b71b3b59f9e Mon Sep 17 00:00:00 2001
From: Richard van Velzen <rvanvelzen@experty.com>
Date: Wed, 29 Jul 2015 17:57:18 +0200
Subject: Fix semicolon printing when restricting max line length

Fixes #755
---
 lib/output.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'lib/output.js')

diff --git a/lib/output.js b/lib/output.js
index 1d67b1b9..396c6a29 100644
--- a/lib/output.js
+++ b/lib/output.js
@@ -161,6 +161,8 @@ function OutputStream(options) {
         str = String(str);
         var ch = str.charAt(0);
         if (might_need_semicolon) {
+            might_need_semicolon = false;
+
             if ((!ch || ";}".indexOf(ch) < 0) && !/[;]$/.test(last)) {
                 if (options.semicolons || requireSemicolonChars(ch)) {
                     OUTPUT += ";";
@@ -171,11 +173,17 @@ function OutputStream(options) {
                     current_pos++;
                     current_line++;
                     current_col = 0;
+
+                    if (/^\s+$/.test(str)) {
+                        // reset the semicolon flag, since we didn't print one
+                        // now and might still have to later
+                        might_need_semicolon = true;
+                    }
                 }
+
                 if (!options.beautify)
                     might_need_space = false;
             }
-            might_need_semicolon = false;
         }
 
         if (!options.beautify && options.preserve_line && stack[stack.length - 1]) {
-- 
cgit v1.2.3

href='/guix/commit/gnu/packages/patches/pulseaudio-fix-mult-test.patch?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>commit</a><a href='/guix/diff/gnu/packages/patches/pulseaudio-fix-mult-test.patch?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/pulseaudio-fix-mult-test.patch'>
<input type='hidden' name='id' value='32750e8c3ed38df4cafb39cffa878c6851abc899'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>root</a>/<a href='/guix/log/gnu?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>gnu</a>/<a href='/guix/log/gnu/packages?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>patches</a>/<a href='/guix/log/gnu/packages/patches/pulseaudio-fix-mult-test.patch?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>pulseaudio-fix-mult-test.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/pulseaudio-fix-mult-test.patch?id=32750e8c3ed38df4cafb39cffa878c6851abc899&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>