Merge pull request #574 from github/fix-invalid-slice

Fix invalid slices in split diffs of certain reformatted nodes

src/Alignment.hs

@@ -104,7 +104,7 @@ alignBranch getRange children ranges = case intersectingChildren of
           line $ alignBranch getRange (remaining ++ symmetricalChildren ++ nonIntersectingChildren) (modifyJoin (advanceBy (drop 1)) ranges)
         lineAndRemaining _ Nothing = (identity, [])
         lineAndRemaining children (Just ranges) = let (intersections, remaining) = alignChildren getRange children ranges in
-          ((:) $ (,) <$> ranges `applyToBoth` intersections, remaining)
+          ((:) $ (,) <$> ranges `applyToBoth` (sortBy (compare `on` getRange) <$> intersections), remaining)
 
 -- | Given a list of aligned children, produce lists of their intersecting first lines, and a list of the remaining lines/nonintersecting first lines.
 alignChildren :: (term -> Range) -> [Join These (term)] -> Join These Range -> (Both [term], [Join These term])

test/crashers/573.A.js

@@ -0,0 +1,2 @@
+if (a &&
+		b) {}

test/crashers/573.B.js

@@ -0,0 +1 @@
+if (a && b) {}