Upgrade to latest lsp/lsp-types/lsp-test

cabal.project

@@ -56,6 +56,14 @@ source-repository-package
   tag: 7a0af7a8fd38045fd15fb13445bdcc7085325460
 -- END DELETE
 
+source-repository-package
+  type:git
+  location: https://github.com/haskell/lsp
+  tag: 1e5940b4c85d53f01831bca487f3cd0a9466d3de
+  subdir: lsp
+  subdir: lsp-test
+  subdir: lsp-types
+
 if impl(ghc >= 9.1)
   -- ekg packagess are old and unmaintained, but we
   -- don't rely on them for the mainline build, so

ghcide-bench/src/Experiments.hs

@@ -2,7 +2,6 @@
 {-# LANGUAGE GADTs              #-}
 {-# LANGUAGE ImplicitParams     #-}
 {-# LANGUAGE ImpredicativeTypes #-}
-{-# LANGUAGE OverloadedLabels   #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# OPTIONS_GHC -Wno-deprecations -Wno-unticked-promoted-constructors #-}
 
@@ -43,14 +42,12 @@ import           Data.Either                        (fromRight)
 import           Data.List
 import           Data.Maybe
 import           Data.Proxy
-import           Data.Row                           hiding (switch)
 import           Data.Text                          (Text)
 import qualified Data.Text                          as T
 import           Data.Version
 import           Development.IDE.Plugin.Test
 import           Development.IDE.Test.Diagnostic
-import           Development.Shake                  (CmdOption (Cwd, FileStdout),
-                                                     cmd_)
+import           Development.Shake                  (CmdOption (Cwd), cmd_)
 import           Experiments.Types
 import           Language.LSP.Protocol.Capabilities
 import qualified Language.LSP.Protocol.Lens         as L
@@ -72,15 +69,19 @@ import           Text.Printf
 
 charEdit :: Position -> TextDocumentContentChangeEvent
 charEdit p =
-    TextDocumentContentChangeEvent $ InL $ #range .== Range p p
-                                        .+ #rangeLength .== Nothing
-                                        .+ #text .== "a"
+    TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+        { _range = Range p p
+        , _rangeLength = Nothing
+        , _text = "a"
+        }
 
 headerEdit :: TextDocumentContentChangeEvent
 headerEdit =
-    TextDocumentContentChangeEvent $ InL $ #range .== Range (Position 0 0) (Position 0 0)
-                                        .+ #rangeLength .== Nothing
-                                        .+ #text .== "-- header comment \n"
+    TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+        { _range = Range (Position 0 0) (Position 0 0)
+        , _rangeLength = Nothing
+        , _text = "-- header comment \n"
+        }
 
 data DocumentPositions = DocumentPositions {
     -- | A position that can be used to generate non null goto-def and completion responses
@@ -241,9 +242,11 @@ experiments =
       benchWithSetup
         "hole fit suggestions"
         ( mapM_ $ \DocumentPositions{..} -> do
-            let edit = TextDocumentContentChangeEvent $ InL $ #range .== Range bottom bottom
-                                                           .+ #rangeLength .== Nothing
-                                                           .+ #text .== t
+            let edit = TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+                  { _range = Range bottom bottom
+                  , _rangeLength = Nothing
+                  , _text = t
+                  }
                 bottom = Position maxBound 0
                 t = T.unlines
                     [""
@@ -271,9 +274,11 @@ experiments =
       benchWithSetup
         "eval execute single-line code lens"
         ( mapM_ $ \DocumentPositions{..} -> do
-            let edit = TextDocumentContentChangeEvent $ InL $ #range .== Range bottom bottom
-                                                           .+ #rangeLength .== Nothing
-                                                           .+ #text .== t
+            let edit = TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+                  { _range = Range bottom bottom
+                  , _rangeLength = Nothing
+                  , _text = t
+                  }
                 bottom = Position maxBound 0
                 t = T.unlines
                     [ ""
@@ -296,9 +301,11 @@ experiments =
       benchWithSetup
         "eval execute multi-line code lens"
         ( mapM_ $ \DocumentPositions{..} -> do
-            let edit = TextDocumentContentChangeEvent $ InL $ #range .== Range bottom bottom
-                                                           .+ #rangeLength .== Nothing
-                                                           .+ #text .== t
+            let edit = TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+                  { _range = Range bottom bottom
+                  , _rangeLength = Nothing
+                  , _text = t
+                  }
                 bottom = Position maxBound 0
                 t = T.unlines
                     [ ""
@@ -552,7 +559,7 @@ runBenchmarksFun dir allBenchmarks = do
     lspTestCaps =
       fullCaps
         & (L.window . _Just) .~ WindowClientCapabilities (Just True) Nothing Nothing
-        & (L.textDocument . _Just . L.codeAction . _Just . L.resolveSupport . _Just) .~ (#properties .== ["edit"])
+        & (L.textDocument . _Just . L.codeAction . _Just . L.resolveSupport . _Just) .~ (ClientCodeActionResolveOptions ["edit"])
         & (L.textDocument . _Just . L.codeAction . _Just . L.dataSupport . _Just) .~ True
 
 showMs :: Seconds -> String
@@ -756,10 +763,12 @@ setupDocumentContents config =
 
         -- Setup the special positions used by the experiments
         lastLine <- fromIntegral . length . T.lines <$> documentContents doc
-        changeDoc doc [TextDocumentContentChangeEvent $ InL
-                        $ #range .== Range (Position lastLine 0) (Position lastLine 0)
-                       .+ #rangeLength .== Nothing
-                       .+ #text .== T.unlines [ "_hygienic = \"hygienic\"" ]]
+        changeDoc doc [TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+                        { _range = Range (Position lastLine 0) (Position lastLine 0)
+                        , _rangeLength = Nothing
+                        , _text = T.unlines [ "_hygienic = \"hygienic\"" ]
+                        }
+                      ]
         let
         -- Points to a string in the target file,
         -- convenient for hygienic edits

ghcide/ghcide.cabal

@@ -347,7 +347,6 @@ test-suite ghcide-tests
     , QuickCheck
     , random
     , regex-tdfa              ^>=1.3.1
-    , row-types
     , shake
     , sqlite-simple
     , stm

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

@@ -1,4 +1,3 @@
-{-# LANGUAGE OverloadedLabels #-}
 -- Copyright (c) 2019 The DAML Authors. All rights reserved.
 -- SPDX-License-Identifier: Apache-2.0
 module Development.IDE.Core.PositionMapping
@@ -25,13 +24,15 @@ module Development.IDE.Core.PositionMapping
   ) where
 
 import           Control.DeepSeq
+import           Control.Lens                ((^.))
 import           Control.Monad
 import           Data.Algorithm.Diff
 import           Data.Bifunctor
 import           Data.List
 import           Data.Row
 import qualified Data.Text                   as T
 import qualified Data.Vector.Unboxed         as V
+import qualified Language.LSP.Protocol.Lens  as L
 import           Language.LSP.Protocol.Types (Position (Position),
                                               Range (Range),
                                               TextDocumentContentChangeEvent (TextDocumentContentChangeEvent),
@@ -131,8 +132,8 @@ addOldDelta delta (PositionMapping pm) = PositionMapping (composeDelta pm delta)
 -- that was what was done with lsp* 1.6 packages
 applyChange :: PositionDelta -> TextDocumentContentChangeEvent -> PositionDelta
 applyChange PositionDelta{..} (TextDocumentContentChangeEvent (InL x)) = PositionDelta
-    { toDelta = toCurrent (x .! #range) (x .! #text) <=< toDelta
-    , fromDelta = fromDelta <=< fromCurrent (x .! #range) (x .! #text)
+    { toDelta = toCurrent (x ^. L.range) (x ^. L.text) <=< toDelta
+    , fromDelta = fromDelta <=< fromCurrent (x ^. L.range) (x ^. L.text)
     }
 applyChange posMapping _ = posMapping
 

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

@@ -2,7 +2,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs                 #-}
 {-# LANGUAGE MultiWayIf            #-}
-{-# LANGUAGE OverloadedLabels      #-}
 
 -- Mostly taken from "haskell-ide-engine"
 module Development.IDE.Plugin.Completions.Logic (
@@ -530,7 +529,7 @@ toggleSnippets ClientCapabilities {_textDocument} CompletionsConfig{..} =
   removeSnippetsWhen (not $ enableSnippets && supported)
   where
     supported =
-      Just True == (_textDocument >>= _completion >>= view L.completionItem >>= (\x -> x .! #snippetSupport))
+      Just True == (_textDocument >>= _completion >>= view L.completionItem >>= view L.snippetSupport)
 
 toggleAutoExtend :: CompletionsConfig -> CompItem -> CompItem
 toggleAutoExtend CompletionsConfig{enableAutoExtend=False} x = x {additionalTextEdits = Nothing}

ghcide/test/exe/CompletionTests.hs

@@ -1,6 +1,5 @@
 
-{-# LANGUAGE GADTs            #-}
-{-# LANGUAGE OverloadedLabels #-}
+{-# LANGUAGE GADTs #-}
 
 module CompletionTests (tests) where
 
@@ -11,7 +10,6 @@ import           Control.Monad.IO.Class         (liftIO)
 import           Data.Default
 import           Data.List.Extra
 import           Data.Maybe
-import           Data.Row
 import qualified Data.Text                      as T
 import           Development.IDE.GHC.Compat     (GhcVersion (..), ghcVersion)
 import           Development.IDE.Test           (waitForTypecheck)
@@ -190,7 +188,7 @@ localCompletionTests = [
         doc <- createDoc "A.hs" "haskell" $ src "AAA"
         void $ waitForTypecheck doc
         let editA rhs =
-                changeDoc doc [TextDocumentContentChangeEvent . InR . (.==) #text $ src rhs]
+                changeDoc doc [TextDocumentContentChangeEvent . InR . TextDocumentContentChangeWholeDocument $ src rhs]
         editA "AAAA"
         void $ waitForTypecheck doc
         editA "AAAAA"

ghcide/test/exe/CradleTests.hs

@@ -1,12 +1,10 @@
 
-{-# LANGUAGE GADTs            #-}
-{-# LANGUAGE OverloadedLabels #-}
+{-# LANGUAGE GADTs #-}
 
 module CradleTests (tests) where
 
 import           Control.Applicative.Combinators
 import           Control.Monad.IO.Class          (liftIO)
-import           Data.Row
 import qualified Data.Text                       as T
 import           Development.IDE.GHC.Compat      (GhcVersion (..))
 import           Development.IDE.GHC.Util
@@ -63,7 +61,7 @@ loadCradleOnlyonce = testGroup "load cradle only once"
             doc <- createDoc "B.hs" "haskell" "module B where\nimport Data.Foo"
             msgs <- someTill (skipManyTill anyMessage cradleLoadedMessage) (skipManyTill anyMessage (message SMethod_TextDocumentPublishDiagnostics))
             liftIO $ length msgs @?= 1
-            changeDoc doc [TextDocumentContentChangeEvent . InR . (.==) #text $ "module B where\nimport Data.Maybe"]
+            changeDoc doc [TextDocumentContentChangeEvent . InR . TextDocumentContentChangeWholeDocument $ "module B where\nimport Data.Maybe"]
             msgs <- manyTill (skipManyTill anyMessage cradleLoadedMessage) (skipManyTill anyMessage (message SMethod_TextDocumentPublishDiagnostics))
             liftIO $ length msgs @?= 0
             _ <- createDoc "A.hs" "haskell" "module A where\nimport LoadCradleBar"
@@ -222,9 +220,11 @@ sessionDepsArePickedUp = testSession'
         [FileEvent (filePathToUri $ dir </> "hie.yaml") FileChangeType_Changed ]
     -- Send change event.
     let change =
-          TextDocumentContentChangeEvent $ InL $ #range .== Range (Position 4 0) (Position 4 0)
-                                              .+ #rangeLength .== Nothing
-                                              .+ #text .== "\n"
+          TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+              { _range = Range (Position 4 0) (Position 4 0)
+              , _rangeLength = Nothing
+              , _text = "\n"
+              }
     changeDoc doc [change]
     -- Now no errors.
     expectDiagnostics [("Foo.hs", [])]

ghcide/test/exe/DependentFileTest.hs

@@ -1,11 +1,9 @@
 
-{-# LANGUAGE GADTs            #-}
-{-# LANGUAGE OverloadedLabels #-}
+{-# LANGUAGE GADTs #-}
 
 module DependentFileTest (tests) where
 
 import           Control.Monad.IO.Class         (liftIO)
-import           Data.Row
 import qualified Data.Text                      as T
 import           Development.IDE.Test           (expectDiagnostics)
 import           Development.IDE.Types.Location
@@ -51,8 +49,10 @@ tests = testGroup "addDependentFile"
             [FileEvent (filePathToUri "dep-file.txt") FileChangeType_Changed ]
 
         -- Modifying Baz will now trigger Foo to be rebuilt as well
-        let change = TextDocumentContentChangeEvent $ InL $ #range .== Range (Position 2 0) (Position 2 6)
-                                                         .+ #rangeLength .== Nothing
-                                                         .+ #text .== "f = ()"
+        let change = TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+                { _range = Range (Position 2 0) (Position 2 6)
+                , _rangeLength = Nothing
+                , _text = "f = ()"
+                }
         changeDoc doc [change]
         expectDiagnostics [("Foo.hs", [])]