Implement michaelpj's suggestions

Author: joyfulmantis

lsp-types/lsp-types.cabal

@@ -115,12 +115,12 @@ library
     Language.LSP.Protocol.Message.Registration
     Language.LSP.Protocol.Message.Types
     Language.LSP.Protocol.Types.Common
-    Language.LSP.Protocol.Types.CustomInstances
     Language.LSP.Protocol.Types.Edit
     Language.LSP.Protocol.Types.Lens
     Language.LSP.Protocol.Types.Location
     Language.LSP.Protocol.Types.LspEnum
     Language.LSP.Protocol.Types.MarkupContent
+    Language.LSP.Protocol.Types.Orphans
     Language.LSP.Protocol.Types.Progress
     Language.LSP.Protocol.Types.SemanticTokens
     Language.LSP.Protocol.Types.Singletons

lsp-types/src/Language/LSP/Protocol/Types.hs

@@ -22,8 +22,8 @@ module Language.LSP.Protocol.Types (
   , module SemanticTokens
   -- * Main LSP types and functions
   , module Generated
-  -- ** Custom instances for the generated types
-  , module CustomInstances
+  -- ** Orphan instances for the generated types
+  , module Orphans
   ) where
 
 import Language.LSP.Protocol.Internal.Types as Generated
@@ -37,4 +37,4 @@ import Language.LSP.Protocol.Types.Singletons as Singletons
 import Language.LSP.Protocol.Types.Uri as Uri
 import Language.LSP.Protocol.Types.Uri.OsPath as Uri
 import Language.LSP.Protocol.Types.Edit as Edits
-import Language.LSP.Protocol.Types.CustomInstances as CustomInstances
+import Language.LSP.Protocol.Types.Orphans as Orphans

lsp-types/src/Language/LSP/Protocol/Types/Common.hs

@@ -128,6 +128,7 @@ maybeToNull :: Maybe a -> a |? Null
 maybeToNull (Just x) = InL x
 maybeToNull Nothing  = InR Null
 
+-- This is equivalent to the instance for 'Maybe s'
 instance Semigroup s => Semigroup (s |? Null) where
   InL x <> InL y = InL (x <> y)
   InL x <> InR _ = InL x

lsp-types/src/Language/LSP/Protocol/Types/CustomInstances.hs renamed to lsp-types/src/Language/LSP/Protocol/Types/Orphans.hs

@@ -1,27 +1,20 @@
 {-# OPTIONS_GHC -Wno-orphans #-}
-module Language.LSP.Protocol.Types.CustomInstances where
+module Language.LSP.Protocol.Types.Orphans where
 
 import           Language.LSP.Protocol.Internal.Types
 import           Data.Default
-import           Data.Hashable
 import           Data.Semigroup                ()
 
 instance Semigroup WorkspaceEdit where
   (WorkspaceEdit a b c) <> (WorkspaceEdit a' b' c') = WorkspaceEdit (a <> a') (b <> b') (c <> c')
 instance Monoid WorkspaceEdit where
   mempty = WorkspaceEdit Nothing Nothing Nothing
 
-instance Hashable Location
-instance Hashable Range
-instance Hashable Position
-
 instance Default ClientCapabilities where
-    def = ClientCapabilities (Just def) (Just def) (Just def) (Just def) (Just def) Nothing
-
+    def = ClientCapabilities def def def def def Nothing
 instance Default WorkspaceClientCapabilities
 instance Default TextDocumentClientCapabilities
 instance Default NotebookDocumentClientCapabilities where
-    def = NotebookDocumentClientCapabilities def
 instance Default NotebookDocumentSyncClientCapabilities
 instance Default WindowClientCapabilities
 instance Default GeneralClientCapabilities