add resolve provides, preload packages and speed up things

Author: danzvara

pyls/hookspecs.py

@@ -26,6 +26,9 @@ def pyls_commands(config, workspace):
 def pyls_completions(config, workspace, document, position):
     pass
 
+@hookspec
+def pyls_completion_detail(config, item):
+    pass
 
 @hookspec
 def pyls_definitions(config, workspace, document, position):

pyls/plugins/jedi_completion.py

@@ -1,6 +1,9 @@
 # Copyright 2017 Palantir Technologies, Inc.
 import logging
+import time
 from pyls import hookimpl, lsp, _utils
+from contextlib import contextmanager
+import signal
 
 log = logging.getLogger(__name__)
 
@@ -38,44 +41,85 @@
     'statement': lsp.CompletionItemKind.Keyword,
 }
 
+COMPLETION_CACHE = {}
+
+@contextmanager
+def timeout(time):
+    # Register a function to raise a TimeoutError on the signal.
+    signal.signal(signal.SIGALRM, raise_timeout)
+    # Schedule the signal to be sent after ``time``.
+    signal.setitimer(signal.SIGALRM, time)
+
+    try:
+        yield
+    except TimeoutError:
+        pass
+    finally:
+        # Unregister the signal so it won't be triggered
+        # if the timeout is not reached.
+        signal.signal(signal.SIGALRM, signal.SIG_IGN)
+
+
+def raise_timeout(signum, frame):
+    raise TimeoutError
 
 @hookimpl
 def pyls_completions(config, document, position):
     definitions = document.jedi_script(position).completions()
     if not definitions:
         return None
 
+    if len(definitions) > 40:
+      definitions = definitions[:40]
+
     completion_capabilities = config.capabilities.get('textDocument', {}).get('completion', {})
     snippet_support = completion_capabilities.get('completionItem', {}).get('snippetSupport')
 
     settings = config.plugin_settings('jedi_completion', document_path=document.path)
     should_include_params = settings.get('include_params')
 
-    return [_format_completion(d, snippet_support and should_include_params) for d in definitions] or None
+    result = [_format_completion(d, i, snippet_support and should_include_params) for i, d in enumerate(definitions)] or None
+    return result
 
