Invert the dependency between hls-plugin-api and ghcide

haskell · Dec 27, 2020 · a335fbf · a335fbf
1 parent 38151a0
commit a335fbf
Show file tree

Hide file tree

Showing 13 changed files with 164 additions and 920 deletions.
diff --git a/ghcide b/ghcide
diff --git a/hls-plugin-api/hls-plugin-api.cabal b/hls-plugin-api/hls-plugin-api.cabal
@@ -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)

diff --git a/hls-plugin-api/src/Ide/Logger.hs b/hls-plugin-api/src/Ide/Logger.hs
@@ -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