Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 4c64789

Browse files
lorenzolorenzo
authored
Merge pull request #1163 from alanz/rearrange-modules
Only plugins in the Haskell.Ide.Engine.Plugin module space
2 parents d961196 + 966af22 commit 4c64789

File tree

12 files changed

+37
-38
lines changed

12 files changed

+37
-38
lines changed

‎haskell-ide-engine.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,29 @@ flag pedantic
1919

2020
library
2121
hs-source-dirs: src
22-
exposed-modules: Haskell.Ide.Engine.Plugin.Base
23-
Haskell.Ide.Engine.Channel
24-
Haskell.Ide.Engine.Scheduler
22+
exposed-modules: Haskell.Ide.Engine.Channel
2523
Haskell.Ide.Engine.LSP.CodeActions
24+
Haskell.Ide.Engine.Plugin.Base
2625
Haskell.Ide.Engine.LSP.Reactor
2726
Haskell.Ide.Engine.Options
2827
Haskell.Ide.Engine.Plugin.ApplyRefact
2928
Haskell.Ide.Engine.Plugin.Brittany
3029
Haskell.Ide.Engine.Plugin.Build
3130
Haskell.Ide.Engine.Plugin.Example2
3231
Haskell.Ide.Engine.Plugin.Floskell
33-
Haskell.Ide.Engine.Plugin.Fuzzy
3432
Haskell.Ide.Engine.Plugin.GhcMod
3533
Haskell.Ide.Engine.Plugin.HaRe
3634
Haskell.Ide.Engine.Plugin.Haddock
37-
Haskell.Ide.Engine.Plugin.HieExtras
3835
Haskell.Ide.Engine.Plugin.HfaAlign
3936
Haskell.Ide.Engine.Plugin.Hoogle
4037
Haskell.Ide.Engine.Plugin.HsImport
4138
Haskell.Ide.Engine.Plugin.Liquid
4239
Haskell.Ide.Engine.Plugin.Package
4340
Haskell.Ide.Engine.Plugin.Package.Compat
4441
Haskell.Ide.Engine.Plugin.Pragmas
42+
Haskell.Ide.Engine.Scheduler
43+
Haskell.Ide.Engine.Support.Fuzzy
44+
Haskell.Ide.Engine.Support.HieExtras
4545
Haskell.Ide.Engine.Transport.JsonStdio
4646
Haskell.Ide.Engine.Transport.LspStdio
4747
Haskell.Ide.Engine.Types

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,3 @@ showErr (ErrorUnusedComment s) = s
100100
showErr (LayoutWarning s) = s
101101
showErr (ErrorUnknownNode s _) = s
102102
showErr ErrorOutputCheck = "Brittany error - invalid output"
103-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import qualified GhcMod.Utils as GM
3535
import Haskell.Ide.Engine.MonadFunctions
3636
import Haskell.Ide.Engine.MonadTypes
3737
import Haskell.Ide.Engine.PluginUtils
38-
import qualified Haskell.Ide.Engine.Plugin.HieExtras as Hie
38+
import qualified Haskell.Ide.Engine.Support.HieExtras as Hie
3939
import Haskell.Ide.Engine.ArtifactMap
4040
import qualified Language.Haskell.LSP.Types as LSP
4141
import qualified Language.Haskell.LSP.Types.Lens as LSP

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import Haskell.Ide.Engine.ArtifactMap
2828
import Haskell.Ide.Engine.MonadFunctions
2929
import Haskell.Ide.Engine.MonadTypes
3030
import Haskell.Ide.Engine.PluginUtils
31-
import qualified Haskell.Ide.Engine.Plugin.HieExtras as Hie
31+
import qualified Haskell.Ide.Engine.Support.HieExtras as Hie
3232
import Language.Haskell.GHC.ExactPrint.Print
3333
import qualified Language.Haskell.LSP.Core as Core
3434
import qualified Language.Haskell.LSP.Types as J

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ import Data.IORef
1717
import Data.Function
1818
import Data.Maybe
1919
import Data.List
20-
import System.Directory
21-
import System.FilePath
2220
import GHC
23-
import GhcMonad
24-
import qualified GhcMod.Monad as GM
2521
import qualified GhcMod.LightGhc as GM
26-
import Haskell.Ide.Engine.MonadTypes
22+
import qualified GhcMod.Monad as GM
23+
import GhcMonad
2724
import Haskell.Ide.Engine.MonadFunctions
28-
import Haskell.Ide.Engine.Plugin.HieExtras
25+
import Haskell.Ide.Engine.MonadTypes
2926
import qualified Haskell.Ide.Engine.Plugin.Hoogle as Hoogle
3027
import Haskell.Ide.Engine.PluginUtils
31-
import qualified Language.Haskell.LSP.Types as J
28+
import Haskell.Ide.Engine.Support.HieExtras
3229
import HscTypes
30+
import qualified Language.Haskell.LSP.Types as J
3331
import Name
3432
import Packages
33+
import System.Directory
34+
import System.FilePath
3535

