Make sure that /diagnostics are returned in the correct order

src/ReadHandle.hs

@@ -96,7 +96,7 @@ partialMessageStartsWithOneOf :: [ByteString] -> ByteString -> Bool
 partialMessageStartsWithOneOf xs x = any ($ x) $ map partialMessageStartsWith xs
 
 getResult :: Extract a -> ReadHandle -> (ByteString -> IO ()) -> IO (ByteString, [a])
-getResult extract h echo = do
+getResult extract h echo = fmap reverse <$> do
   ref <- newIORef []
 
   let

src/Trigger.hs

@@ -66,8 +66,8 @@ trigger session hooks = runWriterT (runExceptT go) >>= \ case
     go :: Trigger ()
     go = do
       runHook hooks.beforeReload
-      (output, (r, err)) <- Session.reload session
-      tell (output, err)
+      (output, (r, diagnostics)) <- Session.reload session
+      tell (output, diagnostics)
       case r of
         Failed -> do
           echo $ withColor Red "RELOADING FAILED" <> "\n"

test/ReadHandleSpec.hs

@@ -126,20 +126,24 @@ spec = do
             span :: Maybe Span
             span = Just $ Span "Foo.hs" start start
 
-            err :: Diagnostic
-            err = (diagnostic Error) { span }
+            err1 :: Diagnostic
+            err1 = (diagnostic Error) { span }
+
+            err2 :: Diagnostic
+            err2 = err1 { code = Just 23 }
 
             chunks :: [ByteString]
             chunks = [
                 "foo\n"
               , "bar\n"
-              , to_json err <> "\n"
+              , to_json err1 <> "\n"
               , "baz\n"
+              , to_json err2 { code = Just 23 } <> "\n"
               , marker
               ]
           withRandomChunkSizes chunks $ \ h -> do
             fmap mconcat . withSpy $ \ echo -> do
-              getResult extract h echo `shouldReturn` ("foo\nbar\nbaz\n", [err])
+              getResult extract h echo `shouldReturn` ("foo\nbar\nbaz\n", [err1, err2])
             `shouldReturn` "foo\nbar\nbaz\n"
 
         context "with a partial match" $ do