Fix up for rebase on mpickering branch

Author: alanz

cabal.project

@@ -10,8 +10,12 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/fendor/hie-bios.git
-    tag: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99
+    tag: 87db34de1b10b03bb2c3d7f6bd3623bc1da96ba8
 
+source-repository-package
+    type: git
+    location: https://github.com/mpickering/shake
+    tag: 4d56fe9f09bd3bd63ead541c571c756995da490a
 
 tests: true
 documentation: false

exe/Main.hs

@@ -224,7 +224,7 @@ main = do
 
         putStrLn "\nStep 4/6: Type checking the files"
         setFilesOfInterest ide $ HashSet.fromList $ map toNormalizedFilePath' files
-        _ <- runActionSync ide $ uses TypeCheck (map toNormalizedFilePath' files)
+        _ <- runActionSync "TypecheckTest" ide $ uses TypeCheck (map toNormalizedFilePath' files)
 --        results <- runActionSync ide $ use TypeCheck $ toNormalizedFilePath' "src/Development/IDE/Core/Rules.hs"
 --        results <- runActionSync ide $ use TypeCheck $ toNormalizedFilePath' "exe/Main.hs"
         return ()
@@ -523,9 +523,10 @@ memoIO op = do
             Just res -> return (mp, res)
 
 setOptions :: GhcMonad m => ComponentOptions -> DynFlags -> m (DynFlags, [Target])
-setOptions (ComponentOptions theOpts compRoot _) dflags = do
+setOptions (ComponentOptions theOpts _compRoot _) dflags = do
     cacheDir <- liftIO $ getCacheDir theOpts
-    (dflags', targets) <- addCmdOpts compRoot theOpts dflags
+    -- (dflags', targets) <- addCmdOpts compRoot theOpts dflags
+    (dflags', targets) <- addCmdOpts theOpts dflags
     let dflags'' =
           -- disabled, generated directly by ghcide instead
           flip gopt_unset Opt_WriteInterface $

ghcide

@@ -125,7 +125,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
     logInfo (ideLogger ideState) "Example.codeLens entered (ideLogger)" -- AZ
     case uriToFilePath' uri of
       Just (toNormalizedFilePath -> filePath) -> do
-        _ <- runAction ideState $ runMaybeT $ useE TypeCheck filePath
+        _ <- runAction (fromNormalizedFilePath filePath) ideState $ runMaybeT $ useE TypeCheck filePath
         _diag <- getDiagnostics ideState
         _hDiag <- getHiddenDiagnostics ideState
         let
@@ -190,7 +190,7 @@ logAndRunRequest label getResults ide pos path = do
   logInfo (ideLogger ide) $
     label <> " request at position " <> T.pack (showPosition pos) <>
     " in file: " <> T.pack path
-  runAction ide $ getResults filePath pos
+  runAction path ide $ getResults filePath pos
 
 -- ---------------------------------------------------------------------
 

src/Ide/Plugin/Example.hs

@@ -125,7 +125,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
     logInfo (ideLogger ideState) "Example2.codeLens entered (ideLogger)" -- AZ
     case uriToFilePath' uri of
       Just (toNormalizedFilePath -> filePath) -> do
-        _ <- runAction ideState $ runMaybeT $ useE TypeCheck filePath
+        _ <- runAction (fromNormalizedFilePath filePath) ideState $ runMaybeT $ useE TypeCheck filePath
         _diag <- getDiagnostics ideState
         _hDiag <- getHiddenDiagnostics ideState
         let
@@ -187,7 +187,7 @@ logAndRunRequest label getResults ide pos path = do
   logInfo (ideLogger ide) $
     label <> " request at position " <> T.pack (showPosition pos) <>
     " in file: " <> T.pack path
-  runAction ide $ getResults filePath pos
+  runAction path ide $ getResults filePath pos
 
 -- ---------------------------------------------------------------------
 

src/Ide/Plugin/Example2.hs

@@ -65,7 +65,7 @@ doFormatting lf providers ideState ft uri params = do
       Just provider ->
         case uriToFilePath uri of
           Just (toNormalizedFilePath -> fp) -> do
-            (_, mb_contents) <- runAction ideState $ getFileContents fp
+            (_, mb_contents) <- runAction (fromNormalizedFilePath fp) ideState $ getFileContents fp
             case mb_contents of
               Just contents -> do
                   logDebug (ideLogger ideState) $ T.pack $

src/Ide/Plugin/Formatter.hs

@@ -76,7 +76,7 @@ provider ideState typ contents fp _ = do
       in
         return $ map DynOption $ pp <> pm <> ex
 
-  m_parsed <- runAction ideState $ getParsedModule fp
+  m_parsed <- runAction (fromNormalizedFilePath fp) ideState $ getParsedModule fp
   fileOpts <- case m_parsed of
           Nothing -> return []
           Just pm -> fromDyn pm