Skip to content

Commit bde552b

Browse files
berbermanpepeiborraAilrunmergify[bot]
authored
Bump haskell-lsp to 0.23 (#1146)
* Bump haskell-lsp to 0.23 * Update extra-deps Co-authored-by: Pepe Iborra <[email protected]> Co-authored-by: Junyoung Clare Jang <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 5737f51 commit bde552b

17 files changed

+33
-23
lines changed

‎ghcide/ghcide.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ library
5454
Glob,
5555
haddock-library >= 1.8,
5656
hashable,
57-
haskell-lsp-types == 0.22.*,
58-
haskell-lsp == 0.22.*,
57+
haskell-lsp-types == 0.23.*,
58+
haskell-lsp == 0.23.*,
5959
hie-compat,
6060
hls-plugin-api >= 0.6,
6161
lens,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ mkCompl :: IdeOptions -> CompItem -> CompletionItem
157157
mkCompl IdeOptions{..} CI{compKind,insertText, importedFrom,typeText,label,docs, additionalTextEdits} =
158158
CompletionItem {_label = label,
159159
_kind = kind,
160-
_tags = List [],
160+
_tags = Nothing,
161161
_detail = (colon <>) <$> typeText,
162162
_documentation = documentation,
163163
_deprecated = Nothing,
@@ -237,27 +237,27 @@ mkNameCompItem origName origMod thingType isInfix docs !imp = CI{..}
237237

238238
mkModCompl :: T.Text -> CompletionItem
239239
mkModCompl label =
240-
CompletionItem label (Just CiModule) (List []) Nothing
240+
CompletionItem label (Just CiModule) Nothing Nothing
241241
Nothing Nothing Nothing Nothing Nothing Nothing Nothing
242242
Nothing Nothing Nothing Nothing Nothing
243243

244244
mkImportCompl :: T.Text -> T.Text -> CompletionItem
245245
mkImportCompl enteredQual label =
246-
CompletionItem m (Just CiModule) (List []) (Just label)
246+
CompletionItem m (Just CiModule) Nothing (Just label)
247247
Nothing Nothing Nothing Nothing Nothing Nothing Nothing
248248
Nothing Nothing Nothing Nothing Nothing
249249
where
250250
m = fromMaybe "" (T.stripPrefix enteredQual label)
251251

252252
mkExtCompl :: T.Text -> CompletionItem
253253
mkExtCompl label =
254-
CompletionItem label (Just CiKeyword) (List []) Nothing
254+
CompletionItem label (Just CiKeyword) Nothing Nothing
255255
Nothing Nothing Nothing Nothing Nothing Nothing Nothing
256256
Nothing Nothing Nothing Nothing Nothing
257257

258258
mkPragmaCompl :: T.Text -> T.Text -> CompletionItem
259259
mkPragmaCompl label insertText =
260-
CompletionItem label (Just CiKeyword) (List []) Nothing
260+
CompletionItem label (Just CiKeyword) Nothing Nothing
261261
Nothing Nothing Nothing Nothing Nothing (Just insertText) (Just Snippet)
262262
Nothing Nothing Nothing Nothing Nothing
263263

@@ -272,7 +272,7 @@ extendImportList name lDecl = let
272272
-- use to same start_pos to handle situation where we do not have latest edits due to caching of Rules
273273
new_range = Range new_start_pos new_start_pos
274274
-- we cannot wrap mapM_ inside (mapM_) but we need to wrap (<$)
275-
alpha = all isAlphaNum $ filter (\c -> c /= '_') name
275+
alpha = all isAlphaNum $ filter (/= '_') name
276276
result = if alpha then name ++ ", "
277277
else "(" ++ name ++ "), "
278278
in Just [TextEdit new_range (T.pack result)]

‎haskell-language-server.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ library
6161
, ghc
6262
, ghcide >=0.7
6363
, gitrev
64-
, haskell-lsp ^>=0.22
64+
, haskell-lsp ^>=0.23
6565
, hls-plugin-api >=0.6
6666
, hslogger
6767
, optparse-applicative
@@ -294,7 +294,7 @@ executable haskell-language-server
294294
, ghcide
295295
, hashable
296296
, haskell-language-server
297-
, haskell-lsp ^>=0.22
297+
, haskell-lsp ^>=0.23
298298
, lens
299299
, regex-tdfa
300300
, hslogger

‎hls-plugin-api/hls-plugin-api.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ library
3737
, containers
3838
, data-default
3939
, Diff
40-
, haskell-lsp ^>=0.22
40+
, haskell-lsp ^>=0.23
4141
, hashable
4242
, hslogger
4343
, lens

‎plugins/default/src/Ide/Plugin/Example.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ completion _lf _ide (CompletionParams _doc _pos _mctxt _mt)
212212
command xd
213213
label = "Example completion"
214214
kind = Nothing
215-
tags = List []
215+
tags = Nothing
216216
detail = Nothing
217217
documentation = Nothing
218218
deprecated = Nothing

‎plugins/default/src/Ide/Plugin/Example2.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ completion _lf _ide (CompletionParams _doc _pos _mctxt _mt)
206206
command xd
207207
label = "Example2 completion"
208208
kind = Nothing
209-
tags = List []
209+
tags = Nothing
210210
detail = Nothing
211211
documentation = Nothing
212212
deprecated = Nothing

‎plugins/default/src/Ide/Plugin/Pragmas.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ completion lspFuncs _ide complParams = do
126126
CompletionItem
127127
{ _label = p,
128128
_kind = Just CiKeyword,
129-
_tags = List [],
129+
_tags = Nothing,
130130
_detail = Nothing,
131131
_documentation = Nothing,
132132
_deprecated = Nothing,

‎plugins/tactics/hls-tactics-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ library
5757
, ghc-exactprint
5858
, ghc-source-gen
5959
, ghcide >=0.1
60-
, haskell-lsp ^>=0.22
60+
, haskell-lsp ^>=0.23
6161
, hls-plugin-api
6262
, hls-exactprint-utils
6363
, lens

‎stack-8.10.1.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ extra-deps:
4343
- stylish-haskell-0.12.2.0
4444
- semigroups-0.18.5
4545
- temporary-1.2.1.1
46+
- haskell-lsp-0.23.0.0
47+
- haskell-lsp-types-0.23.0.0
4648

4749
configure-options:
4850
ghcide:

‎stack-8.10.2.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ extra-deps:
3737
- stylish-haskell-0.12.2.0
3838
- semigroups-0.18.5
3939
- temporary-1.2.1.1
40+
- haskell-lsp-0.23.0.0
41+
- haskell-lsp-types-0.23.0.0
4042

4143
configure-options:
4244
ghcide:

‎stack-8.10.3.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ extra-deps:
3535
- stylish-haskell-0.12.2.0
3636
- semigroups-0.18.5
3737
- temporary-1.2.1.1
38+
- haskell-lsp-0.23.0.0
39+
- haskell-lsp-types-0.23.0.0
3840

3941
configure-options:
4042
ghcide:

‎stack-8.6.4.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ extra-deps:
4646
- haddock-api-2.22.0@rev:1
4747
- haddock-library-1.8.0
4848
- hashable-1.3.0.0
49-
- haskell-lsp-0.22.0.0
50-
- haskell-lsp-types-0.22.0.0
49+
- haskell-lsp-0.23.0.0
50+
- haskell-lsp-types-0.23.0.0
5151
- heapsize-0.3.0
5252
- hie-bios-0.7.1
5353
- hlint-3.2.3

‎stack-8.6.5.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ extra-deps:
4545
- haddock-api-2.22.0@rev:1
4646
- haddock-library-1.8.0
4747
- hashable-1.3.0.0
48-
- haskell-lsp-0.22.0.0
49-
- haskell-lsp-types-0.22.0.0
48+
- haskell-lsp-0.23.0.0
49+
- haskell-lsp-types-0.23.0.0
5050
- heapsize-0.3.0
5151
- hie-bios-0.7.1
5252
- hlint-3.2.3

‎stack-8.8.2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ extra-deps:
3838
- ghc-lib-parser-ex-8.10.0.17
3939
- ghc-trace-events-0.1.2.1
4040
- haddock-library-1.8.0
41-
- haskell-lsp-0.22.0.0
42-
- haskell-lsp-types-0.22.0.0
41+
- haskell-lsp-0.23.0.0
42+
- haskell-lsp-types-0.23.0.0
4343
- haskell-src-exts-1.21.1
4444
- heapsize-0.3.0
4545
- hie-bios-0.7.1

‎stack-8.8.3.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ extra-deps:
5656
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
5757
- stylish-haskell-0.12.2.0
5858
- temporary-1.2.1.1
59+
- haskell-lsp-0.23.0.0
60+
- haskell-lsp-types-0.23.0.0
5961

6062
configure-options:
6163
ghcide:

‎stack-8.8.4.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ extra-deps:
5454
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
5555
- stylish-haskell-0.12.2.0
5656
- temporary-1.2.1.1
57+
- haskell-lsp-0.23.0.0
58+
- haskell-lsp-types-0.23.0.0
5759

5860
configure-options:
5961
ghcide:

‎stack.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ extra-deps:
4545
- haddock-api-2.22.0@rev:1
4646
- haddock-library-1.8.0
4747
- hashable-1.3.0.0
48-
- haskell-lsp-0.22.0.0
49-
- haskell-lsp-types-0.22.0.0
48+
- haskell-lsp-0.23.0.0
49+
- haskell-lsp-types-0.23.0.0
5050
- heapsize-0.3.0
5151
- hie-bios-0.7.1
5252
- hlint-3.2.3

0 commit comments

Comments
 (0)