Merge pull request #1489 from haskell/remove-json-stdio-2

lukel97 · web-flow · commit 23892caddeb6 · 2019-12-22T16:30:09.000Z
Remove JSON transport
diff --git a/app/HieWrapper.hs b/app/HieWrapper.hs
@@ -13,7 +13,7 @@ import           HIE.Bios
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.Cradle (findLocalCradle)
 import           Haskell.Ide.Engine.Options
-import           Haskell.Ide.Engine.Plugin.Base
+import           Haskell.Ide.Engine.Version
 import qualified Language.Haskell.LSP.Core             as Core
 import           Options.Applicative.Simple
 import qualified Paths_haskell_ide_engine              as Meta
@@ -44,7 +44,7 @@ main = do
     -- Parse the options and run
     (global, ()) <-
         simpleOptions
-            version
+            hieVersion
             "hie-wrapper - Launch the appropriate haskell-ide-engine for a given project"
             ""
             (numericVersion <*> compiler <*> globalOptsParser)
@@ -68,7 +68,7 @@ run opts = do
 
 
   progName <- getProgName
-  logm $  "run entered for hie-wrapper(" ++ progName ++ ") " ++ version
+  logm $  "run entered for hie-wrapper(" ++ progName ++ ") " ++ hieVersion
   d <- getCurrentDirectory
   logm $ "Current directory:" ++ d
   logm $ "Operating system:" ++ os
diff --git a/app/MainHie.hs b/app/MainHie.hs
@@ -9,8 +9,8 @@ import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.Options
 import           Haskell.Ide.Engine.Scheduler
-import           Haskell.Ide.Engine.Transport.LspStdio
-import           Haskell.Ide.Engine.Transport.JsonStdio
+import           Haskell.Ide.Engine.Server
+import           Haskell.Ide.Engine.Version
 import qualified Language.Haskell.LSP.Core             as Core
 import           Options.Applicative.Simple
 import qualified Paths_haskell_ide_engine              as Meta
@@ -24,14 +24,12 @@ import           System.IO
 -- plugins
 
 import           Haskell.Ide.Engine.Plugin.ApplyRefact
-import           Haskell.Ide.Engine.Plugin.Base
 import           Haskell.Ide.Engine.Plugin.Brittany
 import           Haskell.Ide.Engine.Plugin.Example2
 import           Haskell.Ide.Engine.Plugin.Bios
 -- import           Haskell.Ide.Engine.Plugin.HaRe
 import           Haskell.Ide.Engine.Plugin.Haddock
 import           Haskell.Ide.Engine.Plugin.HfaAlign
-import           Haskell.Ide.Engine.Plugin.Hoogle
 import           Haskell.Ide.Engine.Plugin.HsImport
 import           Haskell.Ide.Engine.Plugin.Liquid
 import           Haskell.Ide.Engine.Plugin.Package
