Rebase to current ghcide master

Author: alanz

exe/Main.hs

@@ -160,12 +160,16 @@ main = do
             let options = (defaultIdeOptions $ loadSession dir)
                     { optReportProgress = clientSupportsProgress caps
                     , optShakeProfiling = argsShakeProfiling
-                    , optTesting        = IdeTesting argsTesting
+                    , optTesting        = argsTesting
                     }
             debouncer <- newAsyncDebouncer
             initialise caps (cradleRules >> mainRule >> pluginRules plugins >> action kick)
                 getLspId event hlsLogger debouncer options vfs
     else do
+        -- GHC produces messages with UTF8 in them, so make sure the terminal doesn't error
+        hSetEncoding stdout utf8
+        hSetEncoding stderr utf8
+
         putStrLn $ "(haskell-language-server)Ghcide setup tester in " ++ dir ++ "."
         putStrLn "Report bugs at https://github.com/haskell/haskell-language-server/issues"
 

exe/Rules.hs

@@ -19,9 +19,11 @@ import           Data.Functor                   ((<&>))
 import           Data.Maybe                     (fromMaybe)
 import           Data.Text                      (Text)
 import           Development.IDE.Core.Rules     (defineNoFile)
-import           Development.IDE.Core.Shake     (ShakeExtras(ShakeExtras,isTesting), getShakeExtras, sendEvent, define, useNoFile_)
+import           Development.IDE.Core.Service   (getIdeOptions)
+import           Development.IDE.Core.Shake     (sendEvent, define, useNoFile_)
 import           Development.IDE.GHC.Util
 import           Development.IDE.Types.Location (fromNormalizedFilePath)
+import           Development.IDE.Types.Options  (IdeOptions(IdeOptions, optTesting))
 import           Development.Shake
 import           DynFlags                       (gopt_set, gopt_unset,
                                                  updOptLevel)
@@ -63,13 +65,13 @@ cradleToSession :: Rules ()
 cradleToSession = define $ \LoadCradle nfp -> do
     let f = fromNormalizedFilePath nfp
 
-    ShakeExtras{isTesting} <- getShakeExtras
+    IdeOptions{optTesting} <- getIdeOptions
 
     -- If the path points to a directory, load the implicit cradle
     mbYaml <- doesDirectoryExist f <&> \isDir -> if isDir then Nothing else Just f
     cradle <- liftIO $  maybe (loadImplicitCradle $ addTrailingPathSeparator f) loadCradle mbYaml
 
-    when isTesting $
+    when optTesting $
         sendEvent $ notifyCradleLoaded f
 
     cmpOpts <- liftIO $ getComponentOptions cradle