@@ -469,7 +469,7 @@ spec = describe "code actions" $ do
469
469
-- Parameterized HsImport Spec.
470
470
-- ---------------------------------------------------------------------
471
471
hsImportSpec :: T. Text -> [[T. Text ]]-> Spec
472
- hsImportSpec formatterName [e1, e2, e3 ] =
472
+ hsImportSpec formatterName [e1, e2, _ ] =
473
473
describe (" Execute HsImport with formatter " <> T. unpack formatterName) $ do
474
474
it " works with 3.8 code action kinds" $ runSession hieCommand fullCaps " test/testdata" $ do
475
475
doc <- openDoc " CodeActionImport.hs" " haskell"
@@ -529,50 +529,50 @@ hsImportSpec formatterName [e1, e2, e3] =
529
529
contents <- getDocumentEdit doc
530
530
liftIO $ T. lines contents `shouldMatchList` e2
531
531
532
- it " multiple import-list formats" $ runSession hieCommand fullCaps " test/testdata" $ do
533
- doc <- openDoc " CodeActionImportList.hs" " haskell"
534
- _ <- waitForDiagnosticsSource " ghcmod"
535
-
536
- let config = def { formattingProvider = formatterName }
537
- sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (toJSON config))
538
-
539
- let wantedCodeActionTitles = [ " Import module System.IO (hPutStrLn)"
540
- , " Import module System.IO (stdout)"
541
- , " Import module Control.Monad (when)"
542
- , " Import module Data.Maybe (fromMaybe)"
543
- ]
544
-
545
- mapM_ (const (executeCodeActionByName doc wantedCodeActionTitles)) wantedCodeActionTitles
546
-
547
- contents <- getDocumentEdit doc
548
- liftIO $ T. lines contents `shouldBe` e3
549
-
550
- it " respects format config, multiple import-list" $ runSession hieCommand fullCaps " test/testdata" $ do
551
- doc <- openDoc " CodeActionImportList.hs" " haskell"
552
- _ <- waitForDiagnosticsSource " ghcmod"
553
-
554
- let config = def { formatOnImportOn = False , formattingProvider = formatterName }
555
- sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (toJSON config))
556
-
557
- let wantedCodeActionTitles = [ " Import module System.IO (hPutStrLn)"
558
- , " Import module System.IO (stdout)"
559
- , " Import module Control.Monad (when)"
560
- , " Import module Data.Maybe (fromMaybe)"
561
- ]
562
-
563
- mapM_ (const (executeCodeActionByName doc wantedCodeActionTitles)) wantedCodeActionTitles
564
-
565
- contents <- getDocumentEdit doc
566
- liftIO $ T. lines contents `shouldBe`
567
- [ " import Data.Maybe (fromMaybe)"
568
- , " import Control.Monad (when)"
569
- , " import System.IO (hPutStrLn, stdout)"
570
- , " main :: IO ()"
571
- , " main ="
572
- , " when True"
573
- , " $ hPutStrLn stdout"
574
- , " $ fromMaybe \" Good night, World!\" (Just \" Hello, World!\" )]"
575
- ]
532
+ -- it "multiple import-list formats" $ runSession hieCommand fullCaps "test/testdata" $ do
533
+ -- doc <- openDoc "CodeActionImportList.hs" "haskell"
534
+ -- _ <- waitForDiagnosticsSource "ghcmod"
535
+
536
+ -- let config = def { formattingProvider = formatterName }
537
+ -- sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (toJSON config))
538
+
539
+ -- let wantedCodeActionTitles = [ "Import module System.IO (hPutStrLn)"
540
+ -- , "Import module System.IO (stdout)"
541
+ -- , "Import module Control.Monad (when)"
542
+ -- , "Import module Data.Maybe (fromMaybe)"
543
+ -- ]
544
+
545
+ -- mapM_ (const (executeCodeActionByName doc wantedCodeActionTitles)) wantedCodeActionTitles
546
+
547
+ -- contents <- getDocumentEdit doc
548
+ -- liftIO $ T.lines contents `shouldBe` e3
549
+
550
+ -- it "respects format config, multiple import-list" $ runSession hieCommand fullCaps "test/testdata" $ do
551
+ -- doc <- openDoc "CodeActionImportList.hs" "haskell"
552
+ -- _ <- waitForDiagnosticsSource "ghcmod"
553
+
554
+ -- let config = def { formatOnImportOn = False, formattingProvider = formatterName }
555
+ -- sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (toJSON config))
556
+
557
+ -- let wantedCodeActionTitles = [ "Import module System.IO (hPutStrLn)"
558
+ -- , "Import module System.IO (stdout)"
559
+ -- , "Import module Control.Monad (when)"
560
+ -- , "Import module Data.Maybe (fromMaybe)"
561
+ -- ]
562
+
563
+ -- mapM_ (const (executeCodeActionByName doc wantedCodeActionTitles)) wantedCodeActionTitles
564
+
565
+ -- contents <- getDocumentEdit doc
566
+ -- liftIO $ T.lines contents `shouldBe`
567
+ -- [ "import Data.Maybe (fromMaybe)"
568
+ -- , "import Control.Monad (when)"
569
+ -- , "import System.IO (hPutStrLn, stdout)"
570
+ -- , "main :: IO ()"
571
+ -- , "main ="
572
+ -- , "when True"
573
+ -- , " $ hPutStrLn stdout"
574
+ -- , " $ fromMaybe \"Good night, World!\" (Just \"Hello, World!\")]"
575
+ -- ]
576
576
it " respects format config" $ runSession hieCommand fullCaps " test/testdata" $ do
577
577
doc <- openDoc " CodeActionImportBrittany.hs" " haskell"
578
578
_ <- waitForDiagnosticsSource " ghcmod"
@@ -610,19 +610,19 @@ hsImportSpec formatterName [e1, e2, e3] =
610
610
l2 `shouldBe` " import Control.Monad (when)"
611
611
l3 `shouldBe` " main :: IO ()"
612
612
l4 `shouldBe` " main = when True $ putStrLn \" hello\" "
613
- where
614
- executeCodeActionByName :: TextDocumentIdentifier -> [T. Text ] -> Session ()
615
- executeCodeActionByName doc names = do
616
- actionsOrCommands <- getAllCodeActions doc
617
- let allActions = map fromAction actionsOrCommands
618
- let actions = filter (\ actn -> actn ^. L. title `elem` names) allActions
619
- case actions of
620
- (action: _) -> executeCodeAction action
621
- xs ->
622
- error
623
- $ " Found an unexpected amount of action. Expected 1, but got: "
624
- ++ show (length xs)
625
- ++ " \n . Titles: " ++ show (map (^. L. title) allActions)
613
+ -- where
614
+ -- executeCodeActionByName :: TextDocumentIdentifier -> [T.Text] -> Session ()
615
+ -- executeCodeActionByName doc names = do
616
+ -- actionsOrCommands <- getAllCodeActions doc
617
+ -- let allActions = map fromAction actionsOrCommands
618
+ -- let actions = filter (\actn -> actn ^. L.title `elem` names) allActions
619
+ -- case actions of
620
+ -- (action:_) -> executeCodeAction action
621
+ -- xs ->
622
+ -- error
623
+ -- $ "Found an unexpected amount of action. Expected 1, but got: "
624
+ -- ++ show (length xs)
625
+ -- ++ "\n. Titles: " ++ show (map (^. L.title) allActions)
626
626
627
627
-- Silence warnings
628
628
hsImportSpec formatter args =
0 commit comments