clean up more flags

Author: pepeiborra

ghcide/exe/Arguments.hs

@@ -7,13 +7,11 @@ import           Development.IDE.Main (Command (..), commandP)
 import           Options.Applicative
 
 data Arguments = Arguments
-    {argsCwd                   :: Maybe FilePath
-    ,argsVersion               :: Bool
+    {argsVersion               :: Bool
     ,argsVSCodeExtensionSchema :: Bool
     ,argsDefaultConfig         :: Bool
     ,argsShakeProfiling        :: Maybe FilePath
     ,argsOTMemoryProfiling     :: Bool
-    ,argsTesting               :: Bool
     ,argsThreads               :: Int
     ,argsVerbose               :: Bool
     ,argsCommand               :: Command
@@ -28,13 +26,11 @@ getArguments = execParser opts
 
 arguments :: Parser Arguments
 arguments = Arguments
-      <$> optional (strOption $ long "cwd" <> metavar "DIR" <> help "Change to this directory")
-      <*> switch (long "version" <> help "Show ghcide and GHC versions")
+      <$> switch (long "version" <> help "Show ghcide and GHC versions")
       <*> switch (long "vscode-extension-schema" <> help "Print generic config schema for plugins (used in the package.json of haskell vscode extension)")
       <*> switch (long "generate-default-config" <> help "Print config supported by the server with default values")
       <*> optional (strOption $ long "shake-profiling" <> metavar "DIR" <> help "Dump profiling reports to this directory")
       <*> switch (long "ot-memory-profiling" <> help "Record OpenTelemetry info to the eventlog. Needs the -l RTS flag to have an effect")
-      <*> switch (long "test" <> help "Enable additional lsp messages used by the testsuite")
       <*> option auto (short 'j' <> help "Number of threads (0: automatic)" <> metavar "NUM" <> value 0 <> showDefault)
       <*> switch (long "verbose" <> help "Include internal events in logging output")
       <*> (commandP <|> lspCommand <|> checkCommand)

ghcide/exe/Main.hs

@@ -8,7 +8,7 @@ module Main(main) where
 import           Arguments                         (Arguments (..),
                                                     getArguments)
 import           Control.Concurrent.Extra          (newLock, withLock)
-import           Control.Monad.Extra               (when, whenJust)
+import           Control.Monad.Extra               (when)
 import qualified Data.Aeson.Encode.Pretty          as A
 import           Data.Default                      (Default (def))
 import           Data.List.Extra                   (upper)
@@ -20,16 +20,15 @@ import           Data.Version                      (showVersion)
 import           Development.GitRev                (gitHash)
 import           Development.IDE                   (Logger (Logger),
                                                     Priority (Info))
+import           Development.IDE.Graph             (ShakeOptions (shakeThreads))
 import qualified Development.IDE.Main              as Main
 import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
 import           Development.IDE.Types.Options
-import           Development.IDE.Graph                 (ShakeOptions (shakeThreads))
 import           Ide.Plugin.Config                 (Config (checkParents, checkProject))
 import           Ide.Plugin.ConfigUtils            (pluginsToDefaultConfig,
                                                     pluginsToVSCodeExtensionSchema)
 import           Ide.PluginUtils                   (pluginDescToIdePlugins)
 import           Paths_ghcide                      (version)
-import qualified System.Directory.Extra            as IO
 import           System.Environment                (getExecutablePath)
 import           System.Exit                       (exitSuccess)
 import           System.IO                         (hPutStrLn, stderr)
@@ -65,8 +64,6 @@ main = do
       LT.putStrLn $ decodeUtf8 $ A.encodePretty $ pluginsToDefaultConfig hlsPlugins
       exitSuccess
 
-    whenJust argsCwd IO.setCurrentDirectory
-
     -- lock to avoid overlapping output on stdout
     lock <- newLock
     let logger = Logger $ \pri msg -> when (pri >= logLevel) $ withLock lock $
@@ -81,7 +78,6 @@ main = do
             in defOptions
                 { optShakeProfiling = argsShakeProfiling
                 , optOTMemoryProfiling = IdeOTMemoryProfiling argsOTMemoryProfiling
-                , optTesting = IdeTesting argsTesting
                 , optShakeOptions = (optShakeOptions defOptions){shakeThreads = argsThreads}
                 , optCheckParents = pure $ checkParents config
                 , optCheckProject = pure $ checkProject config