Fix completions for properties (python-lsp#477)

gatesn · web-flow · commit a0bec01c8939 · 2019-01-21T23:39:36.000Z
diff --git a/pyls/plugins/jedi_completion.py b/pyls/plugins/jedi_completion.py
@@ -19,7 +19,7 @@ def pyls_completions(document, position):
 
 
 def _label(definition):
-    if definition.type in ('function', 'method'):
+    if definition.type in ('function', 'method') and hasattr(definition, 'params'):
         params = ', '.join(param.name for param in definition.params)
         return '{}({})'.format(definition.name, params)
 
diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
@@ -20,6 +20,13 @@ def hello():
 def _a_hello():
     pass
 
+class Hello():
+
+    @property
+    def world(self):
+        return None
+
+print Hello().world
 """
 
 
@@ -64,3 +71,15 @@ def test_jedi_completion_ordering():
 
     # And that 'hidden' functions come after unhidden ones
     assert items['hello()'] < items['_a_hello()']
+
+
+def test_jedi_property_completion():
+    # Over the 'w' in 'print Hello().world'
+    com_position = {'line': 15, 'character': 15}
+    doc = Document(DOC_URI, DOC)
+    completions = pyls_jedi_completions(doc, com_position)
+
+    items = {c['label']: c['sortText'] for c in completions}
+
+    # Ensure we can complete the 'world' property
+    assert 'world' in items
diff --git a/tox.ini b/tox.ini
@@ -13,9 +13,9 @@ exclude = test/plugins/.ropeproject,test/.ropeproject
 
 [pytest]
 testpaths = test
-addopts =
-    --cov-report html --cov-report term --junitxml=pytest.xml
-    --cov pyls --cov test
+#addopts =
+#    --cov-report html --cov-report term --junitxml=pytest.xml
+#    --cov pyls --cov test
 
 [testenv]
 commands =
