Skip to content

Bump haskell-lsp to 0.23 #1146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 6, 2021
Merged

Bump haskell-lsp to 0.23 #1146

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ceff4ce
Bump haskell-lsp to 0.23
berberman Jan 2, 2021
fc380c1
Merge branch 'master' into lsp-0.23
berberman Jan 2, 2021
58c756d
Merge branch 'master' into lsp-0.23
pepeiborra Jan 2, 2021
c481355
Merge branch 'master' into lsp-0.23
berberman Jan 4, 2021
53e6c15
Merge branch 'master' into lsp-0.23
berberman Jan 5, 2021
5e095ab
Merge branch 'master' into lsp-0.23
Ailrun Jan 6, 2021
5f69ff1
Update extra-deps
berberman Jan 6, 2021
639c4d0
Merge branch 'master' into lsp-0.23
mergify[bot] Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ghcide/ghcide.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,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,
lens,
Expand Down
12 changes: 6 additions & 6 deletions ghcide/src/Development/IDE/Plugin/Completions/Logic.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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

Expand All @@ -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)]
Expand Down
4 changes: 2 additions & 2 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ library
, ghc
, ghcide >=0.6.0.1
, gitrev
, haskell-lsp ^>=0.22
, haskell-lsp ^>=0.23
, hls-plugin-api >=0.5
, hslogger
, optparse-applicative
Expand Down Expand Up @@ -283,7 +283,7 @@ executable haskell-language-server
, ghcide
, hashable
, haskell-language-server
, haskell-lsp ^>=0.22
, haskell-lsp ^>=0.23
, lens
, regex-tdfa
, hslogger
Expand Down
2 changes: 1 addition & 1 deletion hls-plugin-api/hls-plugin-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ library
, containers
, data-default
, Diff
, haskell-lsp ^>=0.22
, haskell-lsp ^>=0.23
, hashable
, hslogger
, lens
Expand Down
2 changes: 1 addition & 1 deletion plugins/default/src/Ide/Plugin/Example.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/default/src/Ide/Plugin/Example2.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/default/src/Ide/Plugin/Pragmas.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/tactics/hls-tactics-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ library
, ghc-exactprint
, ghc-source-gen
, ghcide >=0.1
, haskell-lsp ^>=0.22
, haskell-lsp ^>=0.23
, hls-plugin-api
, lens
, mtl
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,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
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,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
Expand Down
4 changes: 2 additions & 2 deletions stack-8.8.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,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
Expand Down
4 changes: 2 additions & 2 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,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
Expand Down