Merge branch 'master' into helper-functions

Author: michaelpj

.github/workflows/haskell.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.4.3', '9.2.5', '9.0.2', '8.10.7']
+        ghc: ['9.6', '9.4', '9.2', '9.0', '8.10']
         # Unlikely that we'll succeed on windows and fail on macos,
         # including it is just burning CI time. But windows could have
         # path or IO issues, so worth including

lsp-test/src/Language/LSP/Test/Session.hs

@@ -43,6 +43,8 @@ import Control.Lens hiding (List, Empty)
 import Control.Monad
 import Control.Monad.Catch (MonadThrow)
 import Control.Monad.Except
+import Control.Monad.IO.Class
+import Control.Monad.Trans.Class
 #if __GLASGOW_HASKELL__ == 806
 import Control.Monad.Fail
 #endif

lsp-types/generated/Language/LSP/Protocol/Internal/Types.hs

@@ -199,10 +199,7 @@ import Language.LSP.Protocol.Internal.Types.InlineValueWorkspaceClientCapabiliti
 import Language.LSP.Protocol.Internal.Types.InsertReplaceEdit as Export
 import Language.LSP.Protocol.Internal.Types.InsertTextFormat as Export
 import Language.LSP.Protocol.Internal.Types.InsertTextMode as Export
-import Language.LSP.Protocol.Internal.Types.LSPAny as Export
-import Language.LSP.Protocol.Internal.Types.LSPArray as Export
 import Language.LSP.Protocol.Internal.Types.LSPErrorCodes as Export
-import Language.LSP.Protocol.Internal.Types.LSPObject as Export
 import Language.LSP.Protocol.Internal.Types.LinkedEditingRangeClientCapabilities as Export
 import Language.LSP.Protocol.Internal.Types.LinkedEditingRangeOptions as Export
 import Language.LSP.Protocol.Internal.Types.LinkedEditingRangeParams as Export

lsp-types/generated/Language/LSP/Protocol/Internal/Types/AnnotatedTextEdit.hs

@@ -6,9 +6,11 @@
 module Language.LSP.Protocol.Internal.Types.AnnotatedTextEdit where
 
 import Control.DeepSeq
+import Data.Hashable
 import GHC.Generics
 import qualified Data.Aeson as Aeson
 import qualified Data.Row.Aeson as Aeson
+import qualified Data.Row.Hashable as Hashable
 import qualified Data.Text
 import qualified Language.LSP.Protocol.Internal.Types.ChangeAnnotationIdentifier
 import qualified Language.LSP.Protocol.Internal.Types.Range
@@ -36,7 +38,7 @@ data AnnotatedTextEdit = AnnotatedTextEdit
   _annotationId :: Language.LSP.Protocol.Internal.Types.ChangeAnnotationIdentifier.ChangeAnnotationIdentifier
   }
   deriving stock (Show, Eq, Ord, Generic)
-  deriving anyclass (NFData)
+  deriving anyclass (NFData, Hashable)
 
 instance Aeson.ToJSON AnnotatedTextEdit where
   toJSON (AnnotatedTextEdit arg0 arg1 arg2) = Aeson.object $ concat $  [["range" Aeson..= arg0]

lsp-types/generated/Language/LSP/Protocol/Internal/Types/ApplyWorkspaceEditParams.hs

@@ -6,9 +6,11 @@
 module Language.LSP.Protocol.Internal.Types.ApplyWorkspaceEditParams where
 
 import Control.DeepSeq
+import Data.Hashable
 import GHC.Generics
 import qualified Data.Aeson as Aeson
 import qualified Data.Row.Aeson as Aeson
+import qualified Data.Row.Hashable as Hashable
 import qualified Data.Text
 import qualified Language.LSP.Protocol.Internal.Types.WorkspaceEdit
 import qualified Language.LSP.Protocol.Types.Common
@@ -29,7 +31,7 @@ data ApplyWorkspaceEditParams = ApplyWorkspaceEditParams
   _edit :: Language.LSP.Protocol.Internal.Types.WorkspaceEdit.WorkspaceEdit
   }
   deriving stock (Show, Eq, Ord, Generic)
-  deriving anyclass (NFData)
+  deriving anyclass (NFData, Hashable)
 
 instance Aeson.ToJSON ApplyWorkspaceEditParams where
   toJSON (ApplyWorkspaceEditParams arg0 arg1) = Aeson.object $ concat $  ["label" Language.LSP.Protocol.Types.Common..=? arg0

lsp-types/generated/Language/LSP/Protocol/Internal/Types/ApplyWorkspaceEditResult.hs

@@ -6,9 +6,11 @@
 module Language.LSP.Protocol.Internal.Types.ApplyWorkspaceEditResult where
 
 import Control.DeepSeq
+import Data.Hashable
 import GHC.Generics
 import qualified Data.Aeson as Aeson
 import qualified Data.Row.Aeson as Aeson
+import qualified Data.Row.Hashable as Hashable
 import qualified Data.Text
 import qualified Language.LSP.Protocol.Types.Common
 
@@ -36,7 +38,7 @@ data ApplyWorkspaceEditResult = ApplyWorkspaceEditResult
   _failedChange :: (Maybe Language.LSP.Protocol.Types.Common.UInt)
   }
   deriving stock (Show, Eq, Ord, Generic)
