Skip to content

Limit completions to top 40 #1218

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 11 commits into from
Jan 18, 2021
Merged

Limit completions to top 40 #1218

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c9e22b7
Limit completions to top 20
pepeiborra Jan 17, 2021
e9c2284
Simplify (thanks Neil!)
pepeiborra Jan 17, 2021
630195e
Magic constant explained and increased to 40
pepeiborra Jan 17, 2021
646a691
Add test
pepeiborra Jan 17, 2021
6200a4c
Turn maxCompletions into config
pepeiborra Jan 17, 2021
6bd22a1
Fix some inaccuracies in tests
pepeiborra Jan 17, 2021
728350a
document haskell.maxCompletions
pepeiborra Jan 17, 2021
79bfb44
Merge branch 'master' into top-20-completions
pepeiborra Jan 17, 2021
dfc41bc
Fix another test
pepeiborra Jan 17, 2021
2790bd2
Merge remote-tracking branch 'upstream/master' into top-20-completions
pepeiborra Jan 17, 2021
125a4f3
Merge branch 'master' into top-20-completions
mergify[bot] Jan 18, 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
10 changes: 9 additions & 1 deletion ghcide/src/Development/IDE/Plugin/Completions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,19 @@ getCompletionsLSP lsp ide
(Just pfix', _) -> do
let clientCaps = clientCapabilities $ shakeExtras ide
snippets <- WithSnippets . completionSnippetsOn <$> getClientConfig lsp
Completions . List <$> getCompletions ideOpts cci' parsedMod bindMap pfix' clientCaps snippets
allCompletions <- getCompletions ideOpts cci' parsedMod bindMap pfix' clientCaps snippets
let topCompletions = List $ take 20 allCompletions
isComplete = allCompletions `longerThan` 20
pure $ CompletionList (CompletionListType isComplete topCompletions)
_ -> return (Completions $ List [])
_ -> return (Completions $ List [])
_ -> return (Completions $ List [])

longerThan :: [a] -> Int -> Bool
longerThan [] _ = False
longerThan _ 0 = True
longerThan (_ : aa) n = longerThan aa (n -1)

setHandlersCompletion :: PartialHandlers Config
setHandlersCompletion = PartialHandlers $ \WithMessage{..} x -> return x{
LSP.completionHandler = withResponse RspCompletion getCompletionsLSP
Expand Down
8 changes: 5 additions & 3 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 @@ -565,9 +565,11 @@ getCompletions ideOpts CC { allModNamesAsNS, unqualCompls, qualCompls, importabl
= filtPragmaCompls (pragmaSuffix fullLine)
| otherwise
= let uniqueFiltCompls = nubOrdOn insertText filtCompls
in filtModNameCompls ++ map (toggleSnippets caps withSnippets
. mkCompl ideOpts . stripAutoGenerated) uniqueFiltCompls
++ filtKeywordCompls
in filtModNameCompls
++ filtKeywordCompls
++ map ( toggleSnippets caps withSnippets
. mkCompl ideOpts . stripAutoGenerated
) uniqueFiltCompls
return result


Expand Down