Remove unnecessary loops in definition, hover and references (#525)

Author: lgeiger

pyls/plugins/definition.py

@@ -12,15 +12,14 @@ def pyls_definitions(config, document, position):
         follow_imports=settings.get('follow_imports', True),
         follow_builtin_imports=settings.get('follow_builtin_imports', True))
 
-    definitions = [
-        d for d in definitions
+    return [
+        {
+            'uri': uris.uri_with(document.uri, path=d.module_path),
+            'range': {
+                'start': {'line': d.line - 1, 'character': d.column},
+                'end': {'line': d.line - 1, 'character': d.column + len(d.name)},
+            }
+        }
+        for d in definitions
         if d.is_definition() and d.line is not None and d.column is not None and d.module_path is not None
     ]
-
-    return [{
-        'uri': uris.uri_with(document.uri, path=d.module_path),
-        'range': {
-            'start': {'line': d.line - 1, 'character': d.column},
-            'end': {'line': d.line - 1, 'character': d.column + len(d.name)}
-        }
-    } for d in definitions]

pyls/plugins/hover.py

@@ -11,10 +11,8 @@ def pyls_hover(document, position):
     word = document.word_at_position(position)
 
     # Find an exact match for a completion
-    definitions = [d for d in definitions if d.name == word]
+    for d in definitions:
+        if d.name == word:
+            return {'contents': _utils.format_docstring(d.docstring()) or ''}
 
-    if not definitions:
-        # :(
-        return {'contents': ''}
-
-    return {'contents': _utils.format_docstring(definitions[0].docstring()) or ""}
+    return {'contents': ''}

pyls/plugins/references.py

@@ -15,12 +15,10 @@ def pyls_references(document, position, exclude_declaration=False):
         usages = [d for d in usages if not d.is_definition()]
 
     # Filter out builtin modules
-    usages = [d for d in usages if not d.in_builtin_module()]
-
     return [{
         'uri': uris.uri_with(document.uri, path=d.module_path) if d.module_path else document.uri,
         'range': {
             'start': {'line': d.line - 1, 'character': d.column},
             'end': {'line': d.line - 1, 'character': d.column + len(d.name)}
         }
-    } for d in usages]
+    } for d in usages if not d.in_builtin_module()]