Rewrite the test

Author: July541

ghcide/test/exe/Main.hs

@@ -1817,7 +1817,7 @@ extendImportTests = testGroup "extend import actions"
                     , "f = Foo 1"
                     ])
             (Range (Position 3 4) (Position 3 6))
-            ["Add Foo(Foo) to the import list of ModuleA"]
+            ["Add Foo(Foo) to the import list of ModuleA", "Add Foo(..) to the import list of ModuleA"]
             (T.unlines
                     [ "module ModuleB where"
                     , "import ModuleA(Foo (Foo))"
@@ -1997,11 +1997,14 @@ suggestImportTests = testGroup "suggest import actions"
     , test False []         "f ExitSuccess = ()"          []                "import System.Exit (ExitSuccess)"
       -- don't suggest data constructor when we only need the type
     , test False []         "f :: Bar"                    []                "import Bar (Bar(Bar))"
+      -- don't suggest all data constructors for the data type
+    , test False []         "f :: Bar"                    []                "import Bar (Bar(..))"
     ]
   , testGroup "want suggestion"
     [ wantWait  []          "f = foo"                     []                "import Foo (foo)"
     , wantWait  []          "f = Bar"                     []                "import Bar (Bar(Bar))"
     , wantWait  []          "f :: Bar"                    []                "import Bar (Bar)"
+    , wantWait  []          "f = Bar"                     []                "import Bar (Bar(..))"
     , test True []          "f = nonEmpty"                []                "import Data.List.NonEmpty (nonEmpty)"
     , test True []          "f = (:|)"                    []                "import Data.List.NonEmpty (NonEmpty((:|)))"
     , test True []          "f :: Natural"                ["f = undefined"] "import Numeric.Natural (Natural)"
@@ -2045,29 +2048,11 @@ suggestImportTests = testGroup "suggest import actions"
       ]                     "f = T.putStrLn"              []                "import qualified Data.Text.IO as T"
     ]
   , expectFailBecause "importing pattern synonyms is unsupported" $ test True [] "k (Some x) = x" [] "import B (pattern Some)"
-  , testGroup "Import with all constructors"
-    [ testCase "new import" $
-        testAllCons
-          []
-          ["import A", "import A (Foo(Foo))", "import A (Foo(..))"]
-    , testCase "extened import" $
-        testAllCons
-          ["import A()"]
-          ["Add Foo(Foo) to the import list of A", "Add Foo(..) to the import list of A"]
-    ]
   ]
   where
     test = test' False
     wantWait = test' True True
 
-    getActions doc defLine waitForCheckProject = do
-      waitForProgressDone
-      _ <- waitForDiagnostics
-      -- there isn't a good way to wait until the whole project is checked atm
-      when waitForCheckProject $ liftIO $ sleep 0.5
-      let range = Range (Position defLine 0) (Position defLine maxBound)
-      getCodeActions doc range
-
     test' waitForCheckProject wanted imps def other newImp = testSessionWithExtraFiles "hover" (T.unpack def) $ \dir -> do
       configureCheckProject waitForCheckProject
       let before = T.unlines $ "module A where" : ["import " <> x | x <- imps] ++ def : other
@@ -2076,7 +2061,13 @@ suggestImportTests = testGroup "suggest import actions"
       liftIO $ writeFileUTF8 (dir </> "hie.yaml") cradle
       liftIO $ writeFileUTF8 (dir </> "B.hs") $ unlines ["{-# LANGUAGE PatternSynonyms #-}", "module B where", "pattern Some x = Just x"]
       doc <- createDoc "Test.hs" "haskell" before
-      actions <- getActions doc (fromIntegral $ length imps + 1) waitForCheckProject
+      waitForProgressDone
+      _ <- waitForDiagnostics
+      -- there isn't a good way to wait until the whole project is checked atm
+      when waitForCheckProject $ liftIO $ sleep 0.5
+      let defLine = fromIntegral $ length imps + 1
+          range = Range (Position defLine 0) (Position defLine maxBound)
+      actions <- getCodeActions doc range
       if wanted
          then do
              action <- liftIO $ pickActionWithTitle newImp actions
@@ -2086,16 +2077,6 @@ suggestImportTests = testGroup "suggest import actions"
           else
               liftIO $ [_title | InR CodeAction{_title} <- actions, _title == newImp ] @?= []
 
-    testAllCons imported expected = run' $ \dir -> do
-      configureCheckProject True
-      void $ createDoc (dir </> "A.hs")
-               "haskell"
-               (T.unlines ["module A where", "data Foo = Foo | Bar"])
-      doc <- createDoc (dir </> "Test.hs") "haskell" $ T.unlines (imported ++ ["f = Foo"])
-      actions <- getActions doc (fromIntegral $ length imported) True
-      let titles = [_title | InR CodeAction{_title} <- actions, _title `elem` expected]
-      liftIO $ sort expected @=? sort titles
-
 suggestImportDisambiguationTests :: TestTree
 suggestImportDisambiguationTests = testGroup "suggest import disambiguation actions"
   [ testGroup "Hiding strategy works"