some refactoring

Author: d-biehl

robotcode/language_server/robotframework/diagnostics/analyzer.py

@@ -32,13 +32,20 @@
 
 
 class Analyzer(AsyncVisitor):
-    async def get(self, model: ast.AST, namespace: Namespace) -> List[Diagnostic]:
-        self._results: List[Diagnostic] = []
+    def __init__(self, model: ast.AST, namespace: Namespace) -> None:
+        from robot.parsing.model.statements import TestTemplate, Template
+
+        self.model = model
         self._namespace = namespace
         self.current_testcase_or_keyword_name: Optional[str] = None
         self.finder = KeywordFinder(self._namespace)
+        self.test_template: Optional[TestTemplate] = None
+        self.template: Optional[Template] = None
+
+    async def run(self) -> List[Diagnostic]:
+        self._results: List[Diagnostic] = []
 
-        await self.visit(model)
+        await self.visit(self.model)
         return self._results
 
     async def visit(self, node: ast.AST) -> None:
@@ -372,6 +379,7 @@ async def visit_TestTemplate(self, node: ast.AST) -> None:  # noqa: N802
         if keyword_token is not None and is_not_variable_token(keyword_token):
             await self._analyze_keyword_call(value.value, value, keyword_token, [])
 
+        self.test_template = value
         await self.generic_visit(node)
 
     async def visit_Template(self, node: ast.AST) -> None:  # noqa: N802

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -717,7 +717,7 @@ async def yield_variables(
                     yielded[matcher] = var
                     yield matcher, var
 
-    async def get_unresolved_variables(
+    async def get_resolvable_variables(
         self, nodes: Optional[List[ast.AST]] = None, position: Optional[Position] = None
     ) -> Dict[str, Any]:
         return {
@@ -811,7 +811,7 @@ async def _import(value: Import) -> Optional[LibraryEntry]:
                     source = await self.imports_manager.find_file(
                         value.name,
                         base_dir,
-                        variables=await self.get_unresolved_variables(),
+                        variables=await self.get_resolvable_variables(),
                     )
 
                     # allready imported
@@ -1071,7 +1071,8 @@ async def _import_lib(library: str) -> Optional[LibraryEntry]:
                 )
                 return None
 
-        for e in await asyncio.gather(*(_import_lib(library) for library in DEFAULT_LIBRARIES)):
+        for library in DEFAULT_LIBRARIES:
+            e = await _import_lib(library)
             if e is not None:
                 self._libraries[e.alias or e.name or e.import_name] = e
 
@@ -1092,7 +1093,7 @@ async def _get_library_entry(
             args,
             base_dir=base_dir,
             sentinel=None if is_default_library else sentinel,
-            variables=await self.get_unresolved_variables(),
+            variables=await self.get_resolvable_variables(),
         )
 
         return LibraryEntry(name=library_doc.name, import_name=name, library_doc=library_doc, args=args, alias=alias)
@@ -1118,7 +1119,7 @@ async def _get_resource_entry(self, name: str, base_dir: str, sentinel: Any = No
             name,
             base_dir,
             sentinel=sentinel,
-            variables=await self.get_unresolved_variables(),
+            variables=await self.get_resolvable_variables(),
         )
 
         return ResourceEntry(
@@ -1155,7 +1156,7 @@ async def _get_variables_entry(
             args,
             base_dir=base_dir,
             sentinel=sentinel,
-            variables=await self.get_unresolved_variables(),
+            variables=await self.get_resolvable_variables(),
         )
 
         return VariablesEntry(
@@ -1228,7 +1229,7 @@ async def _analyze(self) -> None:
                 if not self._analyzed:
                     canceled = False
                     try:
-                        result = await Analyzer().get(self.model, self)
+                        result = await Analyzer(self.model, self).run()
 
                         self._diagnostics += result
 

robotcode/language_server/robotframework/parts/completion.py

@@ -1150,7 +1150,7 @@ async def complete_import() -> Optional[List[CompletionItem]]:
                 list = await imports_manger.complete_library_import(
                     first_part if first_part else None,
                     str(self.document.uri.to_path().parent),
-                    await self.namespace.get_unresolved_variables(nodes_at_position, position),
+                    await self.namespace.get_resolvable_variables(nodes_at_position, position),
                 )
                 if not list:
                     return None
@@ -1388,7 +1388,7 @@ async def complete_ResourceImport(  # noqa: N802
             list = await imports_manger.complete_resource_import(
                 first_part if first_part else None,
                 str(self.document.uri.to_path().parent),
-                await self.namespace.get_unresolved_variables(nodes_at_position, position),
+                await self.namespace.get_resolvable_variables(nodes_at_position, position),
             )
             if not list:
                 return None
@@ -1491,7 +1491,7 @@ async def complete_VariablesImport(  # noqa: N802
             list = await imports_manger.complete_variables_import(
                 first_part if first_part else None,
                 str(self.document.uri.to_path().parent),
-                await self.namespace.get_unresolved_variables(nodes_at_position, position),
+                await self.namespace.get_resolvable_variables(nodes_at_position, position),
             )
             if not list:
                 return None

robotcode/language_server/robotframework/parts/hover.py

@@ -119,7 +119,7 @@ async def _hover_default(self, nodes: List[ast.AST], document: TextDocument, pos
                             await namespace.imports_manager.resolve_variable(
                                 variable.name,
                                 str(document.uri.to_path().parent),
-                                await namespace.get_unresolved_variables(nodes, position),
+                                await namespace.get_resolvable_variables(nodes, position),
                                 False,
                             )
                         )
@@ -172,7 +172,7 @@ async def hover_IfHeader(  # noqa: N802
                         value = await namespace.imports_manager.resolve_variable(
                             variable.name,
                             str(document.uri.to_path().parent),
-                            await namespace.get_unresolved_variables(nodes, position),
+                            await namespace.get_resolvable_variables(nodes, position),
                             False,
                         )
                     except (asyncio.CancelledError, SystemExit, KeyboardInterrupt):
@@ -224,7 +224,7 @@ async def hover_WhileHeader(  # noqa: N802
                         value = await namespace.imports_manager.resolve_variable(
                             variable.name,
                             str(document.uri.to_path().parent),
-                            await namespace.get_unresolved_variables(nodes, position),
+                            await namespace.get_resolvable_variables(nodes, position),
                             False,
                         )
                     except (asyncio.CancelledError, SystemExit, KeyboardInterrupt):