-
-def _format_completion(d, include_params=True):
-    completion = {
-        'label': _label(d),
-        'kind': _TYPE_MAP.get(d.type),
-        'detail': _detail(d),
+@hookimpl
+def pyls_completion_detail(config, item):
+    d = COMPLETION_CACHE.get(item)
+    if d:
+      completion = {
+        'label': '', #_label(d),
+        'kind': _TYPE_MAP[d.type],
+        'detail': '', #_detail(d),
         'documentation': _utils.format_docstring(d.docstring()),
-        'sortText': _sort_text(d),
+        'sortText': '', #_sort_text(d),
+        'insertText': d.name
+      }
+      return completion
+    else:
+      print('Completion missing')
+      return None
+
+def _format_completion(d, i, include_params=True):
+    COMPLETION_CACHE[d.name] = d
+    completion = {
+        'label': '', #_label(d),
+        'kind': '',
+        'detail': '', #_detail(d),
+        'documentation': _utils.format_docstring(d.docstring()) if i == 0 else '',
+        'sortText': '', #_sort_text(d),
         'insertText': d.name
     }
-
-    if include_params and hasattr(d, 'params') and d.params:
-        positional_args = [param for param in d.params if '=' not in param.description]
-
-        # For completions with params, we can generate a snippet instead
-        completion['insertTextFormat'] = lsp.InsertTextFormat.Snippet
-        snippet = d.name + '('
-        for i, param in enumerate(positional_args):
-            snippet += '${%s:%s}' % (i + 1, param.name)
-            if i < len(positional_args) - 1:
-                snippet += ', '
-        snippet += ')$0'
-        completion['insertText'] = snippet
+#     if include_params and hasattr(d, 'params') and d.params:
+        # positional_args = [param for param in d.params if '=' not in param.description]
+
+        # # For completions with params, we can generate a snippet instead
+        # completion['insertTextFormat'] = lsp.InsertTextFormat.Snippet
+        # snippet = d.name + '('
+        # for i, param in enumerate(positional_args):
+            # snippet += '${%s:%s}' % (i + 1, param.name)
+            # if i < len(positional_args) - 1:
+                # snippet += ', '
+        # snippet += ')$0'
+        # completion['insertText'] = snippet
 
     return completion
 

pyls/plugins/preload_imports.py

@@ -5,13 +5,11 @@
 log = logging.getLogger(__name__)
 
 MODULES = [
-    "OpenGL", "PIL",
-    "array", "audioop", "binascii", "cPickle", "cStringIO", "cmath", "collections",
+    "numpy", "tensorflow", "sklearn", "array", "binascii", "cmath", "collections",
     "datetime", "errno", "exceptions", "gc", "imageop", "imp", "itertools",
     "marshal", "math", "matplotlib", "mmap", "mpmath", "msvcrt", "networkx", "nose", "nt",
-    "numpy", "operator", "os", "os.path", "pandas", "parser", "rgbimg", "scipy", "signal",
-    "skimage", "sklearn", "statsmodels", "strop", "sympy", "sys", "thread", "time",
-    "wx", "xxsubtype", "zipimport", "zlib"
+    "operator", "os", "os.path", "pandas", "parser", "scipy", "signal",
+    "skimage", "statsmodels", "strop", "sympy", "sys", "thread", "time", "wx", "zlib"
 ]
 
 

pyls/python_ls.py

@@ -68,8 +68,8 @@ def shutdown_server(*args):
          'SHUTDOWN_CALL': shutdown_server}
     )
 
+    socketserver.TCPServer.allow_reuse_address = True
     server = socketserver.TCPServer((bind_addr, port), wrapper_class)
-    server.allow_reuse_address = True
 
     try:
         log.info('Serving %s on (%s, %s)', handler_class.__name__, bind_addr, port)
@@ -159,7 +159,7 @@ def capabilities(self):
                 'resolveProvider': False,  # We may need to make this configurable
             },
             'completionProvider': {
-                'resolveProvider': False,  # We know everything ahead of time
+                'resolveProvider': True,
                 'triggerCharacters': ['.']
             },
             'documentFormattingProvider': True,
@@ -236,10 +236,14 @@ def code_lens(self, doc_uri):
     def completions(self, doc_uri, position):
         completions = self._hook('pyls_completions', doc_uri, position=position)
         return {
-            'isIncomplete': False,
+            'isIncomplete': True,
             'items': flatten(completions)
         }
 
+    def completion_detail(self, item):
+        detail = self._hook('pyls_completion_detail', item=item)
+        return detail
+
     def definitions(self, doc_uri, position):
         return flatten(self._hook('pyls_definitions', doc_uri, position=position))
 
@@ -318,6 +322,9 @@ def m_text_document__code_lens(self, textDocument=None, **_kwargs):
     def m_text_document__completion(self, textDocument=None, position=None, **_kwargs):
         return self.completions(textDocument['uri'], position)
 
+    def m_completion_item__resolve(self, label=None, **_kwargs):
+        return self.completion_detail(label)
+
     def m_text_document__definition(self, textDocument=None, position=None, **_kwargs):
         return self.definitions(textDocument['uri'], position)
 

pyls/workspace.py

@@ -113,6 +113,10 @@ def __init__(self, uri, source=None, version=None, local=True, extra_sys_path=No
         self._extra_sys_path = extra_sys_path or []
         self._rope_project_builder = rope_project_builder
 
+        jedi.settings.cache_directory = '.cache/jedi/'
+        jedi.settings.use_filesystem_cache = True
+        jedi.api.preload_module(['numpy', 'matplotlib.pyplot', 'tensorflow'])
+
     def __str__(self):
         return str(self.uri)