Add hls-graph abstracting over shake (#1748)

* Add a new project hls-graph, shadowing Shake and reexporting it

* Make hls-graph use explicit exports rather than module-level exports

* Cut down on what hls-graph exports

Delete unnecesssary hiding

Author: ndmitchell

cabal.project

@@ -2,6 +2,7 @@ packages:
          ./
          ./hie-compat
          ./shake-bench
+         ./hls-graph
          ./ghcide
          ./hls-plugin-api
          ./hls-test-utils

ghcide/exe/Main.hs

@@ -26,7 +26,7 @@ import qualified Development.IDE.Main              as Main
 import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
 import qualified Development.IDE.Plugin.Test       as Test
 import           Development.IDE.Types.Options
-import           Development.Shake                 (ShakeOptions (shakeThreads))
+import           Development.IDE.Graph                 (ShakeOptions (shakeThreads))
 import           Ide.Plugin.Config                 (Config (checkParents, checkProject))
 import           Ide.Plugin.ConfigUtils            (pluginsToDefaultConfig,
                                                     pluginsToVSCodeExtensionSchema)
@@ -109,4 +109,3 @@ main = do
                 , optCheckProject = pure $ checkProject config
                 }
         }
-

ghcide/ghcide.cabal

@@ -74,7 +74,7 @@ library
         rope-utf16-splay,
         safe,
         safe-exceptions,
-        shake >= 0.18.4,
+        hls-graph,
         sorted-list,
         sqlite-simple,
         stm,
@@ -288,7 +288,7 @@ executable ghcide
         ghcide,
         lens,
         optparse-applicative,
-        shake,
+        hls-graph,
         text,
         unordered-containers,
         aeson-pretty
@@ -358,6 +358,7 @@ test-suite ghcide-tests
         safe,
         safe-exceptions,
         shake,
+        hls-graph,
         tasty,
         tasty-expected-failure,
         tasty-hunit,
@@ -410,6 +411,7 @@ executable ghcide-bench
         optparse-applicative,
         process,
         safe-exceptions,
+        hls-graph,
         shake,
         text
     hs-source-dirs: bench/lib bench/exe

ghcide/session-loader/Development/IDE/Session.hs

@@ -56,7 +56,7 @@ import           Development.IDE.Types.HscEnvEq       (HscEnvEq, newHscEnvEq,
 import           Development.IDE.Types.Location
 import           Development.IDE.Types.Logger
 import           Development.IDE.Types.Options
-import           Development.Shake                    (Action)
+import           Development.IDE.Graph                    (Action)
 import           GHC.Check
 import qualified HIE.Bios                             as HieBios
 import           HIE.Bios.Environment                 hiding (getCacheDir)

ghcide/src/Development/IDE.hs

@@ -51,5 +51,5 @@ import           Development.IDE.Types.HscEnvEq        as X (HscEnvEq (..),
                                                              hscEnvWithImportPaths)
 import           Development.IDE.Types.Location        as X
 import           Development.IDE.Types.Logger          as X
-import           Development.Shake                     as X (Action, RuleResult,
+import           Development.IDE.Graph                     as X (Action, RuleResult,
                                                              Rules, action)

ghcide/src/Development/IDE/Core/Actions.hs

@@ -30,7 +30,7 @@ import           Development.IDE.GHC.Compat           hiding (TargetFile,
                                                        writeHieFile)
 import qualified Development.IDE.Spans.AtPoint        as AtPoint
 import           Development.IDE.Types.Location
-import           Development.Shake                    hiding (Diagnostic)
+import           Development.IDE.Graph
 import qualified HieDb
 import           Language.LSP.Types                   (DocumentHighlight (..),
                                                        SymbolInformation (..))

ghcide/src/Development/IDE/Core/FileExists.hs

@@ -24,7 +24,7 @@ import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Shake
 import           Development.IDE.Types.Location
 import           Development.IDE.Types.Options
-import           Development.Shake
+import           Development.IDE.Graph
 import           Language.LSP.Server                   hiding (getVirtualFile)
 import           Language.LSP.Types
 import           Language.LSP.Types.Capabilities

ghcide/src/Development/IDE/Core/FileStore.hs

@@ -46,7 +46,7 @@ import           Development.IDE.Import.DependencyInformation
 import           Development.IDE.Types.Diagnostics
 import           Development.IDE.Types.Location
 import           Development.IDE.Types.Options
-import           Development.Shake
+import           Development.IDE.Graph
 import           HieDb.Create                                 (deleteMissingRealFiles)
 import           Ide.Plugin.Config                            (CheckParents (..))
 import           System.IO.Error

ghcide/src/Development/IDE/Core/IdeConfiguration.hs

@@ -21,7 +21,7 @@ import           Data.Hashable                  (Hashed, hashed, unhashed)
 import           Data.Text                      (Text, isPrefixOf)
 import           Development.IDE.Core.Shake
 import           Development.IDE.Types.Location
-import           Development.Shake
+import           Development.IDE.Graph
 import           Language.LSP.Types
 import           System.FilePath                (isRelative)
 

ghcide/src/Development/IDE/Core/OfInterest.hs

@@ -24,7 +24,7 @@ import qualified Data.HashMap.Strict                          as HashMap
 import           Data.Hashable
 import qualified Data.Text                                    as T
 import           Data.Typeable
-import           Development.Shake
+import           Development.IDE.Graph
 import           GHC.Generics
 
 import           Control.Monad.Trans.Class
@@ -117,4 +117,3 @@ kick = do
     void $ liftIO $ modifyVar' exportsMap $ (exportsMap'' <>) . (exportsMap' <>)
 
     liftIO $ progressUpdate KickCompleted
-