Change internal lens classes layout

Author: joyfulmantis

lsp-types/lsp-types.cabal

@@ -105,22 +105,21 @@ library
     Language.LSP.Protocol.Utils.SMethodMap
 
   other-modules:
+    Language.LSP.Protocol.Message.Lens
     Language.LSP.Protocol.Message.LspId
     Language.LSP.Protocol.Message.Meta
     Language.LSP.Protocol.Message.Method
     Language.LSP.Protocol.Message.Parsing
     Language.LSP.Protocol.Message.Registration
-    Language.LSP.Protocol.Message.RegistrationLens
     Language.LSP.Protocol.Message.Types
-    Language.LSP.Protocol.Message.TypesLens
     Language.LSP.Protocol.Types.Common
     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.Progress
     Language.LSP.Protocol.Types.SemanticTokens
-    Language.LSP.Protocol.Types.SemanticTokensLens
     Language.LSP.Protocol.Types.Singletons
     Language.LSP.Protocol.Types.Uri
     Language.LSP.Protocol.Types.Uri.OsPath

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

@@ -2,14 +2,11 @@
 module Language.LSP.Protocol.Lens (
   -- * Generated lens classes
     module Lens
-  -- Custom lets classes for Message.Types
+  -- Custom lets classes for Type
   , module TypesLens
-  -- Custom lens classes for Message.Registration
-  , module RegistrationLens
-  -- Custom lens classes for Types.SemanticToken
-  , module SemanticTokenLens) where
+  -- Custom lens classes for Message
+  , module MessageLens) where
 
 import Language.LSP.Protocol.Internal.Lens as Lens
-import Language.LSP.Protocol.Message.TypesLens as TypesLens
-import Language.LSP.Protocol.Message.RegistrationLens as RegistrationLens
-import Language.LSP.Protocol.Types.SemanticTokensLens as SemanticTokenLens
+import Language.LSP.Protocol.Message.Lens as MessageLens
+import Language.LSP.Protocol.Types.Lens as TypesLens

lsp-types/src/Language/LSP/Protocol/Message/TypesLens.hs renamed to lsp-types/src/Language/LSP/Protocol/Message/Lens.hs

@@ -1,11 +1,14 @@
 {-#LANGUAGE TemplateHaskell #-}
 
-module Language.LSP.Protocol.Message.TypesLens where
+module Language.LSP.Protocol.Message.Lens where
 
 import Language.LSP.Protocol.Internal.Lens
+import Language.LSP.Protocol.Message.Registration
 import Language.LSP.Protocol.Message.Types
 import           Control.Lens.TH
 
+makeFieldsNoPrefix ''TRegistration
+makeFieldsNoPrefix ''TUnregistration
 makeFieldsNoPrefix ''RequestMessage
 makeFieldsNoPrefix ''ResponseMessage
 makeFieldsNoPrefix ''NotificationMessage

lsp-types/src/Language/LSP/Protocol/Message/RegistrationLens.hs

@@ -1,6 +1,6 @@
 {-#LANGUAGE TemplateHaskell #-}
 
-module Language.LSP.Protocol.Types.SemanticTokensLens where
+module Language.LSP.Protocol.Types.Lens where
 
 import Language.LSP.Protocol.Internal.Lens
 import Language.LSP.Protocol.Types.SemanticTokens