3636

3737
import Documentation.Haddock

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-- | Forked from: Text.Fuzzy (MIT)
55
-- Original Author: Joomy Korkut, http://github.com/joom/fuzzy
66
-- Uses 'TextualMonoid' to be able to run on different types of strings.
7-
module Haskell.Ide.Engine.Plugin.Fuzzy where
7+
module Haskell.Ide.Engine.Support.Fuzzy where
88

99
import Prelude hiding (filter, null)
1010

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{-# LANGUAGE ScopedTypeVariables #-}
44
{-# LANGUAGE OverloadedStrings #-}
55
{-# LANGUAGE TypeFamilies #-}
6-
module Haskell.Ide.Engine.Plugin.HieExtras
6+
module Haskell.Ide.Engine.Support.HieExtras
77
( getDynFlags
88
, WithSnippets(..)
99
, getCompletions
@@ -40,6 +40,7 @@ import qualified Data.Text as T
4040
import qualified Data.Text.IO as T
4141
import Data.Typeable
4242
import DataCon
43+
import qualified DynFlags as GHC
4344
import Exception
4445
import FastString
4546
import Finder
@@ -55,7 +56,7 @@ import Haskell.Ide.Engine.Context
5556
import Haskell.Ide.Engine.MonadFunctions
5657
import Haskell.Ide.Engine.MonadTypes
5758
import Haskell.Ide.Engine.PluginUtils
58-
import qualified Haskell.Ide.Engine.Plugin.Fuzzy as Fuzzy
59+
import qualified Haskell.Ide.Engine.Support.Fuzzy as Fuzzy
5960
import HscTypes
6061
import qualified Language.Haskell.LSP.Types as J
6162
import qualified Language.Haskell.LSP.Types.Lens as J
@@ -64,7 +65,6 @@ import Language.Haskell.Refact.Utils.MonadFunctions
6465
import Name
6566
import Outputable (Outputable)
6667
import qualified Outputable as GHC
67-
import qualified DynFlags as GHC
6868
import Packages
6969
import SrcLoc
7070
import TcEnv

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,53 +17,53 @@ module Haskell.Ide.Engine.Transport.LspStdio
1717

1818
import Control.Concurrent
1919
import Control.Concurrent.STM.TChan
20-
import qualified Control.FoldDebounce as Debounce
2120
import qualified Control.Exception as E
21+
import qualified Control.FoldDebounce as Debounce
2222
import Control.Lens ( (^.), (.~) )
2323
import Control.Monad
2424
import Control.Monad.IO.Class
25-
import Control.Monad.STM
2625
import Control.Monad.Reader
27-
import qualified Data.Aeson as J
26+
import Control.Monad.STM
2827
import Data.Aeson ( (.=) )
28+
import qualified Data.Aeson as J
2929
import qualified Data.ByteString.Lazy as BL
3030
import Data.Char (isUpper, isAlphaNum)
3131
import Data.Coerce (coerce)
3232
import Data.Default
33-
import Data.Maybe
3433
import Data.Foldable
3534
import Data.Function
3635
import qualified Data.Map as Map
36+
import Data.Maybe
3737
import Data.Semigroup (Semigroup(..), Option(..), option)
3838
import qualified Data.Set as S
3939
import qualified Data.SortedList as SL
4040
import qualified Data.Text as T
4141
import Data.Text.Encoding
42-
import qualified GhcModCore as GM
4342
import qualified GhcMod.Monad.Types as GM
43+
import qualified GhcModCore as GM
4444
import Haskell.Ide.Engine.Config
45+
import Haskell.Ide.Engine.LSP.CodeActions
46+
import Haskell.Ide.Engine.LSP.Reactor
4547
import Haskell.Ide.Engine.MonadFunctions
4648
import Haskell.Ide.Engine.MonadTypes
49+
import qualified Haskell.Ide.Engine.Plugin.ApplyRefact as ApplyRefact
50+
import Haskell.Ide.Engine.Plugin.Base
51+
import qualified Haskell.Ide.Engine.Plugin.GhcMod as GhcMod
52+
import qualified Haskell.Ide.Engine.Plugin.HaRe as HaRe
53+
import qualified Haskell.Ide.Engine.Plugin.Hoogle as Hoogle
4754
import Haskell.Ide.Engine.PluginUtils
4855
import qualified Haskell.Ide.Engine.Scheduler as Scheduler
56+
import qualified Haskell.Ide.Engine.Support.HieExtras as Hie
4957
import Haskell.Ide.Engine.Types
50-
import Haskell.Ide.Engine.LSP.CodeActions
51-
import Haskell.Ide.Engine.LSP.Reactor
52-
import qualified Haskell.Ide.Engine.Plugin.HaRe as HaRe
53-
import qualified Haskell.Ide.Engine.Plugin.GhcMod as GhcMod
54-
import qualified Haskell.Ide.Engine.Plugin.ApplyRefact as ApplyRefact
55-
import qualified Haskell.Ide.Engine.Plugin.Hoogle as Hoogle
56-
import qualified Haskell.Ide.Engine.Plugin.HieExtras as Hie
57-
import Haskell.Ide.Engine.Plugin.Base
5858
import qualified Language.Haskell.LSP.Control as CTRL
5959
import qualified Language.Haskell.LSP.Core as Core
60-
import qualified Language.Haskell.LSP.VFS as VFS
6160
import Language.Haskell.LSP.Diagnostics
6261
import Language.Haskell.LSP.Messages
6362
import qualified Language.Haskell.LSP.Types as J
64-
import qualified Language.Haskell.LSP.Types.Lens as J
6563
import Language.Haskell.LSP.Types.Capabilities as C
64+
import qualified Language.Haskell.LSP.Types.Lens as J
6665
import qualified Language.Haskell.LSP.Utility as U
66+
import qualified Language.Haskell.LSP.VFS as VFS
6767
import System.Exit
6868
import qualified System.Log.Logger as L
6969
import qualified Yi.Rope as Yi

‎test/dispatcher/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import GHC.Generics
1616
import Haskell.Ide.Engine.MonadTypes
1717
import Haskell.Ide.Engine.PluginUtils
1818
import Haskell.Ide.Engine.Scheduler
19+
import Haskell.Ide.Engine.Support.HieExtras
1920
import Haskell.Ide.Engine.Types
2021
import Language.Haskell.LSP.Types
2122
import TestUtils
@@ -33,7 +34,6 @@ import Haskell.Ide.Engine.Plugin.Base
3334
import Haskell.Ide.Engine.Plugin.Example2
3435
import Haskell.Ide.Engine.Plugin.GhcMod
3536
import Haskell.Ide.Engine.Plugin.HaRe
36-
import Haskell.Ide.Engine.Plugin.HieExtras
3737

3838
{-# ANN module ("HLint: ignore Redundant do" :: String) #-}
3939
-- ---------------------------------------------------------------------

‎test/unit/GhcModPluginSpec.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import qualified Data.Set as S
1212
import qualified Data.Text as T
1313
import Haskell.Ide.Engine.MonadTypes
1414
import Haskell.Ide.Engine.Plugin.GhcMod
15-
import Haskell.Ide.Engine.Plugin.HieExtras
1615
import Haskell.Ide.Engine.PluginUtils
16+
import Haskell.Ide.Engine.Support.HieExtras
1717
import Language.Haskell.LSP.Types (TextEdit (..))
1818
import System.Directory
1919
import TestUtils

‎test/unit/HaRePluginSpec.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Haskell.Ide.Engine.MonadTypes
1414
import Haskell.Ide.Engine.PluginUtils
1515
import Haskell.Ide.Engine.Plugin.GhcMod
1616
import Haskell.Ide.Engine.Plugin.HaRe
17-
import Haskell.Ide.Engine.Plugin.HieExtras
17+
import Haskell.Ide.Engine.Support.HieExtras
1818
import Language.Haskell.LSP.Types ( Location(..)
1919
, TextEdit(..)
2020
)

‎test/unit/JsonSpec.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Haskell.Ide.Engine.MonadTypes
1010
import Haskell.Ide.Engine.Plugin.ApplyRefact
1111
import Haskell.Ide.Engine.Plugin.GhcMod
1212
import Haskell.Ide.Engine.Plugin.HaRe
13-
import Haskell.Ide.Engine.Plugin.HieExtras
13+
import Haskell.Ide.Engine.Support.HieExtras
1414
import Haskell.Ide.Engine.Config
1515

1616
import Data.Aeson

0 commit comments

Comments
 (0)