fix: corrected parsing of OPTION tokens and variable resolving

fixes: #289 and #295

Author: d-biehl

packages/language_server/src/robotcode/language_server/robotframework/parts/completion.py

@@ -101,6 +101,23 @@
     from robot.variables.search import VariableMatches
 
 
+if get_robot_version() < (5, 0):
+    ALLOWED_VARIABLE_TOKENS = [
+        Token.NAME,
+        Token.ARGUMENT,
+        Token.KEYWORD,
+        Token.ASSIGN,
+    ]
+else:
+    ALLOWED_VARIABLE_TOKENS = [
+        Token.NAME,
+        Token.ARGUMENT,
+        Token.KEYWORD,
+        Token.ASSIGN,
+        Token.OPTION,
+    ]
+
+
 DEFAULT_HEADER_STYLE = "*** {name}s ***"
 DEFAULT_HEADER_STYLE_51 = "*** {name} ***"
 
@@ -1141,12 +1158,7 @@ def complete_default(
                     break
                 token_at_position = tokens_at_position[token_at_position_index]
 
-            if token_at_position.type not in [
-                Token.NAME,
-                Token.ARGUMENT,
-                Token.KEYWORD,
-                Token.ASSIGN,
-            ]:
+            if token_at_position.type not in ALLOWED_VARIABLE_TOKENS:
                 return None
 
             close_brace_index_before = token_at_position.value.rfind(

packages/robot/src/robotcode/robot/diagnostics/namespace.py

@@ -538,7 +538,7 @@ def visit_Var(self, node: Statement) -> None:  # noqa: N802
                 source=self.namespace.source,
             )
 
-            if var_name not in self._results or type(self._results[var_name]) is type(var):
+            if var_name not in self._results or type(self._results[var_name]) is not type(var):
                 if isinstance(var, LocalVariableDefinition) or not any(
                     l for l in self.namespace.get_global_variables() if l.matcher == var.matcher
                 ):

packages/robot/src/robotcode/robot/utils/ast.py

@@ -225,6 +225,21 @@ def _tokenize_no_variables(token: Token) -> Iterator[Token]:
     yield token
 
 
+if get_robot_version() < (5, 0):
+    ALLOWED_TOKEN_TYPES = {
+        *Token.ALLOW_VARIABLES,
+        Token.KEYWORD,
+        Token.ASSIGN,
+    }
+else:
+    ALLOWED_TOKEN_TYPES = {
+        *Token.ALLOW_VARIABLES,
+        Token.KEYWORD,
+        Token.ASSIGN,
+        Token.OPTION,
+    }
+
+
 def tokenize_variables(
     token: Token,
     identifiers: str = "$@&%",
@@ -233,9 +248,7 @@ def tokenize_variables(
     extra_types: Optional[Set[str]] = None,
 ) -> Iterator[Token]:
     if token.type not in {
-        *Token.ALLOW_VARIABLES,
-        Token.KEYWORD,
-        Token.ASSIGN,
+        *ALLOWED_TOKEN_TYPES,
         *(extra_types if extra_types is not None else set()),
     }:
         return _tokenize_no_variables(token)