Revert test changes

Author: jhrcek

Diff for: .hlint.yaml

@@ -122,6 +122,7 @@
     - Development.IDE.Plugin.CodeAction.ExactPrint
     - Development.IDE.Session
     - UnificationSpec
+    - WatchedFileTests #Previously part of GHCIDE Main tests
 
   - name: [Prelude.last, Data.List.last]
     within:
@@ -142,6 +143,9 @@
     - Ide.PluginUtils
     - Development.Benchmark.Rules
     - TErrorGivenPartialSignature
+    - IfaceTests #Previously part of GHCIDE Main tests
+    - THTests #Previously part of GHCIDE Main tests
+    - WatchedFileTests #Previously part of GHCIDE Main tests
 
   - name: Data.List.foldl1'
     within: []

Diff for: ghcide/test/exe/IfaceTests.hs

@@ -4,7 +4,6 @@
 module IfaceTests (tests) where
 
 import           Control.Monad.IO.Class        (liftIO)
-import           Data.List.Extra               (dropEnd1)
 import           Data.Row
 import qualified Data.Text                     as T
 import           Development.IDE.GHC.Util
@@ -50,7 +49,7 @@ ifaceTHTest = testCase "iface-th-test" $ runWithExtraFiles "TH" $ \dir -> do
     cdoc <- createDoc cPath "haskell" cSource
 
     -- Change [TH]a from () to Bool
-    liftIO $ writeFileUTF8 aPath (T.unpack $ T.unlines $ dropEnd1 (T.lines aSource) ++ ["th_a = [d| a = False|]"])
+    liftIO $ writeFileUTF8 aPath (unlines $ init (lines $ T.unpack aSource) ++ ["th_a = [d| a = False|]"])
 
     -- Check that the change propagates to C
     changeDoc cdoc [TextDocumentContentChangeEvent . InR . (.==) #text $ cSource]

Diff for: ghcide/test/exe/THTests.hs

@@ -4,7 +4,6 @@
 module THTests (tests) where
 
 import           Control.Monad.IO.Class      (liftIO)
-import           Data.List.Extra             (dropEnd, dropEnd1)
 import           Data.Row
 import qualified Data.Text                   as T
 import           Development.IDE.GHC.Util
@@ -142,7 +141,7 @@ thReloadingTest unboxed = testCase name $ runWithExtraFiles dir $ \dir -> do
     expectDiagnostics [("THB.hs", [(DiagnosticSeverity_Warning, (4,1), "Top-level binding")])]
 
     -- Change th from () to Bool
-    let aSource' = T.unlines $ dropEnd1 (T.lines aSource) ++ ["th_a = [d| a = False|]"]
+    let aSource' = T.unlines $ init (T.lines aSource) ++ ["th_a = [d| a = False|]"]
     changeDoc adoc [TextDocumentContentChangeEvent . InR . (.==) #text $ aSource']
     -- generate an artificial warning to avoid timing out if the TH change does not propagate
     changeDoc cdoc [TextDocumentContentChangeEvent . InR . (.==) #text $ cSource <> "\nfoo=()"]
@@ -176,11 +175,11 @@ thLinkingTest unboxed = testCase name $ runWithExtraFiles dir $ \dir -> do
 
     expectDiagnostics [("THB.hs", [(DiagnosticSeverity_Warning, (4,1), "Top-level binding")])]
 
-    let aSource' = T.unlines $ dropEnd 2 (T.lines aSource) ++ ["th :: DecsQ", "th = [d| a = False|]"]
+    let aSource' = T.unlines $ init (init (T.lines aSource)) ++ ["th :: DecsQ", "th = [d| a = False|]"]
     changeDoc adoc [TextDocumentContentChangeEvent . InR . (.==) #text $ aSource']
 
     -- modify b too
-    let bSource' = T.unlines $ dropEnd1 (T.lines bSource) ++ ["$th"]
+    let bSource' = T.unlines $ init (T.lines bSource) ++ ["$th"]
     changeDoc bdoc [TextDocumentContentChangeEvent . InR . (.==) #text $ bSource']
     waitForProgressBegin
     waitForAllProgressDone

Diff for: ghcide/test/exe/WatchedFileTests.hs

@@ -6,7 +6,6 @@ module WatchedFileTests (tests) where
 import           Control.Applicative.Combinators
 import           Control.Monad.IO.Class          (liftIO)
 import qualified Data.Aeson                      as A
-import           Data.List.Extra                 (drop1, dropEnd1)
 import qualified Data.Text                       as T
 import           Development.IDE.Test            (expectDiagnostics)
 import           Language.LSP.Protocol.Message
@@ -36,7 +35,7 @@ tests = testGroup "watched files"
 
     , testSession' "non workspace file" $ \sessionDir -> do
         tmpDir <- liftIO getTemporaryDirectory
-        let yaml = "cradle: {direct: {arguments: [\"-i" <> drop1 (dropEnd1 (show tmpDir)) <> "\", \"A\", \"WatchedFilesMissingModule\"]}}"
+        let yaml = "cradle: {direct: {arguments: [\"-i" <> tail(init(show tmpDir)) <> "\", \"A\", \"WatchedFilesMissingModule\"]}}"
         liftIO $ writeFile (sessionDir </> "hie.yaml") yaml
         _doc <- createDoc "A.hs" "haskell" "{-# LANGUAGE NoImplicitPrelude#-}\nmodule A where\nimport WatchedFilesMissingModule"
         setIgnoringRegistrationRequests False