Correct error in find variable references with invalid variables in variable section

Author: d-biehl

CHANGELOG.md

@@ -54,6 +54,7 @@
     CommandLineVariableDefinition,
     EnvironmentVariableDefinition,
     Import,
+    InvalidVariableError,
     LibraryImport,
     LocalVariableDefinition,
     ResourceImport,
@@ -847,22 +848,27 @@ async def find_variable(
         nodes: Optional[List[ast.AST]] = None,
         position: Optional[Position] = None,
         skip_commandline_variables: bool = False,
+        ignore_error: bool = False,
     ) -> Optional[VariableDefinition]:
 
         await self.ensure_initialized()
 
         if name[:2] == "%{" and name[-1] == "}":
             return EnvironmentVariableDefinition(0, 0, 0, 0, "", name, None)
 
-        matcher = VariableMatcher(name)
+        try:
+            matcher = VariableMatcher(name)
 
-        async for m, v in self.yield_variables(
-            nodes,
-            position,
-            skip_commandline_variables=skip_commandline_variables,
-        ):
-            if matcher == m:
-                return v
+            async for m, v in self.yield_variables(
+                nodes,
+                position,
+                skip_commandline_variables=skip_commandline_variables,
+            ):
+                if matcher == m:
+                    return v
+        except InvalidVariableError:
+            if not ignore_error:
+                raise
 
         return None
 

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -249,7 +249,11 @@ async def iter_expression_variables_from_token(
             if variable_started:
                 if toknum == python_token.NAME:
                     var = await namespace.find_variable(
-                        f"${{{tokval}}}", nodes, position, skip_commandline_variables=skip_commandline_variables
+                        f"${{{tokval}}}",
+                        nodes,
+                        position,
+                        skip_commandline_variables=skip_commandline_variables,
+                        ignore_error=True,
                     )
                     sub_token = RobotToken(
                         expression.type,
@@ -411,7 +415,7 @@ async def iter_token(
                 sub_token = token_or_var
                 name = sub_token.value
                 var = await namespace.find_variable(
-                    name, nodes, position, skip_commandline_variables=skip_commandline_variables
+                    name, nodes, position, skip_commandline_variables=skip_commandline_variables, ignore_error=True
                 )
                 if var is not None:
                     yield strip_variable_token(sub_token), var
@@ -431,7 +435,11 @@ async def iter_token(
                         base_name, _ = match.groups()
                         name = f"{name[0]}{{{base_name.strip()}}}"
                         var = await namespace.find_variable(
-                            name, nodes, position, skip_commandline_variables=skip_commandline_variables
+                            name,
+                            nodes,
+                            position,
+                            skip_commandline_variables=skip_commandline_variables,
+                            ignore_error=True,
                         )
                         sub_sub_token = RobotToken(sub_token.type, name, sub_token.lineno, sub_token.col_offset)
                         if var is not None:

robotcode/language_server/robotframework/parts/model_helper.py

@@ -120,3 +120,12 @@ result:
       character: 18
       line: 9
   uri: tests/references.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 15
+    start:
+      character: 13
+      line: 15
+  uri: tests/variables.robot

tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_003_018_Variable_in_library_import_path_.yml

@@ -120,3 +120,12 @@ result:
       character: 18
       line: 9
   uri: tests/references.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 15
+    start:
+      character: 13
+      line: 15
+  uri: tests/variables.robot

tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_003_021_Variable_in_library_import_path_.yml

@@ -120,3 +120,12 @@ result:
       character: 18
       line: 9
   uri: tests/references.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 15
+    start:
+      character: 13
+      line: 15
+  uri: tests/variables.robot

tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_003_023_Variable_in_library_import_path_.yml

@@ -120,3 +120,12 @@ result:
       character: 18
       line: 9
   uri: tests/references.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 15
+    start:
+      character: 13
+      line: 15
+  uri: tests/variables.robot

tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_006_018_Variable_in_variables_import_path_.yml

@@ -120,3 +120,12 @@ result:
       character: 18
       line: 9
   uri: tests/references.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 15
+    start:
+      character: 13
+      line: 15
+  uri: tests/variables.robot

tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_006_021_Variable_in_variables_import_path_.yml

@@ -120,3 +120,12 @@ result:
       character: 18
       line: 9
   uri: tests/references.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 15
+    start:
+      character: 13
+      line: 15
+  uri: tests/variables.robot

tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_006_023_Variable_in_variables_import_path_.yml

@@ -120,3 +120,12 @@ result:
       character: 18
       line: 9
   uri: tests/references.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 15
+    start:
+      character: 13
+      line: 15
+  uri: tests/variables.robot