@@ -5,8 +5,12 @@ module Main where
55import Control.Monad.Trans.State.Strict (runStateT)
66import Control.Monad (when)
77
8+import Data.List (sort)
9+
810import System.Exit (exitFailure)
911import System.Console.Haskeline
12+import System.FilePath ((</>))
13+import System.Directory (getCurrentDirectory)
1014
1115import Test.HUnit
1216
@@ -76,7 +80,7 @@ completionTestData =
7680 , ("import Control.Monad.S", ["import Control.Monad.ST"])
7781 , ("import qualified Control.Monad.S", ["import qualified Control.Monad.ST"])
7882 , ("import Control.Monad.", map ("import Control.Monad." ++)
79− ["Eff", "Eff.Unsafe", "ST"])
83+ ["Eff", "ST"])
8084
8185 -- a few other import tests
8286 , ("impor", ["import"])
@@ -101,7 +105,6 @@ completionTestData =
101105 ]
102106 where
103107 allModuleNames = [ "Control.Monad.Eff"
104− , "Control.Monad.Eff.Unsafe"
105108 , "Control.Monad.ST"
106109 , "Data.Function"
107110 , "Debug.Trace"
@@ -114,7 +117,7 @@ assertCompletedOk (line, expecteds) = do
114117 (unusedR, completions) <- runCM (completion' (reverse line, ""))
115118 let unused = reverse unusedR
116119 let actuals = map ((unused ++) . replacement) completions
117− expecteds @=? actuals
120+ sort expecteds @=? sort actuals
118121
119122runCM :: CompletionM a -> IO a
120123runCM act = do
@@ -123,7 +126,8 @@ runCM act = do
123126
124127getPSCiState :: IO PSCiState
125128getPSCiState = do
126− modulesOrFirstError <- loadAllModules []
129+ cwd <- getCurrentDirectory
130+ modulesOrFirstError <- loadAllModules [ cwd </> "tests" </> "prelude.purs" ]
127131 case modulesOrFirstError of
128132 Left err ->
129133 print err >> exitFailure