Create Types module to reduce test dependencies

Author: wz1000

haskell-language-server.cabal

@@ -92,6 +92,12 @@ executable haskell-language-server
     Ide.Plugin.Pragmas
     Ide.Plugin.Retrie
     Ide.Plugin.StylishHaskell
+    Ide.LocalBindings
+    Ide.Plugin.Tactic
+    Ide.Plugin.Tactic.Types
+    Ide.Plugin.Tactic.Machinery
+    Ide.Plugin.Tactic.Tactics
+    Ide.TreeTransform
 
   ghc-options:
     -threaded -Wall -Wno-name-shadowing -Wredundant-constraints
@@ -142,6 +148,9 @@ executable haskell-language-server
     , time
     , transformers
     , unordered-containers
+    , ghc-source-gen
+    , refinery
+    , ghc-exactprint
 
   if flag(agpl)
     build-depends: brittany
@@ -230,7 +239,7 @@ test-suite func-test
     , tasty-golden
     , tasty-rerun
 
-  hs-source-dirs:     test/functional
+  hs-source-dirs:     test/functional plugins/default/src
   main-is:            Main.hs
   other-modules:
     Command
@@ -250,6 +259,8 @@ test-suite func-test
     Rename
     Symbol
     TypeDefinition
+    Tactic
+    Ide.Plugin.Tactic.Types
 
   ghc-options:
     -Wall -Wno-name-shadowing -threaded -rtsopts -with-rtsopts=-N

plugins/default/src/Ide/Plugin/Tactic.hs

@@ -36,6 +36,7 @@ import           Ide.LocalBindings (bindings, mostSpecificSpan, holify)
 import           Ide.Plugin (mkLspCommand)
 import           Ide.Plugin.Tactic.Machinery
 import           Ide.Plugin.Tactic.Tactics
+import           Ide.Plugin.Tactic.Types
 import           Ide.TreeTransform (transform, graft, useAnnotatedSource)
 import           Ide.Types
 import           Language.Haskell.LSP.Core (clientCapabilities)
@@ -60,23 +61,10 @@ tacticDesc :: T.Text -> T.Text
 tacticDesc name = "fill the hole using the " <> name <> " tactic"
 
 ------------------------------------------------------------------------------
--- | The list of tactics exposed to the outside world. These are attached to
--- actual tactics via 'commandTactic' and are contextually provided to the
--- editor via 'commandProvider'.
-data TacticCommand
-  = Auto
-  | Split
-  | Intro
-  | Intros
-  | Destruct
-  | Homomorphism
-  deriving (Eq, Ord, Show, Enum, Bounded)
-
 
 enabledTactics :: [TacticCommand]
 enabledTactics = [Intros, Destruct, Homomorphism]
 
-
 ------------------------------------------------------------------------------
 -- | A 'TacticProvider' is a way of giving context-sensitive actions to the LS
 -- UI.
@@ -94,18 +82,6 @@ tcCommandId c = coerce $ T.pack $ "tactics" <> show c <> "Command"
 tcCommandName :: TacticCommand -> T.Text
 tcCommandName = T.pack . show
 
-
-------------------------------------------------------------------------------
--- | Generate a title for the command.
-tacticTitle :: TacticCommand -> T.Text -> T.Text
-tacticTitle Auto _ = "Auto"
-tacticTitle Split _ = "Auto"
-tacticTitle Intro _ = "Intro"
-tacticTitle Intros _ = "Introduce lambda"
-tacticTitle Destruct var = "Case split on " <> var
-tacticTitle Homomorphism var = "Homomorphic case split on " <> var
-
-
 ------------------------------------------------------------------------------
 -- | Mapping from tactic commands to their contextual providers. See 'provide',
 -- 'filterGoalType' and 'filterBindingType' for the nitty gritty.

test/functional/Tactic.hs

@@ -22,7 +22,7 @@ import           Test.Hls.Util
 import           Test.Tasty
 import           Test.Tasty.HUnit
 import Data.Maybe (mapMaybe)
-import Ide.Plugin.Tactic (tacticTitle, TacticCommand (..))
+import Ide.Plugin.Tactic.Types (tacticTitle, TacticCommand (..))
 
 
 ------------------------------------------------------------------------------