Merge pull request #783 from bubba/brittany-hsimport

Use Brittany with hsimport when needed

Author: lukel97

app/MainHie.hs

@@ -9,7 +9,6 @@ import qualified GhcMod.Types                          as GM
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.Options
-import           Haskell.Ide.Engine.PluginDescriptor
 import           Haskell.Ide.Engine.Scheduler
 import           Haskell.Ide.Engine.Transport.LspStdio
 import           Haskell.Ide.Engine.Transport.JsonStdio

haskell-ide-engine.cabal

@@ -23,7 +23,6 @@ library
                        Haskell.Ide.Engine.Channel
                        Haskell.Ide.Engine.Scheduler
                        Haskell.Ide.Engine.LSP.CodeActions
-                       Haskell.Ide.Engine.LSP.Config
                        Haskell.Ide.Engine.LSP.Reactor
                        Haskell.Ide.Engine.Options
                        Haskell.Ide.Engine.Plugin.ApplyRefact
@@ -172,6 +171,7 @@ test-suite unit-test
                      , hoogle > 5.0.11
                      , hspec
                      , quickcheck-instances
+                     , stm
                      , text
                      , unordered-containers
 

src/Haskell/Ide/Engine/LSP/Config.hs renamed to hie-plugin-api/Haskell/Ide/Engine/Config.hs

@@ -1,10 +1,9 @@
 {-# LANGUAGE OverloadedStrings #-}
-module Haskell.Ide.Engine.LSP.Config where
+module Haskell.Ide.Engine.Config where
 
 import           Data.Aeson
-import qualified Data.Map  as Map
+import           Data.Default
 import qualified Data.Text as T
-import           Haskell.Ide.Engine.PluginsIdeMonads
 import           Language.Haskell.LSP.Types
 
 -- ---------------------------------------------------------------------
@@ -25,16 +24,28 @@ 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
+    , formatOnImportOn        = True
+    }
+
+-- TODO: Add API for plugins to expose their own LSP config options
 instance FromJSON Config where
   parseJSON = withObject "Config" $ \v -> do
     s <- v .: "languageServerHaskell"
     flip (withObject "Config.settings") s $ \o -> Config
-      <$> o .:? "hlintOn"              .!= True
-      <*> o .:? "maxNumberOfProblems"  .!= 100
-      <*> o .:? "liquidOn"             .!= False
-      <*> o .:? "completionSnippetsOn" .!= True
+      <$> o .:? "hlintOn"              .!= hlintOn def
+      <*> 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:
@@ -46,19 +57,11 @@ 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
+                 , "formatOnImportOn"     .= f
                  ]
-
--- ---------------------------------------------------------------------
-
--- | For the diagnostic providers in the config, return a map of
--- current enabled state, indexed by the plugin id.
-getDiagnosticProvidersConfig :: Config -> Map.Map PluginId Bool
-getDiagnosticProvidersConfig c = Map.fromList [("applyrefact",hlintOn c)
-                                              ,("liquid",     liquidOn c)
-                                              ]

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

@@ -232,7 +232,7 @@ fileInfo tfileName =
 
 clientSupportsDocumentChanges :: IdeM Bool
 clientSupportsDocumentChanges = do
-  ClientCapabilities mwCaps _ _ <- ask
+  ClientCapabilities mwCaps _ _ <- getClientCapabilities
   let supports = do
         wCaps <- mwCaps
         WorkspaceEditClientCapabilities mDc <- _workspaceEdit wCaps