Fix --testing (haskell#3113)

* Fix --testing Fix the --testing flag for HLS to correctly link the ghcide test plugin * fix ghcide options
sloorush · Sep 12, 2022 · efaca25 · efaca25
1 parent b2d7bab
commit efaca25
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/Ide/Main.hs b/src/Ide/Main.hs
@@ -122,16 +122,15 @@ runLspMode recorder ghcideArgs@GhcideArguments{..} idePlugins = withTelemetryLog
 
     -- exists so old-style logging works. intended to be phased out
     let logger = Logger $ \p m -> logger_ recorder (WithPriority p emptyCallStack $ LogOther m)
+        args = (if argsTesting then IDEMain.testing else IDEMain.defaultArguments)
+                    (cmapWithPrio LogIDEMain recorder) logger
 
-    IDEMain.defaultMain (cmapWithPrio LogIDEMain recorder) (IDEMain.defaultArguments (cmapWithPrio LogIDEMain recorder) logger)
+    IDEMain.defaultMain (cmapWithPrio LogIDEMain recorder) args
       { IDEMain.argCommand = argsCommand
-      , IDEMain.argsHlsPlugins = idePlugins
+      , IDEMain.argsHlsPlugins = IDEMain.argsHlsPlugins args <> idePlugins
       , IDEMain.argsLogger = pure logger <> pure telemetryLogger
       , IDEMain.argsThreads = if argsThreads == 0 then Nothing else Just $ fromIntegral argsThreads
-      , IDEMain.argsIdeOptions = \_config sessionLoader ->
-        let defOptions = Ghcide.defaultIdeOptions sessionLoader
-        in defOptions
-            { Ghcide.optShakeProfiling = argsShakeProfiling
-            , Ghcide.optTesting = Ghcide.IdeTesting argsTesting
-            }
+      , IDEMain.argsIdeOptions = \config sessionLoader ->
+        let defOptions = IDEMain.argsIdeOptions args config sessionLoader
+        in defOptions { Ghcide.optShakeProfiling = argsShakeProfiling }
       }