Fix #4487: Outdentation bug (#4488)

jashkenas · Apr 8, 2017 · 76945ab · 76945ab
1 parent b192e21
commit 76945ab
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/lib/coffeescript/lexer.js b/lib/coffeescript/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -414,12 +414,9 @@ exports.Lexer = class Lexer
       lastIndent = @indents[@indents.length - 1]
       if not lastIndent
         moveOut = 0
-      else if lastIndent is @outdebt
-        moveOut -= @outdebt
-        @outdebt = 0
-      else if lastIndent < @outdebt
-        @outdebt -= lastIndent
-        moveOut  -= lastIndent
+      else if @outdebt and moveOut <= @outdebt
+        @outdebt -= moveOut
+        moveOut   = 0
       else
         dent = @indents.pop() + @outdebt
         if outdentLength and @chunk[outdentLength] in INDENTABLE_CLOSERS

diff --git a/test/formatting.coffee b/test/formatting.coffee
@@ -287,3 +287,20 @@ test "tabs and spaces cannot be mixed for indentation", ->
     ok no
   catch e
     eq 'mixed indentation', e.message
+
+test "#4487: Handle unusual outdentation", ->
+  a =
+    switch 1
+      when 2
+          no
+         when 3 then no
+      when 1 then yes
+  eq yes, a
+
+  b = do ->
+    if no
+      if no
+            1
+       2
+      3
+  eq b, undefined