From 1b79ed205e9b618fa0c3ae61270f6493a709346a Mon Sep 17 00:00:00 2001
From: Timothy Clem <timothy.clem@gmail.com>
Date: Tue, 13 Mar 2018 10:59:20 -0700
Subject: [PATCH] TOCSpec import cleanup

---
 test/Rendering/TOC/Spec.hs | 35 +++--------------------------------
 test/SpecHelpers.hs        | 29 ++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/test/Rendering/TOC/Spec.hs b/test/Rendering/TOC/Spec.hs
index acc3b60a0..71bd012dd 100644
--- a/test/Rendering/TOC/Spec.hs
+++ b/test/Rendering/TOC/Spec.hs
@@ -1,47 +1,21 @@
 {-# LANGUAGE DataKinds, TypeOperators #-}
 module Rendering.TOC.Spec (spec) where
 
-import Analysis.Decorator (constructorNameAndConstantFields)
 import Analysis.Declaration
-import Data.Abstract.FreeVariables
 import Data.Aeson
 import Data.Bifunctor
-import Data.Blob
-import Data.ByteString (ByteString)
 import Data.Diff
-import Data.Functor.Both
-import Data.Functor.Foldable (cata)
-import Data.Functor.Listable
-import Data.Language
-import Data.Maybe (fromMaybe, isJust)
-import Data.Monoid (Last(..))
-import Data.Output
 import Data.Patch
-import Data.Range
-import Data.Record
-import Data.Semigroup ((<>))
-import Data.Source
-import Data.Span
-import qualified Data.Syntax as Syntax
-import qualified Data.Syntax.Declaration as Declaration
-import Data.Term
 import Data.Text (Text)
 import Data.Text.Encoding (encodeUtf8)
-import Data.These
 import Data.Union
 import Diffing.Interpreter
-import Parsing.Parser
 import Prelude hiding (readFile)
-import Rendering.Renderer
+import qualified Data.Syntax as Syntax
+import qualified Data.Syntax.Declaration as Declaration
 import Rendering.TOC
-import Semantic
-import Semantic.Task
-import Semantic.Util
+
 import SpecHelpers
-import Test.Hspec (Spec, describe, it, parallel, pendingWith)
-import Test.Hspec.Expectations.Pretty
-import Test.Hspec.LeanCheck
-import Test.LeanCheck
 
 
 spec :: Spec
@@ -248,6 +222,3 @@ blankDiff = merge (arrayInfo, arrayInfo) (inj [ inserting (termIn literalInfo (i
   where
     arrayInfo = Nothing :. Range 0 3 :. Span (Pos 1 1) (Pos 1 5) :. Nil
     literalInfo = Nothing :. Range 1 2 :. Span (Pos 1 2) (Pos 1 4) :. Nil
-
-blankDiffBlobs :: Both Blob
-blankDiffBlobs = both (Blob (fromText "[]") "a.js" (Just TypeScript)) (Blob (fromText "[a]") "b.js" (Just TypeScript))
diff --git a/test/SpecHelpers.hs b/test/SpecHelpers.hs
index dd91ac773..c318c9115 100644
--- a/test/SpecHelpers.hs
+++ b/test/SpecHelpers.hs
@@ -15,36 +15,47 @@ module SpecHelpers (
 -- import Control.Monad.IO.Class
 import Data.Abstract.Address as X
 import Data.Abstract.Environment as X
-import Data.Abstract.Evaluatable as X
+-- import Data.Abstract.Evaluatable as X
 import Data.Abstract.FreeVariables as X
 import Data.Abstract.ModuleTable as X
 import Data.Abstract.Store as X
 -- import Data.Abstract.Value as Value
-import Data.Blob
-import Data.Functor.Both
+import Data.Blob as X
 -- import Data.Functor.Foldable
 -- import Data.Language
 -- import Data.Map as Map
-import Data.Maybe as X
 -- import Data.Semigroup
--- import Data.Source
+import Data.Source as X
 -- import Data.Text.Encoding (decodeUtf8)
--- import Data.Union
+-- import Data.Union as X hiding (apply)
 import Data.Output as X
+import Data.Record as X
+import Data.Term as X
+import Data.Span as X
+import Data.Range as X
+import Data.Language as X
+import Data.Functor.Listable as X
 import Parsing.Parser as X
 -- import qualified Data.Text as T
 import Rendering.Renderer as X
 import Semantic as X
 import Semantic.Task as X
 import Semantic.Util as X
--- import System.FilePath
+import System.FilePath as X
+
+import Data.Maybe as X
+import Data.Functor.Both as X (Both(..), runBothWith, both)
 import Data.Monoid as X (Monoid(..), First(..), Last(..))
 import Data.Semigroup as X (Semigroup(..))
 
+import Data.ByteString as X (ByteString)
+
 import Test.Hspec as X (Spec, describe, it, xit, parallel, pendingWith)
 import Test.Hspec.Expectations.Pretty as X
-import Test.Hspec.LeanCheck
-import Test.LeanCheck
+import Test.Hspec.LeanCheck as X
+import Test.LeanCheck as X
+
+-- import Prelude as X (fst, snd, Show(..), Eq(..), IO(..))
 
 import qualified Data.ByteString as B
 import qualified Semantic.IO as IO