Merge pull request #1163 from alanz/rearrange-modules

Only plugins in the Haskell.Ide.Engine.Plugin module space

Author: lorenzo

haskell-ide-engine.cabal

@@ -19,29 +19,29 @@ flag pedantic
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Haskell.Ide.Engine.Plugin.Base
-                       Haskell.Ide.Engine.Channel
-                       Haskell.Ide.Engine.Scheduler
+  exposed-modules:     Haskell.Ide.Engine.Channel
                        Haskell.Ide.Engine.LSP.CodeActions
+                       Haskell.Ide.Engine.Plugin.Base
                        Haskell.Ide.Engine.LSP.Reactor
                        Haskell.Ide.Engine.Options
                        Haskell.Ide.Engine.Plugin.ApplyRefact
                        Haskell.Ide.Engine.Plugin.Brittany
                        Haskell.Ide.Engine.Plugin.Build
                        Haskell.Ide.Engine.Plugin.Example2
                        Haskell.Ide.Engine.Plugin.Floskell
-                       Haskell.Ide.Engine.Plugin.Fuzzy
                        Haskell.Ide.Engine.Plugin.GhcMod
                        Haskell.Ide.Engine.Plugin.HaRe
                        Haskell.Ide.Engine.Plugin.Haddock
-                       Haskell.Ide.Engine.Plugin.HieExtras
                        Haskell.Ide.Engine.Plugin.HfaAlign
                        Haskell.Ide.Engine.Plugin.Hoogle
                        Haskell.Ide.Engine.Plugin.HsImport
                        Haskell.Ide.Engine.Plugin.Liquid
                        Haskell.Ide.Engine.Plugin.Package
                        Haskell.Ide.Engine.Plugin.Package.Compat
                        Haskell.Ide.Engine.Plugin.Pragmas
+                       Haskell.Ide.Engine.Scheduler
+                       Haskell.Ide.Engine.Support.Fuzzy
+                       Haskell.Ide.Engine.Support.HieExtras
                        Haskell.Ide.Engine.Transport.JsonStdio
                        Haskell.Ide.Engine.Transport.LspStdio
                        Haskell.Ide.Engine.Types

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

@@ -100,4 +100,3 @@ showErr (ErrorUnusedComment s)  = s
 showErr (LayoutWarning s)       = s
 showErr (ErrorUnknownNode s _)  = s
 showErr ErrorOutputCheck        = "Brittany error - invalid output"
-

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

@@ -35,7 +35,7 @@ import qualified GhcMod.Utils                      as GM
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.PluginUtils
-import qualified Haskell.Ide.Engine.Plugin.HieExtras as Hie
+import qualified Haskell.Ide.Engine.Support.HieExtras as Hie
 import           Haskell.Ide.Engine.ArtifactMap
 import qualified Language.Haskell.LSP.Types        as LSP
 import qualified Language.Haskell.LSP.Types.Lens   as LSP

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

@@ -28,7 +28,7 @@ import           Haskell.Ide.Engine.ArtifactMap
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.PluginUtils
-import qualified Haskell.Ide.Engine.Plugin.HieExtras          as Hie
+import qualified Haskell.Ide.Engine.Support.HieExtras         as Hie
 import           Language.Haskell.GHC.ExactPrint.Print
 import qualified Language.Haskell.LSP.Core                    as Core
 import qualified Language.Haskell.LSP.Types                   as J

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

@@ -17,21 +17,21 @@ import           Data.IORef
 import Data.Function
 import Data.Maybe
 import Data.List
-import           System.Directory
-import           System.FilePath
 import           GHC
-import           GhcMonad
-import qualified GhcMod.Monad                                 as GM
 import qualified GhcMod.LightGhc                              as GM
-import           Haskell.Ide.Engine.MonadTypes
+import qualified GhcMod.Monad                                 as GM
+import           GhcMonad
 import           Haskell.Ide.Engine.MonadFunctions
-import           Haskell.Ide.Engine.Plugin.HieExtras
+import           Haskell.Ide.Engine.MonadTypes
 import qualified Haskell.Ide.Engine.Plugin.Hoogle             as Hoogle
 import           Haskell.Ide.Engine.PluginUtils
-import qualified Language.Haskell.LSP.Types as J
+import           Haskell.Ide.Engine.Support.HieExtras
 import           HscTypes
+import qualified Language.Haskell.LSP.Types as J
 import           Name
 import           Packages
+import           System.Directory
+import           System.FilePath
 
 
 import Documentation.Haddock

src/Haskell/Ide/Engine/Plugin/Fuzzy.hs renamed to src/Haskell/Ide/Engine/Support/Fuzzy.hs

@@ -4,7 +4,7 @@
 -- | Forked from: Text.Fuzzy (MIT)
 -- Original Author: Joomy Korkut, http://github.com/joom/fuzzy
 -- Uses 'TextualMonoid' to be able to run on different types of strings.
-module Haskell.Ide.Engine.Plugin.Fuzzy where
+module Haskell.Ide.Engine.Support.Fuzzy where
 
 import Prelude hiding (filter, null)
 

