Bump haskell-lsp to 0.23 (haskell#1146)

* Bump haskell-lsp to 0.23 * Update extra-deps Co-authored-by: Pepe Iborra <pepeiborra@gmail.com> Co-authored-by: Junyoung Clare Jang <jjc9310@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
pepeiborra · Jan 9, 2021 · d760652 · d760652
1 parent 9d02d88
commit d760652
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 23 deletions.
diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -54,8 +54,8 @@ library
         Glob,
         haddock-library >= 1.8,
         hashable,
-        haskell-lsp-types == 0.22.*,
-        haskell-lsp == 0.22.*,
+        haskell-lsp-types == 0.23.*,
+        haskell-lsp == 0.23.*,
         hie-compat,
         hls-plugin-api >= 0.6,
         lens,

diff --git a/ghcide/src/Development/IDE/Plugin/Completions/Logic.hs b/ghcide/src/Development/IDE/Plugin/Completions/Logic.hs
@@ -157,7 +157,7 @@ mkCompl :: IdeOptions -> CompItem -> CompletionItem
 mkCompl IdeOptions{..} CI{compKind,insertText, importedFrom,typeText,label,docs, additionalTextEdits} =
   CompletionItem {_label = label,
                   _kind = kind,
-                  _tags = List [],
+                  _tags = Nothing,
                   _detail = (colon <>) <$> typeText,
                   _documentation = documentation,
                   _deprecated = Nothing,
@@ -237,27 +237,27 @@ mkNameCompItem origName origMod thingType isInfix docs !imp = CI{..}
 
 mkModCompl :: T.Text -> CompletionItem
 mkModCompl label =
-  CompletionItem label (Just CiModule) (List []) Nothing
+  CompletionItem label (Just CiModule) Nothing Nothing
     Nothing Nothing Nothing Nothing Nothing Nothing Nothing
     Nothing Nothing Nothing Nothing Nothing
 
 mkImportCompl :: T.Text -> T.Text -> CompletionItem
 mkImportCompl enteredQual label =
-  CompletionItem m (Just CiModule) (List []) (Just label)
+  CompletionItem m (Just CiModule) Nothing (Just label)
     Nothing Nothing Nothing Nothing Nothing Nothing Nothing
     Nothing Nothing Nothing Nothing Nothing
   where
     m = fromMaybe "" (T.stripPrefix enteredQual label)
 
 mkExtCompl :: T.Text -> CompletionItem
 mkExtCompl label =
-  CompletionItem label (Just CiKeyword) (List []) Nothing
+  CompletionItem label (Just CiKeyword) Nothing Nothing
     Nothing Nothing Nothing Nothing Nothing Nothing Nothing
     Nothing Nothing Nothing Nothing Nothing
 
 mkPragmaCompl :: T.Text -> T.Text -> CompletionItem
 mkPragmaCompl label insertText =
-  CompletionItem label (Just CiKeyword) (List []) Nothing
+  CompletionItem label (Just CiKeyword) Nothing Nothing
     Nothing Nothing Nothing Nothing Nothing (Just insertText) (Just Snippet)
     Nothing Nothing Nothing Nothing Nothing
 
@@ -272,7 +272,7 @@ extendImportList name lDecl = let
             -- use to same start_pos to handle situation where we do not have latest edits due to caching of Rules
             new_range = Range new_start_pos new_start_pos
             -- we cannot wrap mapM_ inside (mapM_) but we need to wrap (<$)
-            alpha = all isAlphaNum $ filter (\c -> c /= '_') name
+            alpha = all isAlphaNum $ filter (/= '_') name
             result = if alpha then name ++ ", "
                 else "(" ++ name ++ "), "
             in Just [TextEdit new_range (T.pack result)]

diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -61,7 +61,7 @@ library
     , ghc
     , ghcide                >=0.7
     , gitrev
-    , haskell-lsp           ^>=0.22
+    , haskell-lsp           ^>=0.23
     , hls-plugin-api        >=0.6
     , hslogger
     , optparse-applicative
@@ -294,7 +294,7 @@ executable haskell-language-server
     , ghcide
     , hashable
     , haskell-language-server
-    , haskell-lsp              ^>=0.22
+    , haskell-lsp              ^>=0.23
     , lens
     , regex-tdfa
     , hslogger

diff --git a/hls-plugin-api/hls-plugin-api.cabal b/hls-plugin-api/hls-plugin-api.cabal
@@ -37,7 +37,7 @@ library
     , containers
     , data-default
     , Diff
-    , haskell-lsp           ^>=0.22
+    , haskell-lsp           ^>=0.23
     , hashable
     , hslogger
     , lens

diff --git a/plugins/default/src/Ide/Plugin/Example.hs b/plugins/default/src/Ide/Plugin/Example.hs
@@ -212,7 +212,7 @@ completion _lf _ide (CompletionParams _doc _pos _mctxt _mt)
                            command xd
         label = "Example completion"
         kind = Nothing
-        tags = List []
+        tags = Nothing
         detail = Nothing
         documentation = Nothing
         deprecated = Nothing

diff --git a/plugins/default/src/Ide/Plugin/Example2.hs b/plugins/default/src/Ide/Plugin/Example2.hs
@@ -206,7 +206,7 @@ completion _lf _ide (CompletionParams _doc _pos _mctxt _mt)
                            command xd
         label = "Example2 completion"
         kind = Nothing
-        tags = List []
+        tags = Nothing
         detail = Nothing
         documentation = Nothing
         deprecated = Nothing

diff --git a/plugins/default/src/Ide/Plugin/Pragmas.hs b/plugins/default/src/Ide/Plugin/Pragmas.hs
@@ -126,7 +126,7 @@ completion lspFuncs _ide complParams = do
                     CompletionItem
                       { _label = p,
                         _kind = Just CiKeyword,
-                        _tags = List [],
+                        _tags = Nothing,
                         _detail = Nothing,
                         _documentation = Nothing,
                         _deprecated = Nothing,

diff --git a/plugins/tactics/hls-tactics-plugin.cabal b/plugins/tactics/hls-tactics-plugin.cabal
@@ -57,7 +57,7 @@ library
     , ghc-exactprint
     , ghc-source-gen
     , ghcide         >=0.1
-    , haskell-lsp    ^>=0.22
+    , haskell-lsp    ^>=0.23
     , hls-plugin-api
     , hls-exactprint-utils
     , lens

diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml
@@ -43,6 +43,8 @@ extra-deps:
   - stylish-haskell-0.12.2.0
   - semigroups-0.18.5
   - temporary-1.2.1.1
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
 
 configure-options:
   ghcide:

diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
@@ -37,6 +37,8 @@ extra-deps:
   - stylish-haskell-0.12.2.0
   - semigroups-0.18.5
   - temporary-1.2.1.1
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
 
 configure-options:
   ghcide:

diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
@@ -35,6 +35,8 @@ extra-deps:
   - stylish-haskell-0.12.2.0
   - semigroups-0.18.5
   - temporary-1.2.1.1
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
 
 configure-options:
   ghcide:

diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
@@ -46,8 +46,8 @@ extra-deps:
   - haddock-api-2.22.0@rev:1
   - haddock-library-1.8.0
   - hashable-1.3.0.0
-  - haskell-lsp-0.22.0.0
-  - haskell-lsp-types-0.22.0.0
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
   - heapsize-0.3.0
   - hie-bios-0.7.1
   - hlint-3.2.3

diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -45,8 +45,8 @@ extra-deps:
   - haddock-api-2.22.0@rev:1
   - haddock-library-1.8.0
   - hashable-1.3.0.0
-  - haskell-lsp-0.22.0.0
-  - haskell-lsp-types-0.22.0.0
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
   - heapsize-0.3.0
   - hie-bios-0.7.1
   - hlint-3.2.3

diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml
@@ -38,8 +38,8 @@ extra-deps:
   - ghc-lib-parser-ex-8.10.0.17
   - ghc-trace-events-0.1.2.1
   - haddock-library-1.8.0
-  - haskell-lsp-0.22.0.0
-  - haskell-lsp-types-0.22.0.0
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
   - haskell-src-exts-1.21.1
   - heapsize-0.3.0
   - hie-bios-0.7.1

diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -56,6 +56,8 @@ extra-deps:
   #   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
   - stylish-haskell-0.12.2.0
   - temporary-1.2.1.1
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
 
 configure-options:
   ghcide:

diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -54,6 +54,8 @@ extra-deps:
   #   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
   - stylish-haskell-0.12.2.0
   - temporary-1.2.1.1
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
 
 configure-options:
   ghcide:

diff --git a/stack.yaml b/stack.yaml
@@ -45,8 +45,8 @@ extra-deps:
   - haddock-api-2.22.0@rev:1
   - haddock-library-1.8.0
   - hashable-1.3.0.0
-  - haskell-lsp-0.22.0.0
-  - haskell-lsp-types-0.22.0.0
+  - haskell-lsp-0.23.0.0
+  - haskell-lsp-types-0.23.0.0
   - heapsize-0.3.0
   - hie-bios-0.7.1
   - hlint-3.2.3