Skip to content

[#87] Fix completion via ghcide's getCompletionsLSP #107

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 1 commit into from
May 13, 2020
Merged

[#87] Fix completion via ghcide's getCompletionsLSP #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Ide/Plugin.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ makeCompletions sps lf ideState params@(CompletionParams (TextDocumentIdentifier
case mprefix of
Nothing -> return $ Right $ Completions $ List []
Just _prefix -> do
mhs <- mapM (\(_,p) -> p ideState params) sps
mhs <- mapM (\(_,p) -> p lf ideState params) sps
case rights mhs of
[] -> return $ Left $ responseError $ T.pack $ show $ lefts mhs
hs -> return $ Right $ combine hs
Expand Down
2 changes: 1 addition & 1 deletion src/Ide/Plugin/Example.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ symbols _lf _ide (DocumentSymbolParams _doc _mt)
-- ---------------------------------------------------------------------

completion :: CompletionProvider
completion _ide (CompletionParams _doc _pos _mctxt _mt)
completion _lf _ide (CompletionParams _doc _pos _mctxt _mt)
= pure $ Right $ Completions $ List [r]
where
r = CompletionItem label kind tags detail documentation deprecated preselect
Expand Down
2 changes: 1 addition & 1 deletion src/Ide/Plugin/Example2.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ symbols _lf _ide (DocumentSymbolParams _doc _mt)
-- ---------------------------------------------------------------------

completion :: CompletionProvider
completion _ide (CompletionParams _doc _pos _mctxt _mt)
completion _lf _ide (CompletionParams _doc _pos _mctxt _mt)
= pure $ Right $ Completions $ List [r]
where
r = CompletionItem label kind tags detail documentation deprecated preselect
Expand Down
3 changes: 2 additions & 1 deletion src/Ide/Plugin/GhcIde.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Development.IDE.Core.Service
import Development.IDE.LSP.HoverDefinition
import Development.IDE.LSP.Outline
import Development.IDE.Plugin.CodeAction
import Development.IDE.Plugin.Completions
import Development.IDE.Types.Logger
import Ide.Plugin
import Ide.Types
Expand All @@ -29,7 +30,7 @@ descriptor plId = PluginDescriptor
, pluginHoverProvider = Just hover'
, pluginSymbolsProvider = Just symbolsProvider
, pluginFormattingProvider = Nothing
, pluginCompletionProvider = Nothing
, pluginCompletionProvider = Just getCompletionsLSP
}

-- ---------------------------------------------------------------------
Expand Down
10 changes: 6 additions & 4 deletions src/Ide/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ type CodeActionProvider = LSP.LspFuncs Config
-> CodeActionContext
-> IO (Either ResponseError (List CAResult))

type CompletionProvider = LSP.LspFuncs Config
-> IdeState
-> CompletionParams
-> IO (Either ResponseError CompletionResponseResult)



type CodeLensProvider = LSP.LspFuncs Config
-> IdeState
Expand Down Expand Up @@ -144,10 +150,6 @@ type ExecuteCommandProvider = IdeState

newtype WithSnippets = WithSnippets Bool

type CompletionProvider = IdeState
-> CompletionParams
-> IO (Either ResponseError CompletionResponseResult)

-- ---------------------------------------------------------------------

newtype PluginId = PluginId T.Text
Expand Down