Minor Changes

Author: vidit-od

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

@@ -134,7 +134,7 @@ scheduleGarbageCollection state = do
 --   Could be improved
 kick :: Action ()
 kick = do
-    files <- HashMap.keys <$> getFilesOfInterestUntracked
+    filesOfInterestMap <- getFilesOfInterestUntracked
     ShakeExtras{exportsMap, ideTesting = IdeTesting testing, lspEnv, progress} <- getShakeExtras
     let signal :: KnownSymbol s => Proxy s -> Action ()
         signal msg = when testing $ liftIO $

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

@@ -108,8 +108,7 @@ import           Data.Hashable
 import qualified Data.HashMap.Strict                    as HMap
 import           Data.HashSet                           (HashSet)
 import qualified Data.HashSet                           as HSet
-import           Data.List.Extra                        (foldl', partition,
-                                                         takeEnd)
+import           Data.List.Extra                        (partition, takeEnd)
 import qualified Data.Map.Strict                        as Map
 import           Data.Maybe
 import qualified Data.SortedList                        as SL

plugins/hls-class-plugin/src/Ide/Plugin/Class/Types.hs

@@ -21,7 +21,9 @@ import           Development.IDE
 import           Development.IDE.Core.PluginUtils (useMT)
 import qualified Development.IDE.Core.Shake       as Shake
 import           Development.IDE.GHC.Compat       hiding (newUnique, (<+>))
+#if !MIN_VERSION_ghc(9,11,0)
 import           Development.IDE.GHC.Compat.Util  (bagToList)
+#endif
 import           Development.IDE.Graph.Classes
 import           GHC.Generics
 import           Ide.Plugin.Class.Utils
@@ -76,9 +78,7 @@ instance NFData ClassInstancesResult where
     rnf = rwhnf
 
 type instance RuleResult GetClassInstances = ClassInstancesResult
-
-type instance RuleResult GetInstanceBindTypeSigs = InstanceBindTypeSigsResult
-type instance RuleInput GetInstanceBindTypeSigs = ProjectHaskellFiles
+type instance RuleInput GetClassInstances = ProjectHaskellFiles
 
 -- |The necessary data to execute our code lens
 data InstanceBindLensCommand = InstanceBindLensCommand

plugins/hls-stan-plugin/src/Ide/Plugin/Stan.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP             #-}
+{-# LANGUAGE DataKinds       #-}
 {-# LANGUAGE PatternSynonyms #-}
 module Ide.Plugin.Stan (descriptor, Log) where
 
@@ -11,6 +12,9 @@ import qualified Data.HashMap.Strict         as HM
 import           Data.Maybe                  (mapMaybe)
 import qualified Data.Text                   as T
 import           Development.IDE
+import           Development.IDE.Core.InputPath
+                                             (classifyProjectHaskellInputs,
+                                              unInputPath)
 import           Development.IDE.Core.Rules  (getHieFile)
 import qualified Development.IDE.Core.Shake  as Shake
 import           Development.IDE.GHC.Compat  (HieFile (..))
@@ -110,6 +114,7 @@ rules :: Recorder (WithPriority Log) -> PluginId -> Rules ()
 rules recorder plId = do
   define (cmapWithPrio LogShake recorder) $
     \GetStanDiagnostics file -> do
+      let nfp = unInputPath file
       config <- getPluginConfigAction plId
       if plcGlobalOn config && plcDiagnosticsOn config then do
           maybeHie <- getHieFile file
@@ -144,7 +149,7 @@ rules recorder plId = do
 
               -- Note that Stan works in terms of relative paths, but the HIE come in as absolute. Without
               -- making its path relative, the file name(s) won't line up with the associated Map keys.
-              relativeHsFilePath <- liftIO $ makeRelativeToCurrentDirectory $ fromNormalizedFilePath file
+              relativeHsFilePath <- liftIO $ makeRelativeToCurrentDirectory $ fromNormalizedFilePath nfp
               let hieRelative = hie{hie_hs_file=relativeHsFilePath}
 
               (checksMap, ignoredObservations) <- case configTrial of
@@ -161,12 +166,13 @@ rules recorder plId = do
               -- A Map from *relative* file paths (just one, in this case) to language extension info:
               cabalExtensionsMap <- liftIO $ createCabalExtensionsMap isLoud (stanArgsCabalFilePath stanArgs) [hieRelative]
               let analysis = runAnalysis cabalExtensionsMap checksMap ignoredObservations [hieRelative]
-              return (analysisToDiagnostics file analysis, Just ())
+              return (analysisToDiagnostics nfp analysis, Just ())
       else return ([], Nothing)
 
   action $ do
-    files <- getFilesOfInterestUntracked
-    void $ uses GetStanDiagnostics $ HM.keys files
+    filesOfInterest <- getFilesOfInterestUntracked
+    let files = classifyProjectHaskellInputs $ HM.keys filesOfInterest
+    void $ uses GetStanDiagnostics $ files
   where
     analysisToDiagnostics :: NormalizedFilePath -> Analysis -> [FileDiagnostic]
     analysisToDiagnostics file = mapMaybe (observationToDianostic file) . toList . analysisObservations

test/functional/Config.hs

@@ -8,10 +8,12 @@ import           Control.Monad
 import           Data.Hashable
 import qualified Data.HashMap.Strict  as HM
 import qualified Data.Map             as Map
-import           Development.IDE      (RuleResult, action, define,
-                                       getFilesOfInterestUntracked,
+import           Development.IDE      (action, define, getFilesOfInterestUntracked,
                                        getPluginConfigAction, ideErrorText,
                                        uses_)
+import           Development.IDE.Core.InputPath
+                                      (classifyProjectHaskellInputs,
+                                       unInputPath)
 import           Development.IDE.Test (ExpectedDiagnostic, expectDiagnostics)
 import           GHC.Generics
 import           Ide.Plugin.Config
@@ -86,9 +88,9 @@ genericConfigTests = testGroup "generic plugin config"
                 plc <- getPluginConfigAction testPluginId
                 when (plcGlobalOn plc && plcDiagnosticsOn plc) $ do
                     files <- getFilesOfInterestUntracked
-                    void $ uses_ GetTestDiagnostics $ HM.keys files
+                    void $ uses_ GetTestDiagnostics $ classifyProjectHaskellInputs $ HM.keys files
               define mempty $ \GetTestDiagnostics file -> do
-                let diags = [ideErrorText file "testplugin"]
+                let diags = [ideErrorText (unInputPath file) "testplugin"]
                 return (diags,Nothing)
           }
         -- A config that disables the plugin initially
@@ -105,6 +107,7 @@ data GetTestDiagnostics = GetTestDiagnostics
 instance Hashable GetTestDiagnostics
 instance NFData   GetTestDiagnostics
 type instance RuleResult GetTestDiagnostics = ()
+type instance RuleInput GetTestDiagnostics = ProjectHaskellFiles
 
 expectDiagnosticsFail
   :: HasCallStack