Update

Author: jhrcek

cabal.project

@@ -46,7 +46,7 @@ constraints:
 source-repository-package
   type:git
   location: https://github.com/haskell/lsp
-  tag: 1e5940b4c85d53f01831bca487f3cd0a9466d3de
+  tag: b3c18fe44124eedd1ce9138321e753b08784ddba
   subdir: lsp
   subdir: lsp-test
   subdir: lsp-types

haskell-language-server.cabal

@@ -609,7 +609,6 @@ test-suite hls-rename-plugin-tests
     , hls-test-utils             == 2.7.0.0
     , lens
     , lsp-types
-    , row-types
     , text
 
 -----------------------------
@@ -2126,7 +2125,6 @@ test-suite ghcide-tests
     , QuickCheck
     , random
     , regex-tdfa              ^>=1.3.1
-    , row-types
     , shake
     , sqlite-simple
     , stm

plugins/hls-rename-plugin/test/Main.hs

@@ -1,12 +1,11 @@
-{-# LANGUAGE OverloadedLabels  #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DisambiguateRecordFields #-}
+{-# LANGUAGE OverloadedStrings        #-}
 
 module Main (main) where
 
 import           Control.Lens               ((^.))
 import           Data.Aeson
 import qualified Data.Map                   as M
-import           Data.Row                   ((.+), (.==))
 import           Data.Text                  (Text, pack)
 import           Ide.Plugin.Config
 import qualified Ide.Plugin.Rename          as Rename
@@ -81,9 +80,11 @@ tests = testGroup "Rename"
         expectNoMoreDiagnostics 3 doc "typecheck"
 
         -- Update the document so it doesn't compile
-        let change = TextDocumentContentChangeEvent $ InL $ #range .== Range (Position 2 13) (Position 2 17)
-                                                         .+ #rangeLength .== Nothing
-                                                         .+ #text .== "A"
+        let change = TextDocumentContentChangeEvent $ InL TextDocumentContentChangePartial
+              { _range = Range (Position 2 13) (Position 2 17)
+              , _rangeLength = Nothing
+              , _text = "A"
+              }
         changeDoc doc [change]
         diags@(tcDiag : _) <- waitForDiagnosticsFrom doc
 
@@ -101,9 +102,11 @@ tests = testGroup "Rename"
           renameErr ^. L.message @?= "rename: Rule Failed: GetHieAst"
 
         -- Update the document so it compiles
-        let change' = TextDocumentContentChangeEvent $ InL $ #range .== Range (Position 2 13) (Position 2 14)
-                                                          .+ #rangeLength .== Nothing
-                                                          .+ #text .== "Int"
+        let change' = TextDocumentContentChangeEvent $  InL TextDocumentContentChangePartial
+              { _range = Range (Position 2 13) (Position 2 14)
+              , _rangeLength = Nothing
+              , _text = "Int"
+              }
         changeDoc doc [change']
         expectNoMoreDiagnostics 3 doc "typecheck"
 

plugins/hls-semantic-tokens-plugin/test/SemanticTokensTest.hs

@@ -9,8 +9,6 @@ import qualified Data.Aeson.KeyMap                  as KV
 import           Data.Default
 import           Data.Functor                       (void)
 import           Data.Map.Strict                    as Map hiding (map)
-import           Data.Row                           ((.==))
-import           Data.Row.Records                   ((.+))
 import           Data.String                        (fromString)
 import           Data.Text                          hiding (length, map,
                                                      unlines)