src/Haskell/Ide/Engine/Plugin/HieExtras.hs renamed to src/Haskell/Ide/Engine/Support/HieExtras.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE TypeFamilies        #-}
-module Haskell.Ide.Engine.Plugin.HieExtras
+module Haskell.Ide.Engine.Support.HieExtras
   ( getDynFlags
   , WithSnippets(..)
   , getCompletions
@@ -40,6 +40,7 @@ import qualified Data.Text                                    as T
 import qualified Data.Text.IO                                 as T
 import           Data.Typeable
 import           DataCon
+import qualified DynFlags                                     as GHC
 import           Exception
 import           FastString
 import           Finder
@@ -55,7 +56,7 @@ import           Haskell.Ide.Engine.Context
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.PluginUtils
-import qualified Haskell.Ide.Engine.Plugin.Fuzzy              as Fuzzy
+import qualified Haskell.Ide.Engine.Support.Fuzzy              as Fuzzy
 import           HscTypes
 import qualified Language.Haskell.LSP.Types                   as J
 import qualified Language.Haskell.LSP.Types.Lens              as J
@@ -64,7 +65,6 @@ import           Language.Haskell.Refact.Utils.MonadFunctions
 import           Name
 import           Outputable                                   (Outputable)
 import qualified Outputable                                   as GHC
-import qualified DynFlags                                     as GHC
 import           Packages
 import           SrcLoc
 import           TcEnv

src/Haskell/Ide/Engine/Transport/LspStdio.hs

@@ -17,53 +17,53 @@ module Haskell.Ide.Engine.Transport.LspStdio
 
 import           Control.Concurrent
 import           Control.Concurrent.STM.TChan
-import qualified Control.FoldDebounce as Debounce
 import qualified Control.Exception as E
+import qualified Control.FoldDebounce as Debounce
 import           Control.Lens ( (^.), (.~) )
 import           Control.Monad
 import           Control.Monad.IO.Class
-import           Control.Monad.STM
 import           Control.Monad.Reader
-import qualified Data.Aeson as J
+import           Control.Monad.STM
 import           Data.Aeson ( (.=) )
+import qualified Data.Aeson as J
 import qualified Data.ByteString.Lazy as BL
 import           Data.Char (isUpper, isAlphaNum)
 import           Data.Coerce (coerce)
 import           Data.Default
-import           Data.Maybe
 import           Data.Foldable
 import           Data.Function
 import qualified Data.Map as Map
+import           Data.Maybe
 import           Data.Semigroup (Semigroup(..), Option(..), option)
 import qualified Data.Set as S
 import qualified Data.SortedList as SL
 import qualified Data.Text as T
 import           Data.Text.Encoding
-import qualified GhcModCore               as GM
 import qualified GhcMod.Monad.Types       as GM
+import qualified GhcModCore               as GM
 import           Haskell.Ide.Engine.Config
+import           Haskell.Ide.Engine.LSP.CodeActions
+import           Haskell.Ide.Engine.LSP.Reactor
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes
+import qualified Haskell.Ide.Engine.Plugin.ApplyRefact   as ApplyRefact
+import           Haskell.Ide.Engine.Plugin.Base
+import qualified Haskell.Ide.Engine.Plugin.GhcMod        as GhcMod
+import qualified Haskell.Ide.Engine.Plugin.HaRe          as HaRe
+import qualified Haskell.Ide.Engine.Plugin.Hoogle        as Hoogle
 import           Haskell.Ide.Engine.PluginUtils
 import qualified Haskell.Ide.Engine.Scheduler            as Scheduler
+import qualified Haskell.Ide.Engine.Support.HieExtras     as Hie
 import           Haskell.Ide.Engine.Types
-import           Haskell.Ide.Engine.LSP.CodeActions
-import           Haskell.Ide.Engine.LSP.Reactor
-import qualified Haskell.Ide.Engine.Plugin.HaRe          as HaRe
-import qualified Haskell.Ide.Engine.Plugin.GhcMod        as GhcMod
-import qualified Haskell.Ide.Engine.Plugin.ApplyRefact   as ApplyRefact
-import qualified Haskell.Ide.Engine.Plugin.Hoogle        as Hoogle
-import qualified Haskell.Ide.Engine.Plugin.HieExtras     as Hie
-import           Haskell.Ide.Engine.Plugin.Base
 import qualified Language.Haskell.LSP.Control            as CTRL
 import qualified Language.Haskell.LSP.Core               as Core
-import qualified Language.Haskell.LSP.VFS                as VFS
 import           Language.Haskell.LSP.Diagnostics
 import           Language.Haskell.LSP.Messages
 import qualified Language.Haskell.LSP.Types              as J
-import qualified Language.Haskell.LSP.Types.Lens         as J
 import           Language.Haskell.LSP.Types.Capabilities as C
+import qualified Language.Haskell.LSP.Types.Lens         as J
 import qualified Language.Haskell.LSP.Utility            as U
+import qualified Language.Haskell.LSP.VFS                as VFS
 import           System.Exit
 import qualified System.Log.Logger as L
 import qualified Yi.Rope as Yi

test/dispatcher/Main.hs

@@ -16,6 +16,7 @@ import           GHC.Generics
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.PluginUtils
 import           Haskell.Ide.Engine.Scheduler
+import           Haskell.Ide.Engine.Support.HieExtras
 import           Haskell.Ide.Engine.Types
 import           Language.Haskell.LSP.Types
 import           TestUtils
@@ -33,7 +34,6 @@ import           Haskell.Ide.Engine.Plugin.Base
 import           Haskell.Ide.Engine.Plugin.Example2
 import           Haskell.Ide.Engine.Plugin.GhcMod
 import           Haskell.Ide.Engine.Plugin.HaRe
-import           Haskell.Ide.Engine.Plugin.HieExtras
 
 {-# ANN module ("HLint: ignore Redundant do"       :: String) #-}
 -- ---------------------------------------------------------------------

test/unit/GhcModPluginSpec.hs

@@ -12,8 +12,8 @@ import qualified Data.Set                            as S
 import qualified Data.Text                           as T
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.Plugin.GhcMod
-import           Haskell.Ide.Engine.Plugin.HieExtras
 import           Haskell.Ide.Engine.PluginUtils
+import           Haskell.Ide.Engine.Support.HieExtras
 import           Language.Haskell.LSP.Types          (TextEdit (..))
 import           System.Directory
 import           TestUtils