Invert the dependency between hls-plugin-api and ghcide

Author: pepeiborra

exe/Plugins.hs

@@ -3,12 +3,13 @@
 module Plugins where
 
 import           Ide.Types                 (IdePlugins)
-import           Ide.Plugin                (pluginDescToIdePlugins)
+import           Ide.PluginUtils           (pluginDescToIdePlugins)
 
 -- fixed plugins
 import           Ide.Plugin.Example        as Example
 import           Ide.Plugin.Example2       as Example2
-import           Ide.Plugin.GhcIde         as GhcIde
+import           Development.IDE           (IdeState)
+import           Development.IDE.Plugin.GhcIde as GhcIde
 
 -- haskell-language-server optional plugins
 
@@ -73,7 +74,7 @@ import           Ide.Plugin.Brittany       as Brittany
 -- These can be freely added or removed to tailor the available
 -- features of the server.
 
-idePlugins :: Bool -> IdePlugins
+idePlugins :: Bool -> IdePlugins IdeState
 idePlugins includeExamples = pluginDescToIdePlugins allPlugins
   where
     allPlugins = if includeExamples

ghcide

@@ -26,10 +26,7 @@ source-repository head
 library
   exposed-modules:
     Ide.Logger
-    Ide.Plugin
     Ide.Plugin.Config
-    Ide.Plugin.Formatter
-    Ide.Plugin.GhcIde
     Ide.PluginUtils
     Ide.Types
 
@@ -40,9 +37,6 @@ library
     , containers
     , data-default
     , Diff
-    , ghc
-    , ghc-boot-th
-    , ghcide                >=0.5
     , haskell-lsp           ^>=0.22
     , hashable
     , hslogger
@@ -53,6 +47,13 @@ library
     , text
     , unordered-containers
 
+  if os(windows)
+      build-depends:
+        Win32
+  else
+      build-depends:
+        unix
+
   ghc-options:      -Wall -Wredundant-constraints -Wno-name-shadowing
 
   if flag(pedantic)

hls-plugin-api/hls-plugin-api.cabal

@@ -3,31 +3,17 @@
 -}
 module Ide.Logger
   (
-    hlsLogger
-  , logm
+    logm
   , debugm
   , warningm
   , errorm
   ) where
 
 import           Control.Monad.IO.Class
-import qualified Data.Text as T
-import qualified Development.IDE.Types.Logger as L
 import           System.Log.Logger
 
 -- ---------------------------------------------------------------------
 
-hlsLogger :: L.Logger
-hlsLogger = L.Logger $ \pri txt ->
-    case pri of
-      L.Telemetry -> logm     (T.unpack txt)
-      L.Debug     -> debugm   (T.unpack txt)
-      L.Info      -> logm     (T.unpack txt)
-      L.Warning   -> warningm (T.unpack txt)
-      L.Error     -> errorm   (T.unpack txt)
-
--- ---------------------------------------------------------------------
-
 logm :: MonadIO m => String -> m ()
 logm s = liftIO $ infoM "hls" s