Merge pull request #1 from peret/fix-condition-block-detection

Fix parsing of while-loops

lib/parse.js

@@ -276,9 +276,9 @@ function ConditionBlock(entry, buffer, os) {
     let ros = os - 1;
     while ((ch = buffer[ros]) && ~_nb_white.indexOf(ch)) ros--;
 
-    // if there is and it's not a ';' then it's not a block at all,
+    // if there is and it's not a newline or ';' then it's not a block at all,
     // just set the exit at the end of the line
-    if (~_eol.indexOf(ch)) {
+    if (!~_eol.indexOf(ch)) {
         os += entry.length;
         while ((ch = buffer[os]) && !~_eol.indexOf(ch) && ch !== '#') os++;
         return {

test/parse.js

@@ -151,7 +151,7 @@ def other!
 end`;
             check(contextString);
         });
-        it("recognises a while", function() {
+        it("recognises two whiles", function() {
             const contextString = `
 def fn
   a = 1 while false
@@ -161,6 +161,29 @@ def fn
   end
 end
 
+def other!
+end`;
+            check(contextString);
+        });
+        it("recognises a single while", function() {
+          const contextString = `
+def fn
+ while true
+    a = 1
+    break
+  end
+end
+
+def other!
+end`;
+            check(contextString);
+        });
+        it("recognises a while modifier", function() {
+          const contextString = `
+def fn
+ a = 1 while false
+end
+
 def other!
 end`;
             check(contextString);