upgrade lsp

Author: kokobd

Diff for: cabal.project

@@ -65,13 +65,24 @@ source-repository-package
   tag: 7a0af7a8fd38045fd15fb13445bdcc7085325460
   -- https://github.com/tibbe/ekg-json/pull/12
 
--- Needed for ghcide-bench until a new release of lsp-test is out
+-- Remove me when a new version of lsp is released
 source-repository-package
   type:git
-  location: https://github.com/haskell/lsp
+  location: https://github.com/kokobd/lsp
+  subdir: lsp
+  tag: 80ebd816454a9e44d4cd93793ef3badc661b0f2f
+
+source-repository-package
+  type:git
+  location: https://github.com/kokobd/lsp
+  subdir: lsp-types
+  tag: 80ebd816454a9e44d4cd93793ef3badc661b0f2f
+
+source-repository-package
+  type:git
+  location: https://github.com/kokobd/lsp
   subdir: lsp-test
-  tag: c95eb06c70c35f1e13c37ed11a7d9e5b36bfa2e8
-  -- https://github.com/haskell/lsp/pull/450
+  tag: 80ebd816454a9e44d4cd93793ef3badc661b0f2f
 
 allow-newer:
   -- ghc-9.2

Diff for: ghcide/src/Development/IDE/Types/Location.hs

@@ -50,11 +50,7 @@ toNormalizedFilePath' "" = emptyFilePath
 toNormalizedFilePath' fp = LSP.toNormalizedFilePath fp
 
 emptyFilePath :: LSP.NormalizedFilePath
-#if MIN_VERSION_lsp_types(1,3,0)
-emptyFilePath = LSP.normalizedFilePath emptyPathUri ""
-#else
-emptyFilePath = LSP.NormalizedFilePath emptyPathUri ""
-#endif
+emptyFilePath = LSP.emptyNormalizedFilePath
 
 -- | We use an empty string as a filepath when we don’t have a file.
 -- However, haskell-lsp doesn’t support that in uriToFilePath and given

Diff for: hls-plugin-api/src/Ide/PluginUtils.hs

@@ -217,10 +217,7 @@ fullRange s = Range startPos endPos
         lastLine = fromIntegral $ length $ T.lines s
 
 subRange :: Range -> Range -> Bool
-subRange smallRange range = _start smallRange >= _start range && _end smallRange <= _end range
-
-positionInRange :: Position -> Range -> Bool
-positionInRange p (Range sp ep) = sp <= p && p < ep -- Range's end position is exclusive, see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#range
+subRange = isSubrangeOf
 
 -- ---------------------------------------------------------------------