correct some code quality quirks

Author: d-biehl

robotcode/language_server/robotframework/diagnostics/imports_manager.py

@@ -25,8 +25,6 @@
 
 from robotcode.language_server.robotframework.utils.robot_path import find_file_ex
 
-from ..utils.version import get_robot_version
-
 from ....utils.async_tools import Lock, async_tasking_event, create_sub_task
 from ....utils.logging import LoggingDescriptor
 from ....utils.path import path_is_relative_to
@@ -37,6 +35,7 @@
 from ...common.text_document import TextDocument
 from ..configuration import RobotConfig
 from ..utils.async_ast import walk
+from ..utils.version import get_robot_version
 from .entities import CommandLineVariableDefinition, VariableDefinition
 
 if TYPE_CHECKING:
@@ -657,9 +656,8 @@ async def remove(k: _VariablesEntryKey, e: _VariablesEntry) -> None:
 
     @_logger.call
     async def find_library(self, name: str, base_dir: str, variables: Optional[Dict[str, Any]] = None) -> str:
-        from robot.variables.search import contains_variable
-
         from robot.libraries import STDLIBS
+        from robot.variables.search import contains_variable
 
         if contains_variable(name, "$@&%"):
             return await asyncio.wait_for(

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -1247,20 +1247,21 @@ async def get_keywords(self) -> List[KeywordDoc]:
                         result: Dict[KeywordMatcher, KeywordDoc] = {}
                         libdoc = await self.get_library_doc()
 
-                        i=0
+                        i = 0
                         for name, doc in itertools.chain(
                             *(e.library_doc.keywords.items() for e in self._libraries.values()),
                             *(e.library_doc.keywords.items() for e in self._resources.values()),
                             libdoc.keywords.items() if libdoc is not None else [],
                         ):
-                            i+=1
+                            i += 1
                             # if not any(k for k in result.keys() if k == name):
                             result[KeywordMatcher(name)] = doc
 
                         self._keywords = list(result.values())
                     finally:
                         self._logger.debug(
-                            lambda: f"end collecting {len(self._keywords)} keywords in {time.time()-current_time}s analyse {i} keywords"
+                            lambda: f"end collecting {len(self._keywords) if self._keywords else 0}"
+                            f" keywords in {time.time()-current_time}s analyse {i} keywords"
                         )
 
         return self._keywords

robotcode/language_server/robotframework/parts/completion.py

@@ -1381,7 +1381,7 @@ async def complete_ResourceImport(  # noqa: N802
         )
 
         try:
-            list = await self.namespace.imports_manger.complete_resource_import(
+            list = await self.namespace.imports_manager.complete_resource_import(
                 first_part if first_part else None,
                 str(self.document.uri.to_path().parent),
                 await self.namespace.get_resolvable_variables(nodes_at_position, position),
@@ -1482,7 +1482,7 @@ async def complete_VariablesImport(  # noqa: N802
         )
 
         try:
-            list = await self.namespace.imports_manger.complete_variables_import(
+            list = await self.namespace.imports_manager.complete_variables_import(
                 first_part if first_part else None,
                 str(self.document.uri.to_path().parent),
                 await self.namespace.get_resolvable_variables(nodes_at_position, position),

robotcode/language_server/robotframework/utils/robot_path.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+import sys
 from os import PathLike
 from pathlib import Path
-import sys
 from typing import List, Optional, Union