-  deriving anyclass (NFData)
+  deriving anyclass (NFData, Hashable)
 
 instance Aeson.ToJSON ApplyWorkspaceEditResult where
   toJSON (ApplyWorkspaceEditResult arg0 arg1 arg2) = Aeson.object $ concat $  [["applied" Aeson..= arg0]

lsp-types/generated/Language/LSP/Protocol/Internal/Types/BaseSymbolInformation.hs

@@ -6,9 +6,11 @@
 module Language.LSP.Protocol.Internal.Types.BaseSymbolInformation where
 
 import Control.DeepSeq
+import Data.Hashable
 import GHC.Generics
 import qualified Data.Aeson as Aeson
 import qualified Data.Row.Aeson as Aeson
+import qualified Data.Row.Hashable as Hashable
 import qualified Data.Text
 import qualified Language.LSP.Protocol.Internal.Types.SymbolKind
 import qualified Language.LSP.Protocol.Internal.Types.SymbolTag
@@ -41,7 +43,7 @@ data BaseSymbolInformation = BaseSymbolInformation
   _containerName :: (Maybe Data.Text.Text)
   }
   deriving stock (Show, Eq, Ord, Generic)
-  deriving anyclass (NFData)
+  deriving anyclass (NFData, Hashable)
 
 instance Aeson.ToJSON BaseSymbolInformation where
   toJSON (BaseSymbolInformation arg0 arg1 arg2 arg3) = Aeson.object $ concat $  [["name" Aeson..= arg0]

lsp-types/generated/Language/LSP/Protocol/Internal/Types/CallHierarchyClientCapabilities.hs

@@ -6,9 +6,11 @@
 module Language.LSP.Protocol.Internal.Types.CallHierarchyClientCapabilities where
 
 import Control.DeepSeq
+import Data.Hashable
 import GHC.Generics
 import qualified Data.Aeson as Aeson
 import qualified Data.Row.Aeson as Aeson
+import qualified Data.Row.Hashable as Hashable
 import qualified Language.LSP.Protocol.Types.Common
 
 {-|
@@ -23,7 +25,7 @@ data CallHierarchyClientCapabilities = CallHierarchyClientCapabilities
   _dynamicRegistration :: (Maybe Bool)
   }
   deriving stock (Show, Eq, Ord, Generic)
-  deriving anyclass (NFData)
+  deriving anyclass (NFData, Hashable)
 
 instance Aeson.ToJSON CallHierarchyClientCapabilities where
   toJSON (CallHierarchyClientCapabilities arg0) = Aeson.object $ concat $  ["dynamicRegistration" Language.LSP.Protocol.Types.Common..=? arg0]

lsp-types/generated/Language/LSP/Protocol/Internal/Types/CallHierarchyIncomingCall.hs

@@ -6,9 +6,11 @@
 module Language.LSP.Protocol.Internal.Types.CallHierarchyIncomingCall where
 
 import Control.DeepSeq
+import Data.Hashable
 import GHC.Generics
 import qualified Data.Aeson as Aeson
 import qualified Data.Row.Aeson as Aeson
+import qualified Data.Row.Hashable as Hashable
 import qualified Language.LSP.Protocol.Internal.Types.CallHierarchyItem
 import qualified Language.LSP.Protocol.Internal.Types.Range
 import qualified Language.LSP.Protocol.Types.Common
@@ -30,7 +32,7 @@ data CallHierarchyIncomingCall = CallHierarchyIncomingCall
   _fromRanges :: [Language.LSP.Protocol.Internal.Types.Range.Range]
   }
   deriving stock (Show, Eq, Ord, Generic)
-  deriving anyclass (NFData)
+  deriving anyclass (NFData, Hashable)
 
 instance Aeson.ToJSON CallHierarchyIncomingCall where
   toJSON (CallHierarchyIncomingCall arg0 arg1) = Aeson.object $ concat $  [["from" Aeson..= arg0]

lsp-types/generated/Language/LSP/Protocol/Internal/Types/CallHierarchyIncomingCallsParams.hs

@@ -6,9 +6,11 @@
 module Language.LSP.Protocol.Internal.Types.CallHierarchyIncomingCallsParams where
 
 import Control.DeepSeq
+import Data.Hashable
 import GHC.Generics
 import qualified Data.Aeson as Aeson
 import qualified Data.Row.Aeson as Aeson
+import qualified Data.Row.Hashable as Hashable
 import qualified Language.LSP.Protocol.Internal.Types.CallHierarchyItem
 import qualified Language.LSP.Protocol.Internal.Types.ProgressToken
 import qualified Language.LSP.Protocol.Types.Common
@@ -34,7 +36,7 @@ data CallHierarchyIncomingCallsParams = CallHierarchyIncomingCallsParams
   _item :: Language.LSP.Protocol.Internal.Types.CallHierarchyItem.CallHierarchyItem
   }
   deriving stock (Show, Eq, Ord, Generic)
-  deriving anyclass (NFData)
+  deriving anyclass (NFData, Hashable)
 
 instance Aeson.ToJSON CallHierarchyIncomingCallsParams where
   toJSON (CallHierarchyIncomingCallsParams arg0 arg1 arg2) = Aeson.object $ concat $  ["workDoneToken" Language.LSP.Protocol.Types.Common..=? arg0