Skip to content

Commit

Permalink
save recieved completions in a dict grouped by session name, instead …
Browse files Browse the repository at this point in the history
…of saving all results in one list
  • Loading branch information
predrag-codetribe committed Mar 2, 2021
1 parent 60b8869 commit 01a9813
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
5 changes: 3 additions & 2 deletions plugin/completion.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
from .core.views import show_lsp_popup
from .core.views import update_lsp_popup

SessionName = str

class LspResolveDocsCommand(LspTextCommand):

completions = [] # type: List[CompletionItem]
completions = {} # type: Dict[SessionName, List[CompletionItem]]

def run(self, edit: sublime.Edit, index: int, session_name: str, event: Optional[dict] = None) -> None:
item = self.completions[index]
item = self.completions[session_name][index]
detail = self.format_documentation(item.get('detail') or "")
documentation = self.format_documentation(item.get("documentation") or "")
# don't show the detail in the cooperate AC popup if it is already shown in the AC details filed.
Expand Down
7 changes: 3 additions & 4 deletions plugin/documents.py
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ def completion_request() -> Promise[ResolvedCompletions]:
).then(lambda response: (response, session.config.name))

completion_promises.append(completion_request())
LspResolveDocsCommand.completions = []
LspResolveDocsCommand.completions = {}
Promise.all(completion_promises).then(
lambda responses: self._on_all_settled(responses, resolve_completion_list))

Expand Down Expand Up @@ -672,11 +672,10 @@ def _on_all_settled(
elif isinstance(response, list):
response_items = response
response_items = sorted(response_items, key=lambda item: item.get("sortText") or item["label"])
LspResolveDocsCommand.completions.extend(response_items)
LspResolveDocsCommand.completions[session_name] = response_items
can_resolve_completion_items = session.has_capability('completionProvider.resolveProvider')
items_count = len(items)
items.extend(
format_completion(response_item, items_count + index, can_resolve_completion_items, session.config.name)
format_completion(response_item, index, can_resolve_completion_items, session.config.name)
for index, response_item in enumerate(response_items))
if items:
flags |= sublime.INHIBIT_REORDER
Expand Down

0 comments on commit 01a9813

Please sign in to comment.