Implement sopme fixes for rope completions (python-lsp#181)

gatesn · web-flow · commit c4fd7a203b8a · 2017-11-02T23:01:16.000Z
diff --git a/pyls/_utils.py b/pyls/_utils.py
@@ -49,6 +49,7 @@ def _apply(impl):
     # imap unordered gives us an iterator over the items in the order they finish.
     # We have to be careful to set chunksize to 1 to ensure hooks each get their own thread.
     # Unfortunately, there's no way to interrupt these threads, so we just have to leave them be.
-    first_impl, result = next(pool.imap_unordered(_apply, impls, chunksize=1))
-    log.debug("Hook from plugin %s returned: %s", first_impl.plugin_name, result)
-    return result
+    for impl, result in pool.imap_unordered(_apply, impls, chunksize=1):
+        if result is not None:
+            log.debug("Hook from plugin %s returned: %s", impl.plugin_name, result)
+            return result
diff --git a/pyls/plugins/rope_completion.py b/pyls/plugins/rope_completion.py
@@ -11,9 +11,13 @@
 @hookimpl
 def pyls_completions(document, position):
     log.debug('Launching Rope')
-    mock_position = dict(position)
-    mock_position['character'] -= 1
-    word = document.word_at_position(mock_position)
+
+    # Rope is a bit rubbish at completing module imports, so we'll return None
+    word = document.word_at_position({
+        # The -1 should really be trying to look at the previous word, but that might be quite expensive
+        # So we only skip import completions when the cursor is one space after `import`
+        'line': position['line'], 'character': position['character'] - 1,
+    })
     if word == 'import':
         return None
 
diff --git a/pyls/python_ls.py b/pyls/python_ls.py
@@ -1,7 +1,6 @@
 # Copyright 2017 Palantir Technologies, Inc.
 import logging
 from multiprocessing import dummy as multiprocessing
-
 from . import config, lsp, _utils
 from .language_server import LanguageServer
 from .workspace import Workspace
@@ -70,7 +69,7 @@ def completions(self, doc_uri, position):
         )
         return {
             'isIncomplete': False,
-            'items': flatten(completions)
+            'items': completions or []
         }
 
     def definitions(self, doc_uri, position):
