Skip to content

Commit

Permalink
WIP: add main loop
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shougo
Shougo committed Jan 1, 2018
1 parent a7579b2 commit 6a4f622
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 57 deletions.
144 changes: 89 additions & 55 deletions rplugin/python3/deoplete/child.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from collections import defaultdict
from threading import Thread
from queue import Queue
from time import time, sleep

from deoplete import logger
from deoplete.exceptions import SourceInitError
Expand All @@ -30,7 +29,7 @@ def __init__(self, vim):
self._sources = {}
self._custom = []
self._profile_flag = None
self._profile_start = 0
self._profile_start_time = 0
self._source_errors = defaultdict(int)
self._filter_errors = defaultdict(int)
self._prev_results = {}
Expand All @@ -42,10 +41,70 @@ def __init__(self, vim):
def enable_logging(self):
self.is_debug_enabled = True

def gather_results(self, context):
def add_source(self, s):
if not self._thread:
self._thread = Thread(target=self._main_loop)
self._thread.start()
self._queue_in.put(['add_source', [s]])

def add_filter(self, f):
self._queue_in.put(['add_filter', [f]])

def set_source_attributes(self, context):
self._queue_in.put(['set_source_attributes', [context]])

def set_custom(self, custom):
self._queue_in.put(['set_custom', [custom]])

def merge_results(self, context):
self._queue_in.put(['merge_results', [context]])
return self._queue_out.get()

def on_event(self, context):
self._queue_in.put(['on_event', [context]])

def _main_loop(self):
while 1:
self.debug('main_loop: begin')
[message, args] = self._queue_in.get()
self.debug('main_loop: %s', message)
if message == 'add_source':
self._add_source(args[0])
elif message == 'add_filter':
self._add_filter(args[0])
elif message == 'set_source_attributes':
self._set_source_attributes(args[0])
elif message == 'set_custom':
self._set_custom(args[0])
elif message == 'on_event':
self._on_event(args[0])
# elif message == 'merge_results':
# self._merge_results(args[0])

def _add_source(self, s):
self._sources[s.name] = s

def _add_filter(self, f):
self._filters[f.name] = f

def _merge_results(self, context):
results = self._gather_results(context)

merged_results = []
for result in [x for x in results
if not self._is_skip(x['context'], x['source'])]:
source_result = self._source_result(result, context['input'])
if source_result:
merged_results.append(source_result)

is_async = len([x for x in results if x['context']['is_async']]) > 0

self._queue_out.put((is_async, merged_results))

def _gather_results(self, context):
results = []

for source in [x[1] for x in self.itersource(context)]:
for source in [x[1] for x in self._itersource(context)]:
try:
if source.disabled_syntaxes and 'syntax_names' not in context:
context['syntax_names'] = get_syn_names(self._vim)
Expand All @@ -61,14 +120,14 @@ def gather_results(self, context):
ctx['encoding'], ctx['input'], charpos)
ctx['complete_str'] = ctx['input'][ctx['char_position']:]

if charpos < 0 or self.is_skip(ctx, source):
if charpos < 0 or self._is_skip(ctx, source):
if source.name in self._prev_results:
self._prev_results.pop(source.name)
# Skip
continue

