Skip to content

Commit

Permalink
Merge pull request #169 from pappasam/completionIgnorePatterns
Browse files Browse the repository at this point in the history
Add ignorePatterns option to filter completions with name regex
  • Loading branch information
pappasam authored Oct 25, 2021
2 parents 1f35668 + 565d109 commit dae27b5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ If you are configuring manually, jedi-language-server supports the following [in
},
"completion": {
"disableSnippets": false,
"resolveEagerly": false
"resolveEagerly": false,
"ignorePatterns": []
},
"diagnostics": {
"enable": true,
Expand Down
3 changes: 2 additions & 1 deletion jedi_language_server/initialization_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
initialization options.
"""

from typing import List, Optional, Set
from typing import List, Optional, Pattern, Set

from pydantic import BaseModel, Field
from pygls.lsp.types import MarkupKind
Expand Down Expand Up @@ -34,6 +34,7 @@ class CodeAction(Model):
class Completion(Model):
disable_snippets: bool = False
resolve_eagerly: bool = False
ignore_patterns: List[Pattern] = []


class Diagnostics(Model):
Expand Down
16 changes: 13 additions & 3 deletions jedi_language_server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,25 @@ def completion(
server: JediLanguageServer, params: CompletionParams
) -> Optional[CompletionList]:
"""Returns completion items."""
snippet_disable = server.initialization_options.completion.disable_snippets
resolve_eagerly = server.initialization_options.completion.resolve_eagerly
ignore_patterns = server.initialization_options.completion.ignore_patterns
document = server.workspace.get_document(params.text_document.uri)
jedi_script = jedi_utils.script(server.project, document)
jedi_lines = jedi_utils.line_column(params.position)
completions_jedi = jedi_script.complete(*jedi_lines)
if not ignore_patterns:
# A performance optimization. ignore_patterns should usually be empty;
# this special case avoid repeated filter checks for the usual case.
completions_jedi = (comp for comp in jedi_script.complete(*jedi_lines))
else:
completions_jedi = (
comp
for comp in jedi_script.complete(*jedi_lines)
if not any(i.match(comp.name) for i in ignore_patterns)
)
snippet_support = server.client_capabilities.get_capability(
"text_document.completion.completion_item.snippet_support", False
)
snippet_disable = server.initialization_options.completion.disable_snippets
resolve_eagerly = server.initialization_options.completion.resolve_eagerly
markup_kind = _choose_markup(server)
is_import_context = jedi_utils.is_import(
script_=jedi_script,
Expand Down

0 comments on commit dae27b5

Please sign in to comment.