mirror-dump
diff --git a/‎pyls/plugins/jedi_completion.py
Lines changed: 6 additions & 12 deletions b/‎pyls/plugins/jedi_completion.py
Lines changed: 6 additions & 12 deletions
diff --git a/‎pyls/plugins/rope_completion.py
Lines changed: 2 additions & 3 deletions b/‎pyls/plugins/rope_completion.py
Lines changed: 2 additions & 3 deletions
diff --git a/‎test/plugins/test_completion.py
Lines changed: 0 additions & 2 deletions b/‎test/plugins/test_completion.py
Lines changed: 0 additions & 2 deletions
@@ -20,30 +20,24 @@ def pyls_completions(document, position):
 
 def _label(definition):
     if definition.type in ('function', 'method'):
-        params = ", ".join(param.name for param in definition.params)
-        return "{}({})".format(definition.name, params)
+        params = ', '.join(param.name for param in definition.params)
+        return '{}({})'.format(definition.name, params)
 
     return definition.name
 
 
 def _detail(definition):
-    return "builtin" if definition.in_builtin_module() else definition.parent().full_name or ""
+    return definition.parent().full_name or ''
 
 
 def _sort_text(definition):
     """ Ensure builtins appear at the bottom.
     Description is of format <type>: <module>.<item>
     """
-    if definition.in_builtin_module():
-        # It's a builtin, put it last
-        return 'z' + definition.name
 
-    if definition.name.startswith("_"):
-        # It's a 'hidden' func, put it next last
-        return 'y' + definition.name
-
-    # Else put it at the front
-    return 'a' + definition.name
+    # If its 'hidden', put it next last
+    prefix = 'z{}' if definition.name.startswith('_') else 'a{}'
+    return prefix.format(definition.name)
 
 
 def _kind(d):
 
@@ -52,11 +52,10 @@ def _sort_text(definition):
     """ Ensure builtins appear at the bottom.
     Description is of format <type>: <module>.<item>
     """
-    if definition.scope == 'builtin':
-        return 'z' + definition.name
-
     if definition.name.startswith("_"):
         # It's a 'hidden' func, put it next last
+        return 'z' + definition.name
+    elif definition.scope == 'builtin':
         return 'y' + definition.name
 
     # Else put it at the front
 
@@ -64,7 +64,5 @@ def test_jedi_completion_ordering():
 
     items = {c['label']: c['sortText'] for c in completions}
 
-    # Assert that builtins come after our own functions even if alphabetically they're before
-    assert items['hello()'] < items['dict']
     # And that 'hidden' functions come after unhidden ones
     assert items['hello()'] < items['_a_hello()']