5ebce24 · ghcide · git.iko.soy

git.iko.soy/ghcide

on master help sign in

Make Haddock work for hie-core (#1990)

5ebce24Neil Mitchell7 years ago

src/Development/IDE/Core/Compile.hs+4−4

compare with master

unifiedsplit

@@ -285,10 +285,10 @@ getModSummaryFromBuffer fp contents dflags parsed = do

285 { ms_mod = mkModule (fsToUnitId unitId) modName

286 , ms_location = modLoc

287 , ms_hs_date = error "Rules should not depend on ms_hs_date"

288− -- ^ When we are working with a virtual file we do not have a file date.

288+ -- When we are working with a virtual file we do not have a file date.

289− -- To avoid silent issues where something is not processed because the date

289+ -- To avoid silent issues where something is not processed because the date

290− -- has not changed, we make sure that things blow up if they depend on the

290+ -- has not changed, we make sure that things blow up if they depend on the

291− -- date.

291+ -- date.

292 , ms_textual_imps = imports

293 , ms_hspp_file = fp

294 , ms_hspp_opts = dflags

src/Development/IDE/Core/Shake.hs+8−9

@@ -73,7 +73,7 @@ import Data.Time

73import GHC.Generics

74import System.IO.Unsafe

75import Numeric.Extra

76−

76+import Language.Haskell.LSP.Types

79-- information we stash inside the shakeExtra field

@@ -444,14 +444,13 @@ getDiagnosticsFromStore (StoreItem _ diags) = concatMap SL.fromSortedList $ Map.

444

445-- | Sets the diagnostics for a file and compilation step

446-- if you want to clear the diagnostics call this with an empty list

447−setStageDiagnostics ::

447+setStageDiagnostics

448− NormalizedFilePath ->

448+ :: NormalizedFilePath

449− Maybe Int ->

450− -- ^ the time that the file these diagnostics originate from was last edited

449+ -> TextDocumentVersion -- ^ the time that the file these diagnostics originate from was last edited

451− T.Text ->

450+ -> T.Text

452− [LSP.Diagnostic] ->

451+ -> [LSP.Diagnostic]

453− DiagnosticStore ->

452+ -> DiagnosticStore

454− DiagnosticStore

453+ -> DiagnosticStore

455setStageDiagnostics fp timeM stage diags ds =

454setStageDiagnostics fp timeM stage diags ds =

456 updateDiagnostics ds uri timeM diagsBySource

455 updateDiagnostics ds uri timeM diagsBySource

457 where

456 where