Address review comments

Author: crtschin

ghcide/src/Development/IDE/Core/Actions.hs

@@ -24,6 +24,8 @@ import           Development.IDE.Core.PositionMapping
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Service
 import           Development.IDE.Core.Shake
+import           Development.IDE.GHC.Compat           (DynFlags (..),
+                                                       ms_hspp_opts)
 import           Development.IDE.Graph
 import qualified Development.IDE.Spans.AtPoint        as AtPoint
 import           Development.IDE.Types.HscEnvEq       (hscEnv)
@@ -52,13 +54,14 @@ getAtPoint file pos = runMaybeT $ do
   shakeExtras <- lift askShake
 
   env <- hscEnv . fst <$> useWithStaleFastMT GhcSession file
-  parsedModule <- fst <$> useWithStaleFastMT GetParsedModule file
+  modSummary <- fst <$> useWithStaleFastMT GetModSummary file
   dkMap <- lift $ maybe (DKMap mempty mempty mempty) fst <$> runMaybeT (useWithStaleFastMT GetDocMap file)
+  let enabledExtensions = extensionFlags (ms_hspp_opts (msrModSummary modSummary))
 
   !pos' <- MaybeT (return $ fromCurrentPosition mapping pos)
 
   MaybeT $ liftIO $ fmap (first (toCurrentRange mapping =<<)) <$>
-    AtPoint.atPoint opts shakeExtras hf dkMap env pos' parsedModule
+    AtPoint.atPoint opts shakeExtras hf dkMap env pos' enabledExtensions
 
 -- | Converts locations in the source code to their current positions,
 -- taking into account changes that may have occurred due to edits.

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

@@ -41,9 +41,7 @@ import           Development.IDE.Core.PositionMapping
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.GHC.Compat
 import qualified Development.IDE.GHC.Compat.Util      as Util
-import           Development.IDE.GHC.Util             (getExtensions,
-                                                       getExtensionsSet,
-                                                       printOutputable,
+import           Development.IDE.GHC.Util             (printOutputable,
                                                        printOutputableOneLine)
 import           Development.IDE.Spans.Common
 import           Development.IDE.Types.Options
@@ -71,12 +69,9 @@ import qualified Data.Set                             as S
 import           Data.Tree
 import qualified Data.Tree                            as T
 import           Data.Version                         (showVersion)
-import           Debug.Trace                          (traceShow, traceShowId)
 import           Development.IDE.Core.LookupMod       (LookupModule, lookupMod)
-import           Development.IDE.Core.PluginUtils     (runActionE)
 import           Development.IDE.Core.Shake           (ShakeExtras (..),
-                                                       runIdeAction, use,
-                                                       useWithStaleFast)
+                                                       runIdeAction)
 import           Development.IDE.Types.Shake          (WithHieDb)
 import           GHC.Iface.Ext.Types                  (EvVarSource (..),
                                                        HieAST (..),
@@ -266,9 +261,9 @@ atPoint
   -> DocAndTyThingMap
   -> HscEnv
   -> Position
-  -> ParsedModule
+  -> Util.EnumSet Extension
   -> IO (Maybe (Maybe Range, [T.Text]))
-atPoint opts@IdeOptions{} shakeExtras@ShakeExtras{ withHieDb, hiedbWriter } har@(HAR _ (hf :: HieASTs a) rf _ (kind :: HieKind hietype)) (DKMap dm km _am) env pos parsedModule =
+atPoint opts@IdeOptions{} shakeExtras@ShakeExtras{ withHieDb, hiedbWriter } har@(HAR _ (hf :: HieASTs a) rf _ (kind :: HieKind hietype)) (DKMap dm km _am) env pos enabledExtensions =
     listToMaybe <$> sequence (pointCommand hf pos hoverInfo)
   where
     -- Hover info for values/data
@@ -288,9 +283,6 @@ atPoint opts@IdeOptions{} shakeExtras@ShakeExtras{ withHieDb, hiedbWriter } har@
         prettyNames <- mapM (prettyName locationsMap) names
         pure (Just range, prettyNames ++ pTypes locationsMap)
       where
-        enabledExtensions :: Util.EnumSet Extension
-        enabledExtensions = getExtensionsSet $ parsedModule
-
         pTypes :: M.Map Name Location -> [T.Text]
         pTypes locationsMap =
           case names of

ghcide/src/Development/IDE/Spans/Common.hs

@@ -38,7 +38,6 @@ import           Language.LSP.Protocol.Types
 type DocMap = NameEnv SpanDoc
 type TyThingMap = NameEnv TyThing
 type ArgDocMap = NameEnv (IntMap SpanDoc)
-data A = A Word Bool
 
 -- | Shows IEWrappedName, without any modifier, qualifier or unique identifier.
 unqualIEWrapName :: IEWrappedName GhcPs -> T.Text