Add hls-graph abstracting over shake

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
-

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

@@ -28,7 +28,7 @@ import           Development.IDE.GHC.Util
 import           Development.IDE.Import.DependencyInformation
 import           Development.IDE.Types.HscEnvEq               (HscEnvEq)
 import           Development.IDE.Types.KnownTargets
-import           Development.Shake
+import           Development.IDE.Graph
 import           GHC.Generics                                 (Generic)
 
 import           HscTypes                                     (HomeModInfo,

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

@@ -123,9 +123,8 @@ import           Development.IDE.Types.HscEnvEq
 import           Development.IDE.Types.Location
 import qualified Development.IDE.Types.Logger                 as L
 import           Development.IDE.Types.Options
-import           Development.Shake                            hiding
-                                                              (Diagnostic)
-import           Development.Shake.Classes                    hiding (get, put)
+import           Development.IDE.Graph
+import           Development.IDE.Graph.Classes                    hiding (get, put)
 import           Fingerprint
 import           GHC.Generics                                 (Generic)
 import           GHC.IO.Encoding

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

@@ -23,7 +23,7 @@ import           Development.IDE.Core.FileExists (fileExistsRules)
 import           Development.IDE.Core.OfInterest
 import           Development.IDE.Types.Logger    as Logger
 import           Development.IDE.Types.Options   (IdeOptions (..))
-import           Development.Shake
+import           Development.IDE.Graph
 import           Ide.Plugin.Config
 import qualified Language.LSP.Server             as LSP
 import qualified Language.LSP.Types              as LSP

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

@@ -119,12 +119,11 @@ import           Development.IDE.Types.Logger         hiding (Priority)
 import qualified Development.IDE.Types.Logger         as Logger
 import           Development.IDE.Types.Options
 import           Development.IDE.Types.Shake
-import           Development.Shake                    hiding (Info, ShakeValue,
-                                                       doesFileExist)
-import qualified Development.Shake                    as Shake
-import           Development.Shake.Classes
-import           Development.Shake.Database
-import           Development.Shake.Rule
+import           Development.IDE.Graph                    hiding (ShakeValue)
+import qualified Development.IDE.Graph                    as Shake
+import           Development.IDE.Graph.Classes
+import           Development.IDE.Graph.Database
+import           Development.IDE.Graph.Rule
 import           GHC.Generics
 import           Language.LSP.Diagnostics
 import qualified Language.LSP.Server                  as LSP

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

@@ -38,7 +38,7 @@ import           Development.IDE.Types.Logger   (Logger, logDebug, logInfo)
 import           Development.IDE.Types.Shake    (Key (..), Value,
                                                  ValueWithDiagnostics (..),
                                                  Values)
-import           Development.Shake              (Action, actionBracket)
+import           Development.IDE.Graph              (Action, actionBracket)
 import           Foreign.Storable               (Storable (sizeOf))
 import           HeapSize                       (recursiveSize, runHeapsize)
 import           Ide.PluginUtils                (installSigUsr1Handler)
@@ -230,4 +230,3 @@ repeatUntilJust nattempts action = do
     case res of
         Nothing -> repeatUntilJust (nattempts-1) action
         Just{}  -> return res
-

ghcide/src/Development/IDE/GHC/ExactPrint.hs

@@ -50,8 +50,8 @@ import Development.IDE.Core.Service (runAction)
 import Development.IDE.Core.Shake
 import Development.IDE.GHC.Compat hiding (parseExpr)
 import Development.IDE.Types.Location
-import Development.Shake (RuleResult, Rules)
-import Development.Shake.Classes
+import Development.IDE.Graph (RuleResult, Rules)
+import Development.IDE.Graph.Classes
 import qualified GHC.Generics as GHC
 import Generics.SYB
 import Generics.SYB.GHC

ghcide/src/Development/IDE/Main.hs

@@ -61,7 +61,7 @@ import           Development.IDE.Types.Options         (IdeGhcSession,
                                                         clientSupportsProgress,
                                                         defaultIdeOptions)
 import           Development.IDE.Types.Shake           (Key (Key))
-import           Development.Shake                     (action)
+import           Development.IDE.Graph                     (action)
 import           GHC.IO.Encoding                       (setLocaleEncoding)
 import           GHC.IO.Handle                         (hDuplicate)
 import           HIE.Bios.Cradle                       (findCradle)

ghcide/src/Development/IDE/Plugin.hs

@@ -1,7 +1,7 @@
 module Development.IDE.Plugin ( Plugin(..) ) where
 
 import           Data.Default
-import           Development.Shake
+import           Development.IDE.Graph
 
 import           Development.IDE.LSP.Server
 import qualified Language.LSP.Server        as LSP

ghcide/src/Development/IDE/Plugin/CodeAction/RuleTypes.hs

@@ -10,7 +10,7 @@ import           Data.Hashable                  (Hashable)
 import           Data.Typeable                  (Typeable)
 import           Development.IDE.Types.Exports
 import           Development.IDE.Types.HscEnvEq (HscEnvEq)
-import           Development.Shake              (RuleResult)
+import           Development.IDE.Graph              (RuleResult)
 import           GHC.Generics                   (Generic)
 
 -- Rule type for caching Package Exports

ghcide/src/Development/IDE/Plugin/Completions.hs

@@ -31,8 +31,8 @@ import           Development.IDE.Plugin.Completions.Logic
 import           Development.IDE.Plugin.Completions.Types
 import           Development.IDE.Types.HscEnvEq               (hscEnv)
 import           Development.IDE.Types.Location
-import           Development.Shake
-import           Development.Shake.Classes
+import           Development.IDE.Graph
+import           Development.IDE.Graph.Classes
 import           GHC.Exts                                     (toList)
 import           GHC.Generics
 import           Ide.Plugin.Config                            (Config)

ghcide/src/Development/IDE/Plugin/HLS.hs

@@ -27,7 +27,7 @@ import           Development.IDE.Core.Tracing
 import           Development.IDE.LSP.Server
 import           Development.IDE.Plugin
 import           Development.IDE.Types.Logger
-import           Development.Shake            (Rules)
+import           Development.IDE.Graph            (Rules)
 import           Ide.Plugin.Config
 import           Ide.PluginUtils              (getClientConfig)
 import           Ide.Types                    as HLS

ghcide/src/Development/IDE/Plugin/Test.hs

@@ -30,7 +30,7 @@ import           Development.IDE.Plugin
 import           Development.IDE.Types.Action
 import           Development.IDE.Types.HscEnvEq (HscEnvEq (hscEnv))
 import           Development.IDE.Types.Location (fromUri)
-import           Development.Shake              (Action)
+import           Development.IDE.Graph              (Action)
 import           GHC.Generics                   (Generic)
 import           GhcPlugins                     (HscEnv (hsc_dflags))
 import           Ide.Types

ghcide/src/Development/IDE/Plugin/TypeLenses.hs

@@ -41,7 +41,7 @@ import           Development.IDE.Types.Location      (Position (Position, _chara
                                                       Range (Range, _end, _start),
                                                       toNormalizedFilePath',
                                                       uriToFilePath')
-import           Development.Shake.Classes
+import           Development.IDE.Graph.Classes
 import           GHC.Generics                        (Generic)
 import           GhcPlugins                          (GlobalRdrEnv,
                                                       HscEnv (hsc_dflags), SDoc,

ghcide/src/Development/IDE/Types/Action.hs

@@ -16,7 +16,7 @@ import qualified Data.HashSet                 as Set
 import           Data.Hashable                (Hashable (..))
 import           Data.Unique                  (Unique)
 import           Development.IDE.Types.Logger
-import           Development.Shake            (Action)
+import           Development.IDE.Graph            (Action)
 import           Numeric.Natural
 
 data DelayedAction a = DelayedAction

ghcide/src/Development/IDE/Types/HscEnvEq.hs

@@ -25,7 +25,7 @@ import           Development.IDE.GHC.Compat
 import           Development.IDE.GHC.Error     (catchSrcErrors)
 import           Development.IDE.GHC.Util      (lookupPackageConfig)
 import           Development.IDE.Types.Exports (ExportsMap, createExportsMap)
-import           Development.Shake.Classes
+import           Development.IDE.Graph.Classes
 import           GhcPlugins                    (HscEnv (hsc_dflags),
                                                 InstalledPackageInfo (exposedModules),
                                                 Module (..),
@@ -164,4 +164,3 @@ onceAsync act = do
             pure (OnceRunning x, unmask $ run x)
 
 data Once a = OncePending | OnceRunning (Async a)
-

ghcide/src/Development/IDE/Types/Options.hs

@@ -23,7 +23,7 @@ import qualified Data.Text                         as T
 import           Data.Typeable
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Types.Diagnostics
-import           Development.Shake
+import           Development.IDE.Graph
 import           GHC                               hiding (parseModule,
                                                     typecheckModule)
 import           GhcPlugins                        as GHC hiding (fst3, (<>))

ghcide/src/Development/IDE/Types/Shake.hs

@@ -26,9 +26,9 @@ import           Data.Vector                          (Vector)
 import           Development.IDE.Core.PositionMapping
 import           Development.IDE.Types.Diagnostics
 import           Development.IDE.Types.Location
-import           Development.Shake                    (RuleResult,
+import           Development.IDE.Graph                    (RuleResult,
                                                        ShakeException (shakeExceptionInner))
-import           Development.Shake.Classes
+import           Development.IDE.Graph.Classes
 import           GHC.Generics
 import           Language.LSP.Types
 

ghcide/src/Generics/SYB/GHC.hs

@@ -14,7 +14,7 @@ import Control.Monad
 import Data.Functor.Compose (Compose(Compose))
 import Data.Monoid (Any(Any))
 import Development.IDE.GHC.Compat
-import Development.Shake.Classes
+import Development.IDE.Graph.Classes
 import Generics.SYB
 
 
@@ -122,4 +122,3 @@ gmapMQ f = runMonadicQuery . gfoldl k pure
   where
     k :: Data d => MonadicQuery r f (d -> b) -> d -> MonadicQuery r f b
     k c x = c <*> MonadicQuery (f x)
-

haskell-language-server.cabal

@@ -73,7 +73,7 @@ library
     , optparse-applicative
     , optparse-simple
     , process
-    , shake
+    , hls-graph
     , safe-exceptions
     , sqlite-simple
     , unordered-containers
@@ -332,7 +332,7 @@ executable haskell-language-server
     , mtl
     , regex-tdfa
     , safe-exceptions
-    , shake
+    , hls-graph
     , sqlite-simple
     , temporary
     , transformers