Update hls-retrie-plugin to be usable with 9.2.4.

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

@@ -158,7 +158,7 @@ import           GHC.Stack                              (HasCallStack)
 import           HieDb.Types
 import           Ide.Plugin.Config
 import qualified Ide.PluginUtils                        as HLS
-import           Ide.Types                              (PluginId, IdePlugins)
+import           Ide.Types                              (IdePlugins, PluginId)
 import           Language.LSP.Diagnostics
 import qualified Language.LSP.Server                    as LSP
 import           Language.LSP.Types

ghcide/src/Development/IDE/GHC/Compat/Core.hs

@@ -205,6 +205,7 @@ module Development.IDE.GHC.Compat.Core (
     getLocA,
     locA,
     noLocA,
+    unLocA,
     LocatedAn,
 #if MIN_VERSION_ghc(9,2,0)
     GHC.AnnListItem(..),
@@ -1044,6 +1045,13 @@ locA = GHC.locA
 locA = id
 #endif
 
+#if MIN_VERSION_ghc(9,2,0)
+unLocA :: forall pass a. XRec (GhcPass pass) a -> a
+unLocA = unXRec @(GhcPass pass)
+#else
+unLocA = id
+#endif
+
 #if MIN_VERSION_ghc(9,2,0)
 getLocA :: SrcLoc.GenLocated (SrcSpanAnn' a) e -> SrcSpan
 getLocA = GHC.getLocA

ghcide/src/Development/IDE/Plugin/Completions.hs

@@ -8,46 +8,45 @@ module Development.IDE.Plugin.Completions
     , ghcideCompletionsPluginPriority
     ) where
 
-import           Control.Concurrent.Async                     (concurrently)
-import           Control.Concurrent.STM.Stats                 (readTVarIO)
+import           Control.Concurrent.Async                 (concurrently)
+import           Control.Concurrent.STM.Stats             (readTVarIO)
 import           Control.Monad.Extra
 import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Maybe
 import           Data.Aeson
-import qualified Data.HashMap.Strict                          as Map
-import qualified Data.HashSet                                 as Set
-import           Data.List                                    (find)
+import qualified Data.HashMap.Strict                      as Map
+import qualified Data.HashSet                             as Set
+import           Data.List                                (find)
 import           Data.Maybe
-import qualified Data.Text                                    as T
+import qualified Data.Text                                as T
 import           Development.IDE.Core.PositionMapping
 import           Development.IDE.Core.RuleTypes
-import           Development.IDE.Core.Service                 hiding (Log,
-                                                               LogShake)
-import           Development.IDE.Core.Shake                   hiding (Log)
-import qualified Development.IDE.Core.Shake                   as Shake
+import           Development.IDE.Core.Service             hiding (Log, LogShake)
+import           Development.IDE.Core.Shake               hiding (Log)
+import qualified Development.IDE.Core.Shake               as Shake
 import           Development.IDE.GHC.Compat
-import           Development.IDE.GHC.Error                    (rangeToSrcSpan)
-import           Development.IDE.GHC.Util                     (printOutputable)
+import           Development.IDE.GHC.Error                (rangeToSrcSpan)
+import           Development.IDE.GHC.Util                 (printOutputable)
 import           Development.IDE.Graph
 import           Development.IDE.Plugin.Completions.Logic
 import           Development.IDE.Plugin.Completions.Types
 import           Development.IDE.Types.Exports
-import           Development.IDE.Types.HscEnvEq               (HscEnvEq (envPackageExports),
-                                                               hscEnv)
-import qualified Development.IDE.Types.KnownTargets           as KT
+import           Development.IDE.Types.HscEnvEq           (HscEnvEq (envPackageExports),
+                                                           hscEnv)
+import qualified Development.IDE.Types.KnownTargets       as KT
 import           Development.IDE.Types.Location
-import           Development.IDE.Types.Logger                 (Pretty (pretty),
-                                                               Recorder,
-                                                               WithPriority,
-                                                               cmapWithPrio)
-import           GHC.Exts                                     (fromList, toList)
-import           Ide.Plugin.Config                            (Config)
+import           Development.IDE.Types.Logger             (Pretty (pretty),
+                                                           Recorder,
+                                                           WithPriority,
+                                                           cmapWithPrio)
+import           GHC.Exts                                 (fromList, toList)
+import           Ide.Plugin.Config                        (Config)
 import           Ide.Types
-import qualified Language.LSP.Server                          as LSP
+import qualified Language.LSP.Server                      as LSP
 import           Language.LSP.Types
-import qualified Language.LSP.VFS                             as VFS
+import qualified Language.LSP.VFS                         as VFS
 import           Numeric.Natural
-import           Text.Fuzzy.Parallel                          (Scored (..))
+import           Text.Fuzzy.Parallel                      (Scored (..))
 
 data Log = LogShake Shake.Log deriving Show
 

haskell-language-server.cabal

@@ -274,7 +274,7 @@ common rename
     cpp-options: -Dhls_rename
 
 common retrie
-  if flag(retrie) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(retrie)
     build-depends: hls-retrie-plugin ^>= 1.0
     cpp-options: -Dhls_retrie
 

hls-plugin-api/src/Ide/Types.hs

@@ -56,6 +56,7 @@ import           Control.Monad                   (void)
 import qualified System.Posix.Process            as P (getProcessID)
 import           System.Posix.Signals
 #endif
+import           Control.Applicative             ((<|>))
 import           Control.Arrow                   ((&&&))
 import           Control.Lens                    ((^.))
 import           Data.Aeson                      hiding (defaultOptions)
@@ -67,7 +68,7 @@ import           Data.GADT.Compare
 import           Data.Hashable                   (Hashable)
 import           Data.HashMap.Strict             (HashMap)
 import qualified Data.HashMap.Strict             as HashMap
-import           Data.List.Extra                 (sortOn, find)
+import           Data.List.Extra                 (find, sortOn)
 import           Data.List.NonEmpty              (NonEmpty (..), toList)
 import qualified Data.Map                        as Map
 import           Data.Maybe
@@ -107,12 +108,11 @@ import           Options.Applicative             (ParserInfo)
 import           System.FilePath
 import           System.IO.Unsafe
 import           Text.Regex.TDFA.Text            ()
-import           Control.Applicative             ((<|>))
 
 -- ---------------------------------------------------------------------
 
 data IdePlugins ideState = IdePlugins_
-  { ipMap_ :: HashMap PluginId (PluginDescriptor ideState)
+  { ipMap_                :: HashMap PluginId (PluginDescriptor ideState)
   , lookupCommandProvider :: CommandId -> Maybe PluginId
   }
 

plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange/Rules.hs

@@ -23,41 +23,42 @@ module Ide.Plugin.CodeRange.Rules
     , simplify
     ) where
 
-import           Control.DeepSeq                    (NFData)
-import qualified Control.Lens                       as Lens
-import           Control.Monad                      (foldM)
-import           Control.Monad.Except               (ExceptT (..), runExceptT)
-import           Control.Monad.Reader               (runReader)
-import           Control.Monad.Trans.Class          (lift)
-import           Control.Monad.Trans.Maybe          (MaybeT (MaybeT),
-                                                     maybeToExceptT)
+import           Control.DeepSeq                       (NFData)
+import qualified Control.Lens                          as Lens
+import           Control.Monad                         (foldM)
+import           Control.Monad.Except                  (ExceptT (..),
+                                                        runExceptT)
+import           Control.Monad.Reader                  (runReader)
+import           Control.Monad.Trans.Class             (lift)
+import           Control.Monad.Trans.Maybe             (MaybeT (MaybeT),
+                                                        maybeToExceptT)
 import           Control.Monad.Trans.Writer.CPS
-import           Data.Coerce                        (coerce)
-import           Data.Data                          (Typeable)
-import           Data.Foldable                      (traverse_)
-import           Data.Function                      (on, (&))
+import           Data.Coerce                           (coerce)
+import           Data.Data                             (Typeable)
+import           Data.Foldable                         (traverse_)
+import           Data.Function                         (on, (&))
 import           Data.Hashable
-import           Data.List                          (sort)
-import qualified Data.Map.Strict                    as Map
-import           Data.Vector                        (Vector)
-import qualified Data.Vector                        as V
+import           Data.List                             (sort)
+import qualified Data.Map.Strict                       as Map
+import           Data.Vector                           (Vector)
+import qualified Data.Vector                           as V
 import           Development.IDE
-import           Development.IDE.Core.Rules         (toIdeResult)
-import qualified Development.IDE.Core.Shake         as Shake
+import           Development.IDE.Core.Rules            (toIdeResult)
+import qualified Development.IDE.Core.Shake            as Shake
+import           Development.IDE.GHC.Compat            (HieAST (..),
+                                                        HieASTs (getAsts),
+                                                        ParsedSource, RefMap)
 import           Development.IDE.GHC.Compat.ExactPrint (Annotated)
-import           Development.IDE.GHC.Compat         (HieAST (..),
-                                                     HieASTs (getAsts),
-                                                     ParsedSource, RefMap)
 import           Development.IDE.GHC.Compat.Util
-import           Development.IDE.GHC.ExactPrint     (GetAnnotatedParsedSource (GetAnnotatedParsedSource))
-import           GHC.Generics                       (Generic)
-import           Ide.Plugin.CodeRange.ASTPreProcess (CustomNodeType (..),
-                                                     PreProcessEnv (..),
-                                                     isCustomNode,
-                                                     preProcessAST)
-import           Language.LSP.Types.Lens            (HasEnd (end),
-                                                     HasStart (start))
-import           Prelude                            hiding (log)
+import           Development.IDE.GHC.ExactPrint        (GetAnnotatedParsedSource (GetAnnotatedParsedSource))
+import           GHC.Generics                          (Generic)
+import           Ide.Plugin.CodeRange.ASTPreProcess    (CustomNodeType (..),
+                                                        PreProcessEnv (..),
+                                                        isCustomNode,
+                                                        preProcessAST)
+import           Language.LSP.Types.Lens               (HasEnd (end),
+                                                        HasStart (start))
+import           Prelude                               hiding (log)
 
 data Log = LogShake Shake.Log
     | LogNoAST

plugins/hls-refactor-plugin/src/Development/IDE/GHC/Dump.hs

@@ -1,25 +1,25 @@
 {-# LANGUAGE CPP #-}
 module Development.IDE.GHC.Dump(showAstDataHtml) where
-import           Data.Data                       hiding (Fixity)
-import           Development.IDE.GHC.Compat      hiding (NameAnn)
+import           Data.Data                             hiding (Fixity)
+import           Development.IDE.GHC.Compat            hiding (NameAnn)
 import           Development.IDE.GHC.Compat.ExactPrint
 #if MIN_VERSION_ghc(8,10,1)
 import           GHC.Hs.Dump
 #else
 import           HsDumpAst
 #endif
 #if MIN_VERSION_ghc(9,2,1)
-import qualified Data.ByteString                 as B
+import qualified Data.ByteString                       as B
 import           Development.IDE.GHC.Compat.Util
-import           Generics.SYB                    (ext1Q, ext2Q, extQ)
+import           Generics.SYB                          (ext1Q, ext2Q, extQ)
 import           GHC.Hs
 #endif
 #if MIN_VERSION_ghc(9,0,1)
 import           GHC.Plugins
 #else
 import           GhcPlugins
 #endif
-import           Prelude                         hiding ((<>))
+import           Prelude                               hiding ((<>))
 
 -- | Show a GHC syntax tree in HTML.
 #if MIN_VERSION_ghc(9,2,1)

plugins/hls-refactor-plugin/test/Main.hs

@@ -1,64 +1,64 @@
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE AllowAmbiguousTypes   #-}
 {-# LANGUAGE CPP                   #-}
 {-# LANGUAGE DataKinds             #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs                 #-}
 {-# LANGUAGE ImplicitParams        #-}
+{-# LANGUAGE LambdaCase            #-}
 {-# LANGUAGE MultiWayIf            #-}
+{-# LANGUAGE NamedFieldPuns        #-}
+{-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE PatternSynonyms       #-}
 {-# LANGUAGE PolyKinds             #-}
-{-# LANGUAGE TypeOperators         #-}
-{-# LANGUAGE NamedFieldPuns        #-}
 {-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE TypeOperators         #-}
 {-# OPTIONS_GHC -Wno-deprecations -Wno-unticked-promoted-constructors #-}
 
 module Main
   ( main
   ) where
 
 import           Control.Applicative.Combinators
+import           Control.Lens                             ((^.))
 import           Control.Monad
 import           Data.Default
 import           Data.Foldable
 import           Data.List.Extra
 import           Data.Maybe
 import qualified Data.Text                                as T
-import           Development.IDE.Test
+import           Data.Tuple.Extra
 import           Development.IDE.GHC.Util
 import           Development.IDE.Plugin.Completions.Types (extendImportCommandId)
+import           Development.IDE.Test
 import           Development.IDE.Types.Location
 import           Development.Shake                        (getDirectoryFilesIO)
+import           Ide.Types
 import           Language.LSP.Test
 import           Language.LSP.Types                       hiding
                                                           (SemanticTokenAbsolute (length, line),
                                                            SemanticTokenRelative (length),
                                                            SemanticTokensEdit (_start),
                                                            mkRange)
-import qualified Language.LSP.Types.Lens                  as L
+import qualified Language.LSP.Types                       as LSP
 import           Language.LSP.Types.Capabilities
+import qualified Language.LSP.Types.Lens                  as L
 import           System.Directory
 import           System.FilePath
 import           System.Info.Extra                        (isMac, isWindows)
 import qualified System.IO.Extra
 import           System.IO.Extra                          hiding (withTempDir)
-import           Control.Lens                             ((^.))
-import           Data.Tuple.Extra
-import           Ide.Types
-import qualified Language.LSP.Types                       as LSP
 import           System.Time.Extra
 import           Test.Tasty
 import           Test.Tasty.ExpectedFailure
 import           Test.Tasty.HUnit
 import           Text.Regex.TDFA                          ((=~))
 
 
-import           Test.Hls
 import           Development.IDE.Plugin.CodeAction        (matchRegExMultipleImports)
+import           Test.Hls
 
-import qualified Development.IDE.Plugin.CodeAction as Refactor
-import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
+import qualified Development.IDE.Plugin.CodeAction        as Refactor
+import qualified Development.IDE.Plugin.HLS.GhcIde        as GhcIde
 
 main :: IO ()
 main = defaultTestRunner tests

plugins/hls-rename-plugin/src/Ide/Plugin/Rename.hs

@@ -29,7 +29,7 @@ import qualified Data.Map                              as M
 import           Data.Maybe
 import           Data.Mod.Word
 import qualified Data.Text                             as T
-import           Development.IDE                      (Recorder, WithPriority)
+import           Development.IDE                       (Recorder, WithPriority)
 import           Development.IDE.Core.PositionMapping
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Service
@@ -40,10 +40,10 @@ import           Development.IDE.GHC.Compat.Parser
 import           Development.IDE.GHC.Compat.Units
 import           Development.IDE.GHC.Error
 import           Development.IDE.GHC.ExactPrint
-import qualified Development.IDE.GHC.ExactPrint       as E
+import qualified Development.IDE.GHC.ExactPrint        as E
+import           Development.IDE.Plugin.CodeAction
 import           Development.IDE.Spans.AtPoint
 import           Development.IDE.Types.Location
-import           Development.IDE.Plugin.CodeAction
 import           HieDb.Query
 import           Ide.Plugin.Properties
 import           Ide.PluginUtils

plugins/hls-retrie-plugin/hls-retrie-plugin.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               hls-retrie-plugin
-version:            1.0.2.1
+version:            1.0.2.2
 synopsis:           Retrie integration plugin for Haskell Language Server
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>