Fix for merge

Shougo · Apr 23, 2019 · ca1ecf1 · ca1ecf1
1 parent 1d58949
commit ca1ecf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/rplugin/python3/denite/parent.py b/rplugin/python3/denite/parent.py
@@ -59,18 +59,7 @@ def _start_process(self):
  self._child = Child(self._vim)
 
  def _put(self, name, args):
- queue_id = str(int(time.time() * 1000))
- self._vim.vars['denite#_ret'] = {}
-
- ret = self._child.main(name, args, queue_id=queue_id)
- if not ret:
- return
-
- _ret = self._vim.vars['denite#_ret']
- _ret[queue_id] = ret
- self._vim.vars['denite#_ret'] = _ret
-
- return self._vim.vars['denite#_ret'][queue_id]
+ return self._child.main(name, args, queue_id=None)
 
  def _get(self, name, args):
  return self._put(name, args)

diff --git a/rplugin/python3/denite/ui/default.py b/rplugin/python3/denite/ui/default.py
@@ -69,8 +69,8 @@ def __init__(self, vim):
 
  def start(self, sources, context):
  if not self._denite:
- # self._denite = SyncParent(self._vim)
- self._denite = ASyncParent(self._vim)
+ self._denite = SyncParent(self._vim)
+ # self._denite = ASyncParent(self._vim)
 
  self._result = []
  context['sources_queue'] = [sources]