Skip to content
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

Follow global settings more accurately whether to show snippet completions #2017

Merged
merged 4 commits into from
Aug 13, 2022
Merged

Follow global settings more accurately whether to show snippet completions #2017

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cd668d
Follow global settings more accurately whether to show snippet comple…
jwortmann Aug 11, 2022
02b51d3
Immediately reset
jwortmann Aug 12, 2022
adc8e9b
Order by expected frequency
jwortmann Aug 12, 2022
40bcf5c
Typo
jwortmann Aug 12, 2022
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
16 changes: 12 additions & 4 deletions plugin/documents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ def on_change() -> None:
self._uri = existing_uri
else:
self.set_uri(view_to_uri(view))
self._auto_complete_triggered_manually = False
self._registration = SettingsRegistration(view.settings(), on_change=on_change)
self._setup()

Expand Down Expand Up @@ -425,7 +426,9 @@ def on_hover(self, point: int, hover_zone: int) -> None:
on_navigate=lambda href: self._on_navigate(href, point))

def on_text_command(self, command_name: str, args: Optional[dict]) -> Optional[Tuple[str, dict]]:
if command_name == "show_scope_name" and userprefs().semantic_highlighting:
if command_name == "auto_complete":
self._auto_complete_triggered_manually = True
elif command_name == "show_scope_name" and userprefs().semantic_highlighting:
session = self.session_async("semanticTokensProvider")
if session:
return ("lsp_show_scope_name", {})
Expand Down Expand Up @@ -680,6 +683,8 @@ def render_highlights_on_main_thread() -> None:
# --- textDocument/complete ----------------------------------------------------------------------------------------

def _on_query_completions_async(self, resolve_completion_list: ResolveCompletionsFn, location: int) -> None:
triggered_manually = self._auto_complete_triggered_manually
self._auto_complete_triggered_manually = False # reset state for next completion popup
sessions = list(self.sessions_async('completionProvider'))
if not sessions or not self.view.is_valid():
resolve_completion_list([], 0)
Expand All @@ -697,12 +702,13 @@ def completion_request() -> Promise[ResolvedCompletions]:
completion_promises.append(completion_request())

Promise.all(completion_promises).then(
lambda responses: self._on_all_settled(responses, resolve_completion_list))
lambda responses: self._on_all_settled(responses, resolve_completion_list, triggered_manually))

def _on_all_settled(
self,
responses: List[ResolvedCompletions],
resolve_completion_list: ResolveCompletionsFn
resolve_completion_list: ResolveCompletionsFn,
triggered_manually: bool
) -> None:
LspResolveDocsCommand.completions = {}
items = [] # type: List[sublime.CompletionItem]
Expand All @@ -713,7 +719,9 @@ def _on_all_settled(
flags |= sublime.INHIBIT_EXPLICIT_COMPLETIONS
if prefs.inhibit_word_completions:
flags |= sublime.INHIBIT_WORD_COMPLETIONS
include_snippets = self.view.settings().get("auto_complete_include_snippets")
view_settings = self.view.settings()
include_snippets = view_settings.get("auto_complete_include_snippets") and \
(triggered_manually or view_settings.get("auto_complete_include_snippets_when_typing"))
for response, session_name in responses:
if isinstance(response, Error):
errors.append(response)
Expand Down