Commit af64de7

committed

Remove comment referring to GHC 9.2 and fix code

1 parent 9b952c8 commit af64de7Copy full SHA for af64de7

File tree

2 files changed

-15

lines changed

ghcide/src/Development/IDE
- GHC/Compat
  - Logger.hs
- Spans
  - AtPoint.hs

2 files changed

-15

lines changed

`‎ghcide/src/Development/IDE/GHC/Compat/Logger.hs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{-# LANGUAGE CPP #-}`
`2`		`--- \| Compat module for GHC 9.2 Logger infrastructure.`
	`2`	`+-- \| Compat module for logger infrastructure.`
`3`	`3`	`module Development.IDE.GHC.Compat.Logger (`
`4`	`4`	`putLogHook,`
`5`	`5`	`Logger.pushLogHook,`

`‎ghcide/src/Development/IDE/Spans/AtPoint.hs‎`

Lines changed: 4 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ module Development.IDE.Spans.AtPoint (`
`25`	`25`	`) where`
`26`	`26`
`27`	`27`
`28`		`-import GHC.Data.FastString (lengthFS)`
	`28`	`+import GHC.Data.FastString (LexicalFastString (..),`
	`29`	`+ lengthFS)`
`29`	`30`	`import qualified GHC.Utils.Outputable as O`
`30`	`31`
`31`	`32`	`import Development.IDE.GHC.Error`
`@@ -50,7 +51,6 @@ import Control.Monad.Extra`
`50`	`51`	`import Control.Monad.IO.Class`
`51`	`52`	`import Control.Monad.Trans.Class`
`52`	`53`	`import Control.Monad.Trans.Maybe`
`53`		`-import Data.Coerce (coerce)`
`54`	`54`	`import qualified Data.HashMap.Strict as HM`
`55`	`55`	`import qualified Data.Map.Strict as M`
`56`	`56`	`import Data.Maybe`
`@@ -580,18 +580,8 @@ defRowToSymbolInfo _ = Nothing`
`580`	`580`
`581`	`581`	`pointCommand :: HieASTs t -> Position -> (HieAST t -> a) -> [a]`
`582`	`582`	`pointCommand hf pos k =`
`583`		`- M.elems $ flip M.mapMaybeWithKey (getAsts hf) $ \fs ast ->`
`584`		`- -- Since GHC 9.2:`
`585`		`- -- getAsts :: Map HiePath (HieAst a)`
`586`		`- -- type HiePath = LexicalFastString`
`587`		`- --`
`588`		`- -- but before:`
`589`		`- -- getAsts :: Map HiePath (HieAst a)`
`590`		`- -- type HiePath = FastString`
`591`		`- --`
`592`		`- -- 'coerce' here to avoid an additional function for maintaining`
`593`		`- -- backwards compatibility.`
`594`		`- case selectSmallestContaining (sp $ coerce fs) ast of`
	`583`	`+ M.elems $ flip M.mapMaybeWithKey (getAsts hf) $ \(LexicalFastString fs) ast ->`
	`584`	`+ case selectSmallestContaining (sp fs) ast of`
`595`	`585`	`Nothing -> Nothing`
`596`	`586`	`Just ast' -> Just $ k ast'`
`597`	`587`	`where`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit af64de7

File tree

2 files changed

2 files changed

`‎ghcide/src/Development/IDE/GHC/Compat/Logger.hs‎`

`‎ghcide/src/Development/IDE/Spans/AtPoint.hs‎`

0 commit comments