Fixed a bug in AnnotatedText.drop

parser-typechecker/src/Unison/Codebase/CommandLine2.hs

@@ -9,9 +9,10 @@
 
 module Unison.Codebase.CommandLine2 where
 
--- import Debug.Trace
-import Data.Maybe (catMaybes)
-import Prelude hiding (readFile, writeFile)
+import           Data.Maybe                     ( catMaybes )
+import           Prelude                 hiding ( readFile
+                                                , writeFile
+                                                )
 import           Control.Applicative            ((<|>))
 import           Control.Concurrent             (forkIO, killThread)
 import qualified Control.Concurrent.Async       as Async
@@ -31,7 +32,9 @@ import           Data.Maybe                     (fromMaybe, listToMaybe)
 import           Data.String                    (IsString, fromString)
 import qualified Data.Set                       as Set
 import qualified Data.Text                      as Text
-import Data.Text.IO (readFile, writeFile)
+import           Data.Text.IO                   ( readFile
+                                                , writeFile
+                                                )
 import qualified System.Console.ANSI            as Console
 import qualified System.Console.Haskeline       as Line
 import qualified System.Console.Terminal.Size   as Terminal
@@ -420,7 +423,7 @@ notifyUser dir o = case o of
     Console.setTitle "Unison ☺︎"
     let uf         = UF.discardTerm unisonFile
         defs       = prettyTypecheckedFile uf errorEnv
-    when (not $ null defs) . putPrettyLn . P.lines $ [
+    when (not $ null defs) . putPrettyLn $
       P.okCallout $
         P.lines [
           P.wrap (
@@ -433,7 +436,6 @@ notifyUser dir o = case o of
             "Now evaluating any watch expressions (lines starting with `>`)"
             <> "..."
         ]
-     ]
   TodoOutput branch todo ->
     let ppe = Branch.prettyPrintEnv1 (Branch.head branch) in
     if E.todoScore todo == 0 && E.todoConflicts todo == mempty

parser-typechecker/src/Unison/PrintError.hs

@@ -13,6 +13,7 @@ module Unison.PrintError where
 
 -- import           Unison.Parser              (showLineCol)
 -- import           Unison.Util.Monoid         (whenM)
+import           Debug.Trace
 import           Control.Lens                 ((%~))
 import           Control.Lens.Tuple           (_1, _2, _3)
 import           Control.Monad                (join)
@@ -28,7 +29,6 @@ import           Data.String                  (IsString, fromString)
 import           Data.Text                    (Text)
 import qualified Data.Text                    as Text
 import           Data.Void                    (Void)
-import           Debug.Trace
 import qualified Text.Megaparsec              as P
 import qualified Unison.ABT                   as ABT
 import qualified Unison.DataDeclaration       as DD

parser-typechecker/src/Unison/Util/AnnotatedText.hs

@@ -72,7 +72,7 @@ instance LL.ListLike (AnnotatedText a) Char where
   drop n (AnnotatedText at) = case at of
     Seq.Empty -> AnnotatedText Seq.Empty
     (s,a) :<| tl ->
-      if n <= length s then AnnotatedText $ pure (drop n s, a)
+      if n <= length s then AnnotatedText $ (drop n s, a) :<| tl
       else LL.drop (n - length s) (AnnotatedText tl)
   null (AnnotatedText at) = all (null . fst) at