Fix config and add test

Author: lukel97

hie-plugin-api/Haskell/Ide/Engine/Config.hs

@@ -65,6 +65,7 @@ instance ToJSON Config where
                  , "liquidOn"             .= l
                  , "completionSnippetsOn" .= c
                  , "completionSnippetsOn" .= f
+                 , "formatOnImportOn"     .= f
                  ]
 
 -- ---------------------------------------------------------------------

src/Haskell/Ide/Engine/Plugin/HsImport.hs

@@ -80,11 +80,10 @@ importModule uri modName =
           liftIO $ removeFile output
           J.WorkspaceEdit mChanges mDocChanges <- liftToGhc $ makeDiffResult input newText fileMap
 
-          confFile <- liftIO $ Brittany.getConfFile origInput
-          -- Format the import with Brittany
-
           if shouldFormat
             then do 
+              -- Format the import with Brittany
+              confFile <- liftIO $ Brittany.getConfFile origInput
               newChanges <- forM mChanges $ mapM $ mapM (formatTextEdit confFile)
               newDocChanges <- forM mDocChanges $ mapM $ \(J.TextDocumentEdit vDocId tes) -> do
                 ftes <- forM tes (formatTextEdit confFile)

test/functional/FunctionalCodeActionsSpec.hs

@@ -12,6 +12,7 @@ import qualified Data.HashMap.Strict as HM
 import           Data.Maybe
 import           Data.Monoid ((<>))
 import qualified Data.Text as T
+import           Haskell.Ide.Engine.Config
 import           Language.Haskell.LSP.Test as Test
 import           Language.Haskell.LSP.Types
 import qualified Language.Haskell.LSP.Types.Lens as L
@@ -96,7 +97,7 @@ spec = describe "code actions" $ do
         _:x:_ <- T.lines <$> documentContents doc
         liftIO $ x `shouldBe` "foo = putStrLn \"world\""
 
-  describe "import suggetsions" $ do
+  describe "import suggestions" $ do
     it "works with 3.8 code action kinds" $ runSession hieCommand fullCaps "test/testdata" $ do
       doc <- openDoc "CodeActionImport.hs" "haskell"
 
@@ -135,6 +136,22 @@ spec = describe "code actions" $ do
         let l1:l2:_ = T.lines contents
         l1 `shouldBe` "import qualified Data.Maybe"
         l2 `shouldBe` "import           Control.Monad"
+    it "respects format config" $ runSession hieCommand fullCaps "test/testdata" $ do
+      doc <- openDoc "CodeActionImportBrittany.hs" "haskell"
+      _ <- waitForDiagnosticsSource "ghcmod"
+      
+      let config = def { formatOnImportOn = False }
+      sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (toJSON config))
+
+      actionsOrCommands <- getAllCodeActions doc
+      let action:_ = map fromAction actionsOrCommands
+      executeCodeAction action
+
+      contents <- getDocumentEdit doc
+      liftIO $ do
+        let l1:l2:_ = T.lines contents
+        l1 `shouldBe` "import qualified Data.Maybe"
+        l2 `shouldBe` "import Control.Monad"
 
   describe "add package suggestions" $ do
     it "adds to .cabal files" $ runSession hieCommand fullCaps "test/testdata/addPackageTest/cabal" $ do

test/functional/FunctionalLiquidSpec.hs

@@ -5,6 +5,7 @@ module FunctionalLiquidSpec where
 import           Control.Lens hiding (List)
 import           Control.Monad.IO.Class
 import           Data.Aeson
+import           Data.Default
 import qualified Data.Text as T
 import           Language.Haskell.LSP.Test hiding (message)
 import           Language.Haskell.LSP.Types as LSP
@@ -80,13 +81,7 @@ spec = describe "liquid haskell diagnostics" $ do
           reduceDiag ^. source `shouldBe` Just "hlint"
 
         -- Enable liquid haskell plugin
-        let config =
-             Config
-               { hlintOn              = False
-               , maxNumberOfProblems  = 50
-               , liquidOn             = True
-               , completionSnippetsOn = True
-               }
+        let config = def { liquidOn  = True }
         sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (toJSON config))
 
         -- docItem <- getDocItem file languageId

test/unit/JsonSpec.hs

@@ -102,4 +102,4 @@ instance Arbitrary Position where
     return $ Position l c
 
 instance Arbitrary Config where
-  arbitrary = Config <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
+  arbitrary = Config <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary