Move Development.IDE.Session into ghcide itself

Sublibraries do not seem to play well. Hide this behind the ghc-lib flag
so that the Haskell specific hie-bios stuff can be disabled

Author: lukel97

.hlint.yaml

@@ -84,6 +84,7 @@
     - Development.IDE.GHC.Util
     - Development.IDE.Import.FindImports
     - Development.IDE.LSP.Outline
+    - Development.IDE.Session
     - Development.IDE.Spans.Calculate
     - Development.IDE.Spans.Documentation
     - Development.IDE.Spans.Common

ghcide.cabal

@@ -1,4 +1,4 @@
-cabal-version:      3.0
+cabal-version:      1.20
 build-type:         Simple
 category:           Development
 name:               ghcide
@@ -79,7 +79,14 @@ library
       build-depends:
         ghc-boot-th,
         ghc-boot,
-        ghc >= 8.4
+        ghc >= 8.4,
+        -- These dependencies are used by Development.IDE.Session and are
+        -- Haskell specific. So don't use them when building with -fghc-lib!
+        ghc-check,
+        ghc-paths,
+        cryptohash-sha1 >=0.11.100 && <0.12,
+        hie-bios == 0.6.*,
+        base16-bytestring >=0.1.1 && <0.2
     if os(windows)
       build-depends:
         Win32
@@ -127,6 +134,7 @@ library
         Development.IDE.LSP.Outline
         Development.IDE.LSP.Protocol
         Development.IDE.LSP.Server
+        Development.IDE.Session
         Development.IDE.Spans.Common
         Development.IDE.Types.Diagnostics
         Development.IDE.Types.Location
@@ -167,41 +175,6 @@ library
         Development.IDE.GHC.HieBin
     ghc-options: -Wall -Wno-name-shadowing
 
-library ghcide-session-loader
-    visibility: public
-    default-language: Haskell2010
-    hs-source-dirs: session-loader
-    exposed-modules:
-        Development.IDE.Session
-    ghc-options: -Wall -Wno-name-shadowing
-    build-depends:
-        base == 4.*,
-        aeson,
-        async,
-        base16-bytestring >=0.1.1 && <0.2,
-        bytestring,
-        containers,
-        cryptohash-sha1 >=0.11.100 && <0.12,
-        directory,
-        extra,
-        filepath,
-        ghc,
-        ghc-check,
-        ghc-paths,
-        ghcide,
-        haskell-lsp,
-        haskell-lsp-types,
-        hie-bios >= 0.6.0 && < 0.7,
-        safe-exceptions,
-        shake,
-        text,
-        time,
-        unordered-containers
-    -- We can't build this with ghc-lib since it interfaces with hie-bios which
-    -- uses plain ghc types
-    if flag(ghc-lib)
-        buildable: False
-
 executable ghcide-test-preprocessor
     default-language: Haskell2010
     hs-source-dirs: test/preprocessor
@@ -269,7 +242,6 @@ executable ghcide
         directory,
         extra,
         filepath,
-        ghcide-session-loader,
         gitrev,
         hashable,
         haskell-lsp,

hie.yaml

@@ -10,8 +10,6 @@ cradle:
               component: "ghcide:lib:ghcide"
             - path: "./exe"
               component: "ghcide:exe:ghcide"
-            - path: "./session-loader"
-              component: "ghcide:lib:ghcide-session-loader"
             - path: "./test"
               component: "ghcide:test:ghcide-tests"
             - path: "./bench"

session-loader/Development/IDE/Session.hs renamed to src/Development/IDE/Session.hs

@@ -1,16 +1,21 @@
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE CPP #-}
 
 {-|
 The logic for setting up a ghcide session by tapping into hie-bios.
 -}
-module Development.IDE.Session (loadSession) where
+module Development.IDE.Session
+#ifndef GHC_LIB
+(loadSession)
+#endif
+where
+
+
+-- Unfortunately, we cannot use loadSession with ghc-lib since hie-bios uses
+-- the real GHC library and the types are incompatible. Furthermore, when
+-- building with ghc-lib we need to make this Haskell agnostic, so no hie-bios!
+#ifndef GHC_LIB
 
 import Control.Concurrent.Async
 import Control.Concurrent.Extra
@@ -643,3 +648,5 @@ showPackageSetupException (PackageCheckFailed BasePackageAbiMismatch{..}) = unwo
 renderPackageSetupException :: FilePath -> PackageSetupException -> (NormalizedFilePath, ShowDiagnostic, Diagnostic)
 renderPackageSetupException fp e =
     ideErrorWithSource (Just "cradle") (Just DsError) (toNormalizedFilePath' fp) (T.pack $ showPackageSetupException e)
+
+#endif