Fix conflict with cabal.project, and clean compilation

Author: alanz

cabal.project

@@ -2,12 +2,6 @@ packages:
          ./
          ghcide
 
--- See https://github.com/haskell-hvr/cabal-plan/pull/55
-source-repository-package
-    type: git
-    location: https://github.com/peti/cabal-plan
-    tag: 894b76c0b6bf8f7d2f881431df1f13959a8fce87
-
 tests: true
 documentation: true
 
@@ -18,4 +12,4 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-07-01T16:33:28Z
+index-state: 2020-07-01T21:29:04Z

exe/Main.hs

@@ -338,7 +338,7 @@ loadSession dir = do
     InstallationMismatch{..} ->
         return $ returnWithVersion $ \fp -> return (([renderPackageSetupException compileTime fp GhcVersionMismatch{..}], Nothing),[])
     InstallationChecked compileTime ghcLibCheck -> return $ do
-      ShakeExtras{logger, eventer, restartShakeSession, withIndefiniteProgress, ideNc, session=ideSession} <- getShakeExtras
+      ShakeExtras{logger, eventer, withIndefiniteProgress, ideNc, session=ideSession} <- getShakeExtras
       IdeOptions{optTesting = IdeTesting optTesting} <- getIdeOptions
 
       -- Create a new HscEnv from a hieYaml root and a set of options