@@ -50,11 +48,9 @@ plugins includeExamples = pluginDescToIdePlugins allPlugins
                    else basePlugins
     basePlugins =
       [ applyRefactDescriptor "applyrefact"
-      , baseDescriptor        "base"
       , brittanyDescriptor    "brittany"
       , haddockDescriptor     "haddock"
       -- , hareDescriptor        "hare"
-      , hoogleDescriptor      "hoogle"
       , hsimportDescriptor    "hsimport"
       , liquidDescriptor      "liquid"
       , packageDescriptor     "package"
@@ -88,7 +84,7 @@ main = do
     -- Parse the options and run
     (global, ()) <-
         simpleOptions
-            version
+            hieVersion
             "haskell-ide-engine - Provide a common engine to power any Haskell IDE"
             ""
             (numericVersion <*> compiler <*> globalOptsParser)
@@ -114,7 +110,7 @@ run opts = do
   maybe (pure ()) setCurrentDirectory $ projectRoot opts
 
   progName <- getProgName
-  logm $  "Run entered for HIE(" ++ progName ++ ") " ++ version
+  logm $  "Run entered for HIE(" ++ progName ++ ") " ++ hieVersion
   logm $ "Current directory:" ++ origDir
   args <- getArgs
   logm $ "args:" ++ show args
@@ -132,9 +128,5 @@ run opts = do
   let plugins' = plugins (optExamplePlugin opts)
 
   -- launch the dispatcher.
-  if optJson opts then do
-    scheduler <- newScheduler plugins' initOpts
-    jsonStdioTransport scheduler
-  else do
-    scheduler <- newScheduler plugins' initOpts
-    lspStdioTransport scheduler origDir plugins' (optCaptureFile opts)
+  scheduler <- newScheduler plugins' initOpts
+  server scheduler origDir plugins' (optCaptureFile opts)
diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal
@@ -20,10 +20,9 @@ flag pedantic
 library
   hs-source-dirs:      src
   exposed-modules:     Haskell.Ide.Engine.Channel
-                       Haskell.Ide.Engine.LSP.CodeActions
-                       Haskell.Ide.Engine.LSP.Completions
-                       Haskell.Ide.Engine.Plugin.Base
-                       Haskell.Ide.Engine.LSP.Reactor
+                       Haskell.Ide.Engine.CodeActions
+                       Haskell.Ide.Engine.Completions
+                       Haskell.Ide.Engine.Reactor
                        Haskell.Ide.Engine.Options
                        Haskell.Ide.Engine.Plugin.ApplyRefact
                        Haskell.Ide.Engine.Plugin.Brittany
@@ -33,7 +32,6 @@ library
                        -- Haskell.Ide.Engine.Plugin.HaRe
                        Haskell.Ide.Engine.Plugin.Haddock
                        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
@@ -42,11 +40,12 @@ library
                        Haskell.Ide.Engine.Plugin.Generic
                        Haskell.Ide.Engine.Scheduler
                        Haskell.Ide.Engine.Support.FromHaRe
+                       Haskell.Ide.Engine.Support.Hoogle
                        Haskell.Ide.Engine.Support.Fuzzy
                        Haskell.Ide.Engine.Support.HieExtras
-                       Haskell.Ide.Engine.Transport.JsonStdio
-                       Haskell.Ide.Engine.Transport.LspStdio
+                       Haskell.Ide.Engine.Server
                        Haskell.Ide.Engine.Types
+                       Haskell.Ide.Engine.Version
   other-modules:       Paths_haskell_ide_engine
   build-depends:       Cabal >= 1.22
                      , Diff
diff --git a/src/Haskell/Ide/Engine/CodeActions.hs b/src/Haskell/Ide/Engine/CodeActions.hs
@@ -3,15 +3,15 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE FlexibleContexts      #-}
-module Haskell.Ide.Engine.LSP.CodeActions where
+module Haskell.Ide.Engine.CodeActions where
 
 import Control.Lens
 import Control.Monad.Reader
 import qualified Data.Aeson as J
 import Data.Maybe
 import Data.Foldable
 import qualified GHC.Generics as G
-import Haskell.Ide.Engine.LSP.Reactor
+import Haskell.Ide.Engine.Reactor
 import Haskell.Ide.Engine.Types
 import qualified Language.Haskell.LSP.Core as Core
 import qualified Language.Haskell.LSP.Types as J
diff --git a/src/Haskell/Ide/Engine/Completions.hs b/src/Haskell/Ide/Engine/Completions.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveGeneric       #-}
 {-# LANGUAGE NamedFieldPuns      #-}
 {-# LANGUAGE OverloadedStrings      #-}
-module Haskell.Ide.Engine.LSP.Completions
+module Haskell.Ide.Engine.Completions
   ( WithSnippets(..)
   , getCompletions
   , resolveCompletion
@@ -48,7 +48,7 @@ import qualified Language.Haskell.LSP.Types.Lens
                                                as J
 import qualified Haskell.Ide.Engine.Support.Fuzzy
                                                as Fuzzy
-import qualified Haskell.Ide.Engine.Plugin.Hoogle
+import qualified Haskell.Ide.Engine.Support.Hoogle
                                                as Hoogle
 import qualified Language.Haskell.LSP.VFS      as VFS
 
@@ -102,7 +102,7 @@ resolveCompletion :: WithSnippets -> J.CompletionItem -> IdeM J.CompletionItem
 resolveCompletion withSnippets origCompl =
   case fromJSON <$> origCompl ^. J.xdata of
     Just (J.Success compdata) -> do
-      mdocs <- Hoogle.infoCmd' $ hoogleQuery compdata
+      mdocs <- Hoogle.info $ hoogleQuery compdata
       let docText = case mdocs of
             Right x -> Just x
             _ -> Nothing
diff --git a/src/Haskell/Ide/Engine/Options.hs b/src/Haskell/Ide/Engine/Options.hs
@@ -6,8 +6,6 @@ import           Options.Applicative.Simple
 data GlobalOpts = GlobalOpts
   { optDebugOn       :: Bool
   , optLogFile       :: Maybe String
-  , optLsp           :: Bool
-  , optJson          :: Bool
   , projectRoot      :: Maybe String
   , optBiosVerbose   :: Bool
   , optCaptureFile   :: Maybe FilePath
@@ -27,12 +25,6 @@ globalOptsParser = GlobalOpts
       <> metavar "LOGFILE"
       <> help "File to log to, defaults to stdout"
        ))
-  <*> flag True True
-       ( long "lsp"
-       <> help "Enable the Language Server Protocol transport on STDIO (default)")
-  <*> switch
-       ( long "json"
-       <> help "Enable JSON transport on STDIO")
   <*> optional (strOption
        ( long "project-root"
       <> short 'r'
diff --git a/src/Haskell/Ide/Engine/Plugin/Haddock.hs b/src/Haskell/Ide/Engine/Plugin/Haddock.hs
@@ -17,7 +17,7 @@ import           GHC
 import           GhcMonad
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes
-import qualified Haskell.Ide.Engine.Plugin.Hoogle             as Hoogle
+import qualified Haskell.Ide.Engine.Support.Hoogle             as Hoogle
 import           Haskell.Ide.Engine.PluginUtils
 import           Haskell.Ide.Engine.Support.HieExtras
 import           HscTypes
diff --git a/src/Haskell/Ide/Engine/Plugin/HsImport.hs b/src/Haskell/Ide/Engine/Plugin/HsImport.hs
@@ -22,7 +22,7 @@ import qualified Haskell.Ide.Engine.Support.HieExtras as Hie
 import qualified Language.Haskell.LSP.Types      as J
 import qualified Language.Haskell.LSP.Types.Lens as J
 import           Haskell.Ide.Engine.PluginUtils
-import qualified Haskell.Ide.Engine.Plugin.Hoogle
+import qualified Haskell.Ide.Engine.Support.Hoogle
                                                as Hoogle
 import           System.Directory
 import           System.IO
diff --git a/src/Haskell/Ide/Engine/Plugin/Liquid.hs b/src/Haskell/Ide/Engine/Plugin/Liquid.hs
@@ -35,10 +35,7 @@ liquidDescriptor plId = PluginDescriptor
   { pluginId = plId
   , pluginName = "Liquid Haskell"
   , pluginDesc = "Integration with Liquid Haskell"
-  , pluginCommands =
-      [ PluginCommand "sayHello"   "say hello"                        sayHelloCmd
-      , PluginCommand "sayHelloTo" "say hello to the passed in param" sayHelloToCmd
-      ]
+  , pluginCommands = []
   , pluginCodeActionProvider = Nothing
   , pluginDiagnosticProvider = Just (DiagnosticProvider
                                     (S.singleton DiagnosticOnSave)
@@ -50,24 +47,6 @@ liquidDescriptor plId = PluginDescriptor
 
 -- ---------------------------------------------------------------------
 
-sayHelloCmd :: CommandFunc () T.Text
-sayHelloCmd = CmdSync $ \_ -> return (IdeResultOk sayHello)
-
-sayHelloToCmd :: CommandFunc T.Text T.Text
-sayHelloToCmd = CmdSync $ \n -> do
-  r <- liftIO $ sayHelloTo n
-  return $ IdeResultOk r
-
--- ---------------------------------------------------------------------
-
-sayHello :: T.Text
-sayHello = "hello from ExamplePlugin2"
-
-sayHelloTo :: T.Text -> IO T.Text
-sayHelloTo n = return $ "hello " <> n <> " from ExamplePlugin2"
-
--- ---------------------------------------------------------------------
-
 data LiquidJson
   = LJ
     { status :: T.Text
diff --git a/src/Haskell/Ide/Engine/Plugin/Package.hs b/src/Haskell/Ide/Engine/Plugin/Package.hs
@@ -7,7 +7,7 @@
 module Haskell.Ide.Engine.Plugin.Package where
 
 import           Haskell.Ide.Engine.MonadTypes
-import qualified Haskell.Ide.Engine.Plugin.Hoogle as Hoogle
+import qualified Haskell.Ide.Engine.Support.Hoogle as Hoogle
 import           Haskell.Ide.Engine.PluginUtils
 import           Haskell.Ide.Engine.Support.HieExtras as Hie
 import           GHC.Generics
diff --git a/src/Haskell/Ide/Engine/Reactor.hs b/src/Haskell/Ide/Engine/Reactor.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE FlexibleInstances     #-}
-module Haskell.Ide.Engine.LSP.Reactor
+module Haskell.Ide.Engine.Reactor
   ( R
   , runReactor
   , reactorSend
diff --git a/src/Haskell/Ide/Engine/Server.hs b/src/Haskell/Ide/Engine/Server.hs
@@ -10,9 +10,9 @@
 {-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE PartialTypeSignatures #-}
 
-module Haskell.Ide.Engine.Transport.LspStdio
+module Haskell.Ide.Engine.Server
   (
-    lspStdioTransport
+    server
   ) where
 
 import           Control.Concurrent
@@ -41,20 +41,20 @@ import qualified Data.Yaml as Yaml
 import           Haskell.Ide.Engine.Cradle (findLocalCradle, cradleDisplay)
 import           Haskell.Ide.Engine.Config
 import qualified Haskell.Ide.Engine.Ghc   as HIE
-import           Haskell.Ide.Engine.LSP.CodeActions
-import qualified Haskell.Ide.Engine.LSP.Completions      as Completions
-import           Haskell.Ide.Engine.LSP.Reactor
+import           Haskell.Ide.Engine.CodeActions
+import qualified Haskell.Ide.Engine.Completions      as Completions
+import           Haskell.Ide.Engine.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.HaRe          as HaRe
-import qualified Haskell.Ide.Engine.Plugin.Hoogle        as Hoogle
+import qualified Haskell.Ide.Engine.Support.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 qualified Haskell.Ide.Engine.Plugin.Bios          as BIOS
+import           Haskell.Ide.Engine.Version
 import qualified Language.Haskell.LSP.Control            as CTRL
 import qualified Language.Haskell.LSP.Core               as Core
 import           Language.Haskell.LSP.Diagnostics
@@ -76,13 +76,13 @@ import GHC.Conc
 {-# ANN module ("hlint: ignore Use tuple-section" :: String) #-}
 -- ---------------------------------------------------------------------
 
-lspStdioTransport
+server
   :: Scheduler.Scheduler R
   -> FilePath
   -> IdePlugins
   -> Maybe FilePath
   -> IO ()
-lspStdioTransport scheduler origDir plugins captureFp = do
+server scheduler origDir plugins captureFp = do
   run scheduler origDir plugins captureFp >>= \case
     0 -> exitSuccess
     c -> exitWith . ExitFailure $ c
@@ -395,7 +395,7 @@ reactor inp diagIn = do
             reactorSend $ ReqRegisterCapability $ fmServerRegisterCapabilityRequest rid registrations
 
           reactorSend $ NotLogMessage $
-                  fmServerLogMessageNotification J.MtLog $ "Using hie version: " <> T.pack version
+                  fmServerLogMessageNotification J.MtLog $ "Using hie version: " <> T.pack hieVersion
 
           lspRootDir <- asksLspFuncs Core.rootPath
           currentDir <- liftIO getCurrentDirectory
diff --git a/src/Haskell/Ide/Engine/Support/Hoogle.hs b/src/Haskell/Ide/Engine/Support/Hoogle.hs
diff --git a/src/Haskell/Ide/Engine/Transport/JsonStdio.hs b/src/Haskell/Ide/Engine/Transport/JsonStdio.hs
diff --git a/src/Haskell/Ide/Engine/Version.hs b/src/Haskell/Ide/Engine/Version.hs
diff --git a/test/dispatcher/Main.hs b/test/dispatcher/Main.hs
diff --git a/test/unit/HooglePluginSpec.hs b/test/unit/HooglePluginSpec.hs
diff --git a/test/wrapper/HieWrapper.hs b/test/wrapper/HieWrapper.hs
