Skip to content

Commit e392c49

Browse files
Gurkenglascocreature
authored andcommitted
Apply IdeResult (#386)
1 parent cb28287 commit e392c49

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/Development/IDE/Core/Compile.hs

+5-4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module Development.IDE.Core.Compile
2020

2121
import Development.IDE.Core.RuleTypes
2222
import Development.IDE.Core.Preprocessor
23+
import Development.IDE.Core.Shake
2324
import Development.IDE.GHC.Error
2425
import Development.IDE.GHC.Warnings
2526
import Development.IDE.Types.Diagnostics
@@ -67,7 +68,7 @@ parseModule
6768
-> HscEnv
6869
-> FilePath
6970
-> Maybe SB.StringBuffer
70-
-> IO ([FileDiagnostic], Maybe (StringBuffer, ParsedModule))
71+
-> IO (IdeResult (StringBuffer, ParsedModule))
7172
parseModule IdeOptions{..} env filename mbContents =
7273
fmap (either (, Nothing) id) $
7374
runGhcEnv env $ runExceptT $ do
@@ -95,7 +96,7 @@ typecheckModule
9596
-> HscEnv
9697
-> [TcModuleResult]
9798
-> ParsedModule
98-
-> IO ([FileDiagnostic], Maybe TcModuleResult)
99+
-> IO (IdeResult TcModuleResult)
99100
typecheckModule (IdeDefer defer) packageState deps pm =
100101
let demoteIfDefer = if defer then demoteTypeErrorsToWarnings else id
101102
in
@@ -129,7 +130,7 @@ compileModule
129130
:: HscEnv
130131
-> [TcModuleResult]
131132
-> TcModuleResult
132-
-> IO ([FileDiagnostic], Maybe (SafeHaskellMode, CgGuts, ModDetails))
133+
-> IO (IdeResult (SafeHaskellMode, CgGuts, ModDetails))
133134
compileModule packageState deps tmr =
134135
fmap (either (, Nothing) (second Just)) $
135136
runGhcEnv packageState $
@@ -148,7 +149,7 @@ compileModule packageState deps tmr =
148149
(guts, details) <- liftIO $ tidyProgram session desugar
149150
return (map snd warnings, (mg_safe_haskell desugar, guts, details))
150151

151-
generateByteCode :: HscEnv -> [TcModuleResult] -> TcModuleResult -> CgGuts -> IO ([FileDiagnostic], Maybe Linkable)
152+
generateByteCode :: HscEnv -> [TcModuleResult] -> TcModuleResult -> CgGuts -> IO (IdeResult Linkable)
152153
generateByteCode hscEnv deps tmr guts =
153154
fmap (either (, Nothing) (second Just)) $
154155
runGhcEnv hscEnv $

0 commit comments

Comments
 (0)