if (source.name in self._prev_results and
self.use_previous_result(
self._use_previous_result(
context, self._prev_results[source.name],
source.is_volatile)):
results.append(self._prev_results[source.name])
Expand All @@ -90,9 +149,9 @@ def gather_results(self, context):
ctx['max_menu_width'] = max(10, ctx['max_menu_width'])

# Gathering
self.profile_start(ctx, source.name)
self._profile_start(ctx, source.name)
ctx['candidates'] = source.gather_candidates(ctx)
self.profile_end(source.name)
self._profile_end(source.name)

if ctx['candidates'] is None:
continue
Expand Down Expand Up @@ -123,7 +182,7 @@ def gather_results(self, context):

return results

def gather_async_results(self, result, source):
def _gather_async_results(self, result, source):
try:
result['context']['is_refresh'] = False
async_candidates = source.gather_candidates(result['context'])
Expand All @@ -144,9 +203,9 @@ def gather_async_results(self, result, source):
else:
error_tb(self._vim, 'Errors from: %s' % source.name)

def process_filter(self, f, context):
def _process_filter(self, f, context):
try:
self.profile_start(context, f.name)
self._profile_start(context, f.name)
if (isinstance(context['candidates'], dict) and
'sorted_candidates' in context['candidates']):
context_candidates = []
Expand All @@ -157,7 +216,7 @@ def process_filter(self, f, context):
context['candidates'] = context_candidates
else:
context['candidates'] = f.filter(context)
self.profile_end(f.name)
self._profile_end(f.name)
except Exception:
self._filter_errors[f.name] += 1
if self._source_errors[f.name] > 2:
Expand All @@ -168,12 +227,12 @@ def process_filter(self, f, context):
return
error_tb(self._vim, 'Errors from: %s' % f)

def source_result(self, result, context_input):
def _source_result(self, result, context_input):
source = result['source']

# Gather async results
if result['is_async']:
self.gather_async_results(result, source)
self._gather_async_results(result, source)

if not result['context']['candidates']:
return []
Expand All @@ -195,7 +254,7 @@ def source_result(self, result, context_input):
for f in [self._filters[x] for x
in source.matchers + source.sorters + source.converters
if x in self._filters]:
self.process_filter(f, ctx)
self._process_filter(f, ctx)

ctx['ignorecase'] = ignorecase

Expand All @@ -207,21 +266,7 @@ def source_result(self, result, context_input):
return [ctx['candidates'], result]
return []

def merge_results(self, context):
results = self.gather_results(context)

merged_results = []
for result in [x for x in results
if not self.is_skip(x['context'], x['source'])]:
source_result = self.source_result(result, context['input'])
if source_result:
merged_results.append(source_result)

is_async = len([x for x in results if x['context']['is_async']]) > 0

return (is_async, merged_results)

def itersource(self, context):
def _itersource(self, context):
sources = sorted(self._sources.items(),
key=lambda x: get_custom(
context['custom'],
Expand Down Expand Up @@ -265,35 +310,24 @@ def itersource(self, context):
source.is_initialized = True
yield source_name, source

def profile_start(self, context, name):
def _profile_start(self, context, name):
if self._profile_flag is 0 or not self.is_debug_enabled:
return

if not self._profile_flag:
self._profile_flag = context['vars']['deoplete#enable_profile']
if self._profile_flag:
return self.profile_start(context, name)
return self._profile_start(context, name)
elif self._profile_flag:
self.debug('Profile Start: {0}'.format(name))
self._profile_start = time.clock()
self._profile_start_time = time.clock()

def profile_end(self, name):
if self._profile_start:
def _profile_end(self, name):
if self._profile_start_time:
self.debug('Profile End : {0:<25} time={1:2.10f}'.format(
name, time.clock() - self._profile_start))
name, time.clock() - self._profile_start_time))

def add_source(self, s):
if not self._thread:
self._thread = Thread(target=self._main_loop)
self._sources[s.name] = s

def add_filter(self, f):
self._filters[f.name] = f

def set_custom(self, custom):
self._custom = custom

def use_previous_result(self, context, result, is_volatile):
def _use_previous_result(self, context, result, is_volatile):
if context['position'][1] != result['prev_linenr']:
return False
if is_volatile:
Expand All @@ -303,7 +337,7 @@ def use_previous_result(self, context, result, is_volatile):
re.sub(r'\w*$', '', result['prev_input']) and
context['input'].find(result['prev_input']) == 0)

def is_skip(self, context, source):
def _is_skip(self, context, source):
if 'syntax_names' in context and source.disabled_syntaxes:
p = re.compile('(' + '|'.join(source.disabled_syntaxes) + ')$')
if next(filter(p.search, context['syntax_names']), None):
Expand All @@ -317,7 +351,7 @@ def is_skip(self, context, source):
return not (source.min_pattern_length <=
len(context['complete_str']) <= source.max_pattern_length)

def set_source_attributes(self, context):
def _set_source_attributes(self, context):
"""Set source attributes from the context.
Each item in `attrs` is the attribute name. If the default value is in
Expand Down Expand Up @@ -351,8 +385,11 @@ def set_source_attributes(self, context):
setattr(source, attr, get_custom(context['custom'],
name, attr, source_attr))

def on_event(self, context):
for source_name, source in self.itersource(context):
def _set_custom(self, custom):
self._custom = custom

def _on_event(self, context):
for source_name, source in self._itersource(context):
if hasattr(source, 'on_event'):
self.debug('on_event: Source: %s', source_name)
try:
Expand All @@ -361,6 +398,3 @@ def on_event(self, context):
error_tb(self._vim, 'Exception during {}.on_event '
'for event {!r}: {}'.format(
source_name, context['event'], exc))

def _main_loop(self):
pass
4 changes: 2 additions & 2 deletions rplugin/python3/deoplete/deoplete.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from deoplete import logger
from deoplete.child import Child
from deoplete.util import (error_tb, find_rplugins, import_plugin)
from deoplete.util import (error, error_tb, find_rplugins, import_plugin)


class Deoplete(logger.LoggingMixin):
Expand All @@ -29,7 +29,7 @@ def __init__(self, vim):

self._children = []
self._child_count = 0
self._max_children = 5
self._max_children = 1
for n in range(0, self._max_children):
self._children.append(Child(vim))

Expand Down

0 comments on commit 6a4f622

Please sign in to comment.