Add lenses

Author: michaelpj

lsp/example/Reactor.hs

@@ -282,15 +282,15 @@ handle logger = mconcat
           doc = params ^. J.textDocument
           (J.List diags) = params ^. J.context . J.diagnostics
           -- makeCommand only generates commands for diagnostics whose source is us
-          makeCommand (J.Diagnostic (J.Range start _) _s _c (Just "lsp-hello") _m _t _l) = [J.Command title cmd cmdparams]
+          makeCommand (J.Diagnostic (J.Range s _) _s _c (Just "lsp-hello") _m _t _l) = [J.Command title cmd cmdparams]
             where
               title = "Apply LSP hello command:" <> head (T.lines _m)
               -- NOTE: the cmd needs to be registered via the InitializeResponse message. See lspOptions above
               cmd = "lsp-hello-command"
               -- need 'file' and 'start_pos'
               args = J.List
                       [ J.object [("file",     J.object [("textDocument",J.toJSON doc)])]
-                      , J.object [("start_pos",J.object [("position",    J.toJSON start)])]
+                      , J.object [("start_pos",J.object [("position",    J.toJSON s)])]
                       ]
               cmdparams = Just args
           makeCommand (J.Diagnostic _r _s _c _source _m _t _l) = []

lsp/src/Language/LSP/VFS.hs

@@ -46,9 +46,13 @@ module Language.LSP.VFS
 
   -- * Positions and transformations
   , CodePointPosition (..)
+  , line
+  , character
   , codePointPositionToPosition
   , positionToCodePointPosition
   , CodePointRange (..)
+  , start
+  , end
   , codePointRangeToRange
   , rangeToCodePointRange
 
@@ -80,7 +84,7 @@ import           Data.Maybe
 import qualified Data.Text.Rope as URope
 import           Data.Text.Utf16.Rope ( Rope )
 import qualified Data.Text.Utf16.Rope as Rope
-import           Data.Text.Prettyprint.Doc
+import           Data.Text.Prettyprint.Doc hiding (line)
 import qualified Language.LSP.Types           as J
 import qualified Language.LSP.Types.Lens      as J
 import           System.FilePath
@@ -373,6 +377,9 @@ data CodePointRange =
     , _end   :: CodePointPosition -- ^ The range's end position.
     } deriving (Show, Read, Eq, Ord)
 
+makeFieldsNoPrefix ''CodePointPosition
+makeFieldsNoPrefix ''CodePointRange
+
 {- Note [Converting between code points and code units]
 This is inherently a somewhat expensive operation, but we take some care to minimize the cost.
 In particular, we use the good asymptotics of 'Rope' to our advantage: