Add config for formatting on import

Author: lukel97

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

@@ -25,14 +25,16 @@ data Config =
     , maxNumberOfProblems  :: Int
     , liquidOn             :: Bool
     , completionSnippetsOn :: Bool
+    , formatOnImportOn     :: Bool
     } deriving (Show,Eq)
 
 instance Default Config where
   def = Config
-    { hlintOn = True
-    , maxNumberOfProblems = 100
-    , liquidOn = False
-    , completionSnippetsOn = True
+    { hlintOn                 = True
+    , maxNumberOfProblems     = 100
+    , liquidOn                = False
+    , completionSnippetsOn    = True
+    , formatOnImportOn        = True
     }
 
 -- TODO: Add API for plugins to expose their own LSP config options
@@ -44,6 +46,7 @@ instance FromJSON Config where
       <*> o .:? "maxNumberOfProblems"  .!= maxNumberOfProblems def
       <*> o .:? "liquidOn"             .!= liquidOn def
       <*> o .:? "completionSnippetsOn" .!= completionSnippetsOn def
+      <*> o .:? "formatOnImportOn"     .!= formatOnImportOn def 
 
 -- 2017-10-09 23:22:00.710515298 [ThreadId 11] - ---> {"jsonrpc":"2.0","method":"workspace/didChangeConfiguration","params":{"settings":{"languageServerHaskell":{"maxNumberOfProblems":100,"hlintOn":true}}}}
 -- 2017-10-09 23:22:00.710667381 [ThreadId 15] - reactor:got didChangeConfiguration notification:
@@ -55,12 +58,13 @@ instance FromJSON Config where
 --                                                                                          ,("maxNumberOfProblems",Number 100.0)]))])}}
 
 instance ToJSON Config where
-  toJSON (Config h m l c) = object [ "languageServerHaskell" .= r ]
+  toJSON (Config h m l c f) = object [ "languageServerHaskell" .= r ]
     where
       r = object [ "hlintOn"              .= h
                  , "maxNumberOfProblems"  .= m
                  , "liquidOn"             .= l
                  , "completionSnippetsOn" .= c
+                 , "completionSnippetsOn" .= f
                  ]
 
 -- ---------------------------------------------------------------------

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

@@ -19,6 +19,7 @@ import qualified Data.Text.IO                  as T
 import qualified GHC.Generics                  as Generics
 import qualified GhcMod.Utils                  as GM
 import           HsImport
+import           Haskell.Ide.Engine.Config
 import           Haskell.Ide.Engine.MonadTypes
 import qualified Language.Haskell.LSP.Types      as J
 import qualified Language.Haskell.LSP.Types.Lens as J
@@ -54,6 +55,9 @@ importCmd = CmdSync $ \(ImportParams uri modName) -> importModule uri modName
 importModule :: Uri -> T.Text -> IdeGhcM (IdeResult J.WorkspaceEdit)
 importModule uri modName =
   pluginGetFile "hsimport cmd: " uri $ \origInput -> do
+
+    shouldFormat <- formatOnImportOn <$> liftToGhc getConfig
+
     fileMap <- GM.mkRevRedirMapFunc
     GM.withMappedFile origInput $ \input -> do
 
@@ -78,12 +82,17 @@ importModule uri modName =
 
           confFile <- liftIO $ Brittany.getConfFile origInput
           -- Format the import with Brittany
-          newChanges <- forM mChanges $ mapM $ mapM (formatTextEdit confFile)
-          newDocChanges <- forM mDocChanges $ mapM $ \(J.TextDocumentEdit vDocId tes) -> do
-            ftes <- forM tes (formatTextEdit confFile)
-            return (J.TextDocumentEdit vDocId ftes)
 
-          return $ IdeResultOk (J.WorkspaceEdit newChanges newDocChanges)
+          if shouldFormat
+            then do 
+              newChanges <- forM mChanges $ mapM $ mapM (formatTextEdit confFile)
+              newDocChanges <- forM mDocChanges $ mapM $ \(J.TextDocumentEdit vDocId tes) -> do
+                ftes <- forM tes (formatTextEdit confFile)
+                return (J.TextDocumentEdit vDocId ftes)
+
+              return $ IdeResultOk (J.WorkspaceEdit newChanges newDocChanges)
+            else
+              return $ IdeResultOk (J.WorkspaceEdit mChanges mDocChanges)
 
   where formatTextEdit confFile (J.TextEdit r t) = do
           -- TODO: This tab size of 2 spaces should probably